From 334200d4767549616c3b5e716d140fa2360d46b6 Mon Sep 17 00:00:00 2001
From: Eduardo Velarde <eduardo.velarde@pucp.pe>
Date: Thu, 2 May 2024 15:39:51 -0700
Subject: [PATCH] Revert "Enable repackaging of NETStandard 2.1 Targeting Pack
 (#101518)"

This reverts commit c67a2e4216e156f4129638d71ea99a6a731106ed.
---
 eng/Subsets.props                             |  1 -
 eng/Versions.props                            |  8 ---
 src/installer/pkg/sfx/installers.proj         |  4 --
 .../pkg/sfx/installers/netstandard2.1.proj    | 60 -------------------
 4 files changed, 73 deletions(-)
 delete mode 100644 src/installer/pkg/sfx/installers/netstandard2.1.proj

diff --git a/eng/Subsets.props b/eng/Subsets.props
index 00ae8a31c58cf..a35f99ef759b7 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -507,7 +507,6 @@
         <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono' and '$(PgoInstrument)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.sfxproj" />
         <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-host.proj" />
         <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-hostfxr.proj" />
-        <SharedFrameworkProjectToBuild Condition="'$(BuildNETStandard21TargetingPack)' == 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\netstandard2.1.proj" />
         <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-runtime-deps\*.proj" />
         <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\archives\dotnet-nethost.proj" />
         <SharedFrameworkProjectToBuild Condition="'$(MonoCrossAOTTargetOS)' != ''" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\monocrossaot.sfxproj" Pack="true" />
diff --git a/eng/Versions.props b/eng/Versions.props
index 92d5aeedb2d43..9ef3967e0ed5f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -260,12 +260,4 @@
     <MicrosoftDotnetSdkInternalVersion>8.0.101</MicrosoftDotnetSdkInternalVersion>
     <SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
   </PropertyGroup>
-  <PropertyGroup>
-    <!--
-      Targeting pack package for NETStandard 2.1 gets rebuilt on demand.
-
-      Set to rebuild with 8.0.6 release, and automatically disabled after that.
-    -->
-    <BuildNETStandard21TargetingPack Condition="'$(PatchVersion)' == '6'">true</BuildNETStandard21TargetingPack>
-  </PropertyGroup>
 </Project>
diff --git a/src/installer/pkg/sfx/installers.proj b/src/installer/pkg/sfx/installers.proj
index 2f947e6d9e291..7f4ce6b9c1c40 100644
--- a/src/installer/pkg/sfx/installers.proj
+++ b/src/installer/pkg/sfx/installers.proj
@@ -22,10 +22,6 @@
     <InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(BuildNETStandard21TargetingPack)' == 'true' and '$(BuildRpmPackage)' == 'true'">
-    <InstallerProjectReference Include="installers/netstandard2.1.proj" />
-  </ItemGroup>
-
   <Target Name="BuildInstallerProjects" BeforeTargets="Build">
     <MSBuild Projects="@(InstallerProjectReference)"
              Targets="GenerateInstallers"
diff --git a/src/installer/pkg/sfx/installers/netstandard2.1.proj b/src/installer/pkg/sfx/installers/netstandard2.1.proj
deleted file mode 100644
index 8b83ec3277da5..0000000000000
--- a/src/installer/pkg/sfx/installers/netstandard2.1.proj
+++ /dev/null
@@ -1,60 +0,0 @@
-<Project Sdk="Microsoft.Build.NoTargets">
-  <PropertyGroup>
-    <SkipBuild Condition="'$(RuntimeFlavor)' != '$(PrimaryRuntimeFlavor)' or '$(TargetsMobile)' == 'true'">true</SkipBuild>
-    <GenerateInstallers>true</GenerateInstallers>
-    <InstallerName>netstandard-targeting-pack-2.1</InstallerName>
-    <PackageBrandNameSuffix>NETStandard.Library.Ref</PackageBrandNameSuffix>
-    <ProductBrandName>NETStandard.Library.Ref 2.1.0</ProductBrandName>
-    <VersionInstallerName>false</VersionInstallerName>
-    <PlatformPackageType>ToolPack</PlatformPackageType>
-    <UseBrandingNameInLinuxPackageDescription>true</UseBrandingNameInLinuxPackageDescription>
-    <OriginalNETStandard21PkgFilename>netstandard-targeting-pack-2.1.0-x64.rpm</OriginalNETStandard21PkgFilename>
-    <NETStandard21PkgDownloadUrl>https://dotnetcli.blob.core.windows.net/dotnet/Runtime/3.1.0/$(OriginalNETStandard21PkgFilename)</NETStandard21PkgDownloadUrl>
-    <NETStandard21TempDir>$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', 'download'))</NETStandard21TempDir>
-    <NETStandard21PkgDestinationPath>$(NETStandard21TempDir)$(OriginalNETStandard21PkgFilename)</NETStandard21PkgDestinationPath>
-    <NETStandard21PkgDownloadSemaphore>$(NETStandard21TempDir)netstandard21.semaphore</NETStandard21PkgDownloadSemaphore>
-  </PropertyGroup>
-
-  <UsingTask TaskName="DownloadFile" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
-
-  <Target Name="AcquireNETStandard21PackageContents"
-          Inputs="$(NETStandard21PkgDestinationPath)"
-          Outputs="$(NETStandard21PkgDownloadSemaphore)">
-
-    <RemoveDir Directories="$(NETStandard21TempDir)" />
-
-    <DownloadFile
-      Uri="$(NETStandard21PkgDownloadUrl)"
-      DestinationPath="$(NETStandard21PkgDestinationPath)"
-      Overwrite="true"
-      TimeoutInSeconds="9999" />
-
-    <Exec Command="rpm2cpio $(NETStandard21PkgDestinationPath) | cpio -idmv"
-          WorkingDirectory="$(NETStandard21TempDir)" />
-
-    <WriteLinesToFile
-      File="$(NETStandard21PkgDownloadSemaphore)"
-      Lines="$(NETStandard21PkgDownloadUrl)"
-      Overwrite="true"
-      Encoding="Unicode" />
-
-  </Target>
-
-  <Target Name="PublishToDisk"
-          DependsOnTargets="AcquireNETStandard21PackageContents">
-    <Error Condition="'$(OutputPath)' == ''" Text="Publishing to disk requires the OutputPath to be set to the root of the path to write to." />
-
-    <ItemGroup>
-      <Content Include="$(NETStandard21TempDir)usr/share/dotnet/**/*" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(Content)"
-          DestinationFolder="$(OutputPath)/%(RecursiveDir)" />
-  </Target>
-
-  <Target Name="AddLinuxPackageInformation" BeforeTargets="GetRpmInstallerJsonProperties">
-    <ItemGroup>
-      <RpmJsonProperty Include="directories" Object="[ &quot;/usr/share/dotnet/packs/NETStandard.Library.Ref/2.1.0&quot;, &quot;/usr/share/doc/netstandard-targeting-pack-2.1&quot; ]" />
-    </ItemGroup>
-  </Target>
-</Project>