Skip to content

Commit 334200d

Browse files
committed
Revert "Enable repackaging of NETStandard 2.1 Targeting Pack (#101518)"
This reverts commit c67a2e4.
1 parent 1bfcdab commit 334200d

File tree

4 files changed

+0
-73
lines changed

4 files changed

+0
-73
lines changed

eng/Subsets.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,6 @@
507507
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono' and '$(PgoInstrument)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.sfxproj" />
508508
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-host.proj" />
509509
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-hostfxr.proj" />
510-
<SharedFrameworkProjectToBuild Condition="'$(BuildNETStandard21TargetingPack)' == 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\netstandard2.1.proj" />
511510
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-runtime-deps\*.proj" />
512511
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\archives\dotnet-nethost.proj" />
513512
<SharedFrameworkProjectToBuild Condition="'$(MonoCrossAOTTargetOS)' != ''" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\monocrossaot.sfxproj" Pack="true" />

eng/Versions.props

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,4 @@
260260
<MicrosoftDotnetSdkInternalVersion>8.0.101</MicrosoftDotnetSdkInternalVersion>
261261
<SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
262262
</PropertyGroup>
263-
<PropertyGroup>
264-
<!--
265-
Targeting pack package for NETStandard 2.1 gets rebuilt on demand.
266-
267-
Set to rebuild with 8.0.6 release, and automatically disabled after that.
268-
-->
269-
<BuildNETStandard21TargetingPack Condition="'$(PatchVersion)' == '6'">true</BuildNETStandard21TargetingPack>
270-
</PropertyGroup>
271263
</Project>

src/installer/pkg/sfx/installers.proj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
<InstallerProjectReference Include="installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj" />
2323
</ItemGroup>
2424

25-
<ItemGroup Condition="'$(BuildNETStandard21TargetingPack)' == 'true' and '$(BuildRpmPackage)' == 'true'">
26-
<InstallerProjectReference Include="installers/netstandard2.1.proj" />
27-
</ItemGroup>
28-
2925
<Target Name="BuildInstallerProjects" BeforeTargets="Build">
3026
<MSBuild Projects="@(InstallerProjectReference)"
3127
Targets="GenerateInstallers"

src/installer/pkg/sfx/installers/netstandard2.1.proj

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)