From d0011b9cef96134949751fc81dda77748ac87255 Mon Sep 17 00:00:00 2001
From: Adeel <adeelbm@outlook.com>
Date: Sun, 2 Aug 2020 15:09:40 +0300
Subject: [PATCH] Remove netstandard packaging infra

---
 eng/Subsets.props                             |  4 -
 eng/Versions.props                            |  5 +-
 src/installer/pkg/projects/descriptions.json  |  5 -
 .../netstandard/Directory.Build.props         |  8 --
 .../netstandard/netstandardRIDs.props         |  6 --
 .../netstandard/pkg/Directory.Build.props     | 28 ------
 .../pkg/NETStandard.Library.Ref.pkgproj       | 13 ---
 .../netstandard/pkg/PackageOverrides.txt      | 95 -------------------
 .../netstandard/src/netstandard.depproj       | 25 -----
 .../NETStandardTests.cs                       | 43 ---------
 10 files changed, 1 insertion(+), 231 deletions(-)
 delete mode 100644 src/installer/pkg/projects/netstandard/Directory.Build.props
 delete mode 100644 src/installer/pkg/projects/netstandard/netstandardRIDs.props
 delete mode 100644 src/installer/pkg/projects/netstandard/pkg/Directory.Build.props
 delete mode 100644 src/installer/pkg/projects/netstandard/pkg/NETStandard.Library.Ref.pkgproj
 delete mode 100644 src/installer/pkg/projects/netstandard/pkg/PackageOverrides.txt
 delete mode 100644 src/installer/pkg/projects/netstandard/src/netstandard.depproj
 delete mode 100644 src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs

diff --git a/eng/Subsets.props b/eng/Subsets.props
index ba103417c8380f..2c52c183a2ce6b 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -215,15 +215,11 @@
   <ItemGroup Condition="$(_subset.Contains('+installer.depprojs+'))">
     <DepprojProjectToBuild Condition="'$(RuntimeFlavor)' == 'CoreCLR'" Include="$(InstallerProjectRoot)pkg\projects\**\*.depproj" SignPhase="R2RBinaries" BuildInParallel="false" />
     <DepprojProjectToBuild Condition="'$(RuntimeFlavor)' == 'Mono'" Include="$(InstallerProjectRoot)pkg\projects\**\*.depproj" SignPhase="Binaries" BuildInParallel="false" />
-    <!-- Disable netstandard infra for now and discuss if we should delete it: https://github.com/dotnet/runtime/issues/2294-->
-    <DepprojProjectToBuild Remove="$(InstallerProjectRoot)pkg\projects\netstandard\src\netstandard.depproj" BuildInParallel="true" />
     <ProjectToBuild Include="@(DepprojProjectToBuild)" Pack="true" Category="installer" />
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+installer.pkgprojs+'))">
     <PkgprojProjectToBuild Include="$(InstallerProjectRoot)pkg\projects\**\*.pkgproj" SignPhase="MsiFiles" BuildInParallel="false" />
-    <!-- Disable netstandard infra for now and discuss if we should delete it: https://github.com/dotnet/runtime/issues/2294-->
-    <PkgprojProjectToBuild Remove="$(InstallerProjectRoot)pkg\projects\netstandard\pkg\NETStandard.Library.Ref.pkgproj" BuildInParallel="true" />
     <ProjectToBuild Include="@(PkgprojProjectToBuild)" Pack="true" Category="installer" />
   </ItemGroup>
 
diff --git a/eng/Versions.props b/eng/Versions.props
index 6f76c6d3c6b038..fd0c5441fa0776 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -46,9 +46,6 @@
   <ItemGroup>
     <!-- Targeting packs are only patched in extreme cases. -->
     <ProjectServicingConfiguration Include="Microsoft.NETCore.App.Ref" PatchVersion="0" />
-    <!-- Setting PatchVersion to "N/A" to not build it now or in the future, as "N/A" will never match the actual patch version. -->
-    <!-- For more info see this issue: https://github.com/dotnet/runtime/issues/2294 -->
-    <ProjectServicingConfiguration Include="NETStandard.Library.Ref" PatchVersion="N/A" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Arcade dependencies -->
@@ -176,7 +173,7 @@
     <MicrosoftNETCoreRuntimeICUTransportPackage>Microsoft.NETCore.Runtime.ICU.Transport</MicrosoftNETCoreRuntimeICUTransportPackage>
     <!-- XmlDocFileRoot needs to be defined here since we use it in packaging.props and docs.targets.
     It also uses Arcade defined property NuGetPackageRoot, this is the only codepath shared in between
-    packaging.props and docs.targets with arcade properties defined. 
+    packaging.props and docs.targets with arcade properties defined.
     -->
     <XmlDocFileRoot>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', '$(MicrosoftPrivateIntellisensePackage)', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles', 'net'))</XmlDocFileRoot>
   </PropertyGroup>
diff --git a/src/installer/pkg/projects/descriptions.json b/src/installer/pkg/projects/descriptions.json
index b3e4471c47c737..4b4ae7f6d83b55 100644
--- a/src/installer/pkg/projects/descriptions.json
+++ b/src/installer/pkg/projects/descriptions.json
@@ -48,10 +48,5 @@
         "Name": "Microsoft.NETCore.App.Ref",
         "Description": "A set of .NET APIs that are included in the default .NET application model. Contains reference assemblies, documentation, and other design-time assets.",
         "CommonTypes": [ ]
-    },
-    {
-        "Name": "NETStandard.Library.Ref",
-        "Description": "A set of standard .NET APIs that are prescribed to be used and supported together. Contains reference assemblies, documentation, and other design-time assets.",
-        "CommonTypes": [ ]
     }
 ]
diff --git a/src/installer/pkg/projects/netstandard/Directory.Build.props b/src/installer/pkg/projects/netstandard/Directory.Build.props
deleted file mode 100644
index 1597af77869da2..00000000000000
--- a/src/installer/pkg/projects/netstandard/Directory.Build.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <RIDPropsFile>$(MSBuildThisFileDirectory)netstandardRIDs.props</RIDPropsFile>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
-
-</Project>
diff --git a/src/installer/pkg/projects/netstandard/netstandardRIDs.props b/src/installer/pkg/projects/netstandard/netstandardRIDs.props
deleted file mode 100644
index 0b0cbcde167d27..00000000000000
--- a/src/installer/pkg/projects/netstandard/netstandardRIDs.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- .NET Standard has no shared framework, so there are no RIDs. -->
-
-</Project>
diff --git a/src/installer/pkg/projects/netstandard/pkg/Directory.Build.props b/src/installer/pkg/projects/netstandard/pkg/Directory.Build.props
deleted file mode 100644
index 2826aeac134c75..00000000000000
--- a/src/installer/pkg/projects/netstandard/pkg/Directory.Build.props
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <IsFrameworkPackage>true</IsFrameworkPackage>
-    <ShortFrameworkName>netstandard</ShortFrameworkName>
-    <ProductBrandPrefix>Microsoft .NET Standard</ProductBrandPrefix>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
-
-  <PropertyGroup>
-    <ProductBandVersion>2.1</ProductBandVersion>
-    <PatchVersion>$(NETStandardPatchVersion)</PatchVersion>
-
-    <FrameworkListName>.NET Standard 2.1</FrameworkListName>
-    <FrameworkListTargetFrameworkIdentifier>.NETStandard</FrameworkListTargetFrameworkIdentifier>
-    <FrameworkListTargetFrameworkVersion>2.1</FrameworkListTargetFrameworkVersion>
-    <FrameworkListFrameworkName>NETStandard.Library</FrameworkListFrameworkName>
-
-    <VSInsertionProductName>NetStandard</VSInsertionProductName>
-  </PropertyGroup>
-
-  <!-- Redistribute package content from other nuget packages. -->
-  <ItemGroup>
-    <ProjectReference Include="$(MSBuildThisFileDirectory)..\src\netstandard.depproj">
-      <AdditionalProperties Condition="'$(PackageTargetRuntime)' != ''">RuntimeIdentifier=$(PackageTargetRuntime)</AdditionalProperties>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/netstandard/pkg/NETStandard.Library.Ref.pkgproj b/src/installer/pkg/projects/netstandard/pkg/NETStandard.Library.Ref.pkgproj
deleted file mode 100644
index b9391580563b03..00000000000000
--- a/src/installer/pkg/projects/netstandard/pkg/NETStandard.Library.Ref.pkgproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <!-- .NET Standard has no shared framework, so there is no data for a platform manifest. -->
-    <PlatformManifestTargetPath />
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- File contents are copied from https://github.com/dotnet/sdk/blob/ec2f3741092f164daeb023e7caa4364c810461e2/src/Tasks/Common/targets/Microsoft.NET.DefaultPackageConflictOverrides.targets#L133 -->
-    <File Include="PackageOverrides.txt" TargetPath="data/" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/installer/pkg/projects/netstandard/pkg/PackageOverrides.txt b/src/installer/pkg/projects/netstandard/pkg/PackageOverrides.txt
deleted file mode 100644
index 8aa32ade39a8c9..00000000000000
--- a/src/installer/pkg/projects/netstandard/pkg/PackageOverrides.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-Microsoft.Win32.Primitives|4.3.0
-System.AppContext|4.3.0
-System.Collections|4.3.0
-System.Collections.Concurrent|4.3.0
-System.Collections.Immutable|1.4.0
-System.Collections.NonGeneric|4.3.0
-System.Collections.Specialized|4.3.0
-System.ComponentModel|4.3.0
-System.ComponentModel.EventBasedAsync|4.3.0
-System.ComponentModel.Primitives|4.3.0
-System.ComponentModel.TypeConverter|4.3.0
-System.Console|4.3.0
-System.Data.Common|4.3.0
-System.Diagnostics.Contracts|4.3.0
-System.Diagnostics.Debug|4.3.0
-System.Diagnostics.FileVersionInfo|4.3.0
-System.Diagnostics.Process|4.3.0
-System.Diagnostics.StackTrace|4.3.0
-System.Diagnostics.TextWriterTraceListener|4.3.0
-System.Diagnostics.Tools|4.3.0
-System.Diagnostics.TraceSource|4.3.0
-System.Diagnostics.Tracing|4.3.0
-System.Dynamic.Runtime|4.3.0
-System.Globalization|4.3.0
-System.Globalization.Calendars|4.3.0
-System.Globalization.Extensions|4.3.0
-System.IO|4.3.0
-System.IO.Compression|4.3.0
-System.IO.Compression.ZipFile|4.3.0
-System.IO.FileSystem|4.3.0
-System.IO.FileSystem.DriveInfo|4.3.0
-System.IO.FileSystem.Primitives|4.3.0
-System.IO.FileSystem.Watcher|4.3.0
-System.IO.IsolatedStorage|4.3.0
-System.IO.MemoryMappedFiles|4.3.0
-System.IO.Pipes|4.3.0
-System.IO.UnmanagedMemoryStream|4.3.0
-System.Linq|4.3.0
-System.Linq.Expressions|4.3.0
-System.Linq.Queryable|4.3.0
-System.Net.Http|4.3.0
-System.Net.NameResolution|4.3.0
-System.Net.Primitives|4.3.0
-System.Net.Requests|4.3.0
-System.Net.Security|4.3.0
-System.Net.Sockets|4.3.0
-System.Net.WebHeaderCollection|4.3.0
-System.ObjectModel|4.3.0
-System.Private.DataContractSerialization|4.3.0
-System.Reflection|4.3.0
-System.Reflection.Emit|4.3.0
-System.Reflection.Emit.ILGeneration|4.3.0
-System.Reflection.Emit.Lightweight|4.3.0
-System.Reflection.Extensions|4.3.0
-System.Reflection.Primitives|4.3.0
-System.Reflection.TypeExtensions|4.3.0
-System.Resources.ResourceManager|4.3.0
-System.Runtime|4.3.0
-System.Runtime.Extensions|4.3.0
-System.Runtime.Handles|4.3.0
-System.Runtime.InteropServices|4.3.0
-System.Runtime.InteropServices.RuntimeInformation|4.3.0
-System.Runtime.Loader|4.3.0
-System.Runtime.Numerics|4.3.0
-System.Runtime.Serialization.Formatters|4.3.0
-System.Runtime.Serialization.Json|4.3.0
-System.Runtime.Serialization.Primitives|4.3.0
-System.Security.AccessControl|4.4.0
-System.Security.Claims|4.3.0
-System.Security.Cryptography.Algorithms|4.3.0
-System.Security.Cryptography.Csp|4.3.0
-System.Security.Cryptography.Encoding|4.3.0
-System.Security.Cryptography.Primitives|4.3.0
-System.Security.Cryptography.X509Certificates|4.3.0
-System.Security.Cryptography.Xml|4.4.0
-System.Security.Principal|4.3.0
-System.Security.Principal.Windows|4.4.0
-System.Text.Encoding|4.3.0
-System.Text.Encoding.Extensions|4.3.0
-System.Text.RegularExpressions|4.3.0
-System.Threading|4.3.0
-System.Threading.Overlapped|4.3.0
-System.Threading.Tasks|4.3.0
-System.Threading.Tasks.Extensions|4.3.0
-System.Threading.Tasks.Parallel|4.3.0
-System.Threading.Thread|4.3.0
-System.Threading.ThreadPool|4.3.0
-System.Threading.Timer|4.3.0
-System.ValueTuple|4.3.0
-System.Xml.ReaderWriter|4.3.0
-System.Xml.XDocument|4.3.0
-System.Xml.XmlDocument|4.3.0
-System.Xml.XmlSerializer|4.3.0
-System.Xml.XPath|4.3.0
-System.Xml.XPath.XDocument|4.3.0
diff --git a/src/installer/pkg/projects/netstandard/src/netstandard.depproj b/src/installer/pkg/projects/netstandard/src/netstandard.depproj
deleted file mode 100644
index ec841c9a3df97e..00000000000000
--- a/src/installer/pkg/projects/netstandard/src/netstandard.depproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <NETStandardTargetFramework>netstandard2.1</NETStandardTargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="$(NETStandardLibraryPackage)" Version="$(NETStandardLibraryVersion)" />
-  </ItemGroup>
-
-  <!--
-    Redistribute files from the netstandard package's build/ dir. When this project consumes a 
-    transport package from dotnet/standard with ref assemblies in ref/netstandard2.1, this target
-    can be removed.
-  -->
-  <Target Name="GetNETStandardRefFilesToPackage"
-          BeforeTargets="GetFilesToPackage">
-    <ItemGroup>
-      <FilesToPackage
-        Include="$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryVersion)\build\$(NETStandardTargetFramework)\ref\*"
-        TargetPath="ref/$(NETStandardTargetFramework)" />
-    </ItemGroup>
-  </Target>
-
-</Project>
diff --git a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs
deleted file mode 100644
index 0c5c4a29b97ee8..00000000000000
--- a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.DotNet.CoreSetup.Test;
-using Xunit;
-
-namespace Microsoft.DotNet.CoreSetup.Packaging.Tests
-{
-    public class NETStandardTests
-    {
-        private readonly RepoDirectoriesProvider dirs = new RepoDirectoriesProvider();
-
-        [Fact]
-        public void NETStandardTargetingPackIsValid()
-        {
-            using (var tester = NuGetArtifactTester.OpenOrNull(
-                dirs,
-                "NETStandard.Library.Ref"))
-            {
-                // Allow no targeting pack in case this is a servicing build.
-                // This condition should be tightened: https://github.com/dotnet/core-setup/issues/8830
-                if (tester == null)
-                {
-                    return;
-                }
-
-                tester.HasOnlyTheseDataFiles(
-                    "data/FrameworkList.xml",
-                    "data/PackageOverrides.txt");
-
-                tester.IsTargetingPack();
-
-                // Most artifacts in the repo use the global Major.Minor, this package doesn't. Test
-                // this to make sure infra doesn't regress and cause netstandard to lose its special
-                // 2.1 version. The versioning difference is because netstandard targeting pack
-                // creation doesn't actually belong in Core-Setup: https://github.com/dotnet/standard/issues/1209
-                Assert.Equal(
-                    (2, 1),
-                    (tester.PackageVersion.Major, tester.PackageVersion.Minor));
-            }
-        }
-    }
-}