Skip to content

Commit eb6038a

Browse files
joeloffjoeloff
authored
Remove .NET Standard 2.1 Targeting Pack from installers (#50354)
2 parents 10911ad + 86beaea commit eb6038a

File tree

7 files changed

+0
-58
lines changed

7 files changed

+0
-58
lines changed

‎src/Layout/Directory.Build.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<ToolsetBrandName>Microsoft .NET Toolset $(Version)</ToolsetBrandName>
3131
<SharedFrameworkBrandName>Microsoft .NET Runtime $(MicrosoftNETCoreAppRuntimePackageVersion)</SharedFrameworkBrandName>
3232
<NetCoreAppTargetingPackBrandName>Microsoft .NET Targeting Pack $(MicrosoftNETCoreAppRefPackageVersion)</NetCoreAppTargetingPackBrandName>
33-
<NetStandardTargetingPackBrandName>Microsoft .NET Standard 2.1 Targeting Pack $(NETStandardLibraryRefPackageVersion)</NetStandardTargetingPackBrandName>
3433
<NetCoreAppHostPackBrandName>Microsoft .NET AppHost Pack $(MicrosoftNETCoreAppHostHostPackageVersion)</NetCoreAppHostPackBrandName>
3534
<SharedHostBrandName>Microsoft .NET Host $(SharedHostVersion)</SharedHostBrandName>
3635
<HostFxrBrandName>Microsoft .NET Host FX Resolver $(HostFxrVersion)</HostFxrBrandName>

‎src/Layout/pkg/dotnet-sdk.proj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@
131131
<LinuxPackageDependency Include="dotnet-runtime-$(MicrosoftNETCoreAppMajorMinorVersion)" Version="$(MicrosoftNETCoreAppRuntimePackageVersionWithTilde)" />
132132
<LinuxPackageDependency Include="dotnet-targeting-pack-$(MicrosoftNETCoreAppMajorMinorVersion)" Version="$(MicrosoftNETCoreAppRefPackageVersionWithTilde)" />
133133
<LinuxPackageDependency Include="dotnet-apphost-pack-$(MicrosoftNETCoreAppMajorMinorVersion)" Version="$(MicrosoftNETCoreAppRuntimePackageVersionWithTilde)" />
134-
<LinuxPackageDependency Condition="'$(TargetArchitecture)' == 'x64'" Include="netstandard-targeting-pack-$(NetStandardTargetingPackMajorMinorVersion)" Version="$(NetStandardTargetingPackPackageVersionWithTilde)" />
135134
<LinuxPackageDependency Include="aspnetcore-runtime-$(AspNetCoreMajorMinorVersion)" Version="$(AspNetCoreRuntimeVersionWithTilde)" />
136135
<LinuxPackageDependency Include="aspnetcore-targeting-pack-$(AspNetCoreMajorMinorVersion)" Version="$(AspNetCoreRefVersionWithTilde)" />
137136
<LinuxPostInstallScript Include="$(DebianPostinstFile)" Condition="'$(BuildDebPackage)' == 'true'" />
@@ -162,12 +161,6 @@
162161
<GetLinuxNativeInstallerDependencyVersions PackageVersion="$(HostFxrVersion)">
163162
<Output TaskParameter="MajorMinorVersion" PropertyName="HostFxrMajorMinorVersion" />
164163
</GetLinuxNativeInstallerDependencyVersions>
165-
166-
<GetLinuxNativeInstallerDependencyVersions PackageVersion="$(NETStandardLibraryRefPackageVersion)">
167-
<Output TaskParameter="VersionWithTilde" PropertyName="NetStandardTargetingPackPackageVersionWithTilde" />
168-
<Output TaskParameter="MajorMinorVersion" PropertyName="NetStandardTargetingPackMajorMinorVersion" />
169-
<Output TaskParameter="MajorMinorPatchVersion" PropertyName="NetStandardTargetingPackMajorMinorPatchVersion" />
170-
</GetLinuxNativeInstallerDependencyVersions>
171164
</Target>
172165

173166
</Project>

‎src/Layout/pkg/osx/Distribution-Template‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
</volume-check>
1212
<choices-outline>
1313
<line choice="{NetCoreAppTargetingPackComponentId}.pkg" />
14-
<line choice="{NetStandardTargetingPackComponentId}.pkg" />
1514
<line choice="{NetCoreAppHostPackComponentId}.pkg" />
1615
<line choice="{SharedFxComponentId}.pkg" />
1716
<line choice="{HostFxrComponentId}.pkg" />
@@ -21,9 +20,6 @@
2120
<choice id="{NetCoreAppTargetingPackComponentId}.pkg" visible="true" title="{NetCoreAppTargetingPackBrandName} ({arch})" description="The .NET Targeting Pack">
2221
<pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg" />
2322
</choice>
24-
<choice id="{NetStandardTargetingPackComponentId}.pkg" visible="true" title="{NetStandardTargetingPackBrandName} ({arch})" description="The .NET Standard 2.1 Targeting Pack">
25-
<pkg-ref id="{NetStandardTargetingPackComponentId}.pkg" />
26-
</choice>
2723
<choice id="{NetCoreAppHostPackComponentId}.pkg" visible="true" title="{NetCoreAppHostPackBrandName} ({arch})" description="The .NET App Host Pack">
2824
<pkg-ref id="{NetCoreAppHostPackComponentId}.pkg" />
2925
</choice>
@@ -40,7 +36,6 @@
4036
<pkg-ref id="{CLISdkComponentId}.pkg"/>
4137
</choice>
4238
<pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg">{NetCoreAppTargetingPackComponentId}.pkg</pkg-ref>
43-
<pkg-ref id="{NetStandardTargetingPackComponentId}.pkg">{NetStandardTargetingPackComponentId}.pkg</pkg-ref>
4439
<pkg-ref id="{NetCoreAppHostPackComponentId}.pkg">{NetCoreAppHostPackComponentId}.pkg</pkg-ref>
4540
<pkg-ref id="{SharedFxComponentId}.pkg">{SharedFxComponentId}.pkg</pkg-ref>
4641
<pkg-ref id="{HostFxrComponentId}.pkg">{HostFxrComponentId}.pkg</pkg-ref>

‎src/Layout/pkg/osx/Distribution-Template-x64‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@
1111
</volume-check>
1212
<choices-outline>
1313
<line choice="{NetCoreAppTargetingPackComponentId}.pkg.x64" />
14-
<line choice="{NetStandardTargetingPackComponentId}.pkg.x64" />
1514
<line choice="{NetCoreAppHostPackComponentId}.pkg.x64" />
1615
<line choice="{SharedFxComponentId}.pkg.x64" />
1716
<line choice="{HostFxrComponentId}.pkg.x64" />
1817
<line choice="{SharedHostComponentId}.pkg.x64" />
1918
<line choice="{CLISdkComponentId}.pkg.x64"/>
2019
<line choice="{NetCoreAppTargetingPackComponentId}.pkg.arm64" />
21-
<line choice="{NetStandardTargetingPackComponentId}.pkg.arm64" />
2220
<line choice="{NetCoreAppHostPackComponentId}.pkg.arm64" />
2321
<line choice="{SharedFxComponentId}.pkg.arm64" />
2422
<line choice="{HostFxrComponentId}.pkg.arm64" />
@@ -28,9 +26,6 @@
2826
<choice id="{NetCoreAppTargetingPackComponentId}.pkg.x64" visible="true" selected="IsX64Machine()" title="{NetCoreAppTargetingPackBrandName} ({arch})" description="The .NET Targeting Pack">
2927
<pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg" />
3028
</choice>
31-
<choice id="{NetStandardTargetingPackComponentId}.pkg.x64" visible="true" selected="IsX64Machine()" title="{NetStandardTargetingPackBrandName} ({arch})" description="The .NET Standard 2.1 Targeting Pack">
32-
<pkg-ref id="{NetStandardTargetingPackComponentId}.pkg" />
33-
</choice>
3429
<choice id="{NetCoreAppHostPackComponentId}.pkg.x64" visible="true" selected="IsX64Machine()" title="{NetCoreAppHostPackBrandName} ({arch})" description="The .NET App Host Pack">
3530
<pkg-ref id="{NetCoreAppHostPackComponentId}.pkg" />
3631
</choice>
@@ -49,9 +44,6 @@
4944
<choice id="{NetCoreAppTargetingPackComponentId}.pkg.arm64" visible="true" selected="!IsX64Machine()" customLocation="{x64EmulationPkgInstallDirectory}" title="{NetCoreAppTargetingPackBrandName} ({arch})" description="The .NET Targeting Pack">
5045
<pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg" />
5146
</choice>
52-
<choice id="{NetStandardTargetingPackComponentId}.pkg.arm64" visible="true" selected="!IsX64Machine()" customLocation="{x64EmulationPkgInstallDirectory}" title="{NetStandardTargetingPackBrandName} ({arch})" description="The .NET Standard 2.1 Targeting Pack">
53-
<pkg-ref id="{NetStandardTargetingPackComponentId}.pkg" />
54-
</choice>
5547
<choice id="{NetCoreAppHostPackComponentId}.pkg.arm64" visible="true" selected="!IsX64Machine()" customLocation="{x64EmulationPkgInstallDirectory}" title="{NetCoreAppHostPackBrandName} ({arch})" description="The .NET App Host Pack">
5648
<pkg-ref id="{NetCoreAppHostPackComponentId}.pkg" />
5749
</choice>
@@ -68,7 +60,6 @@
6860
<pkg-ref id="{CLISdkComponentId}.pkg"/>
6961
</choice>
7062
<pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg">{NetCoreAppTargetingPackComponentId}.pkg</pkg-ref>
71-
<pkg-ref id="{NetStandardTargetingPackComponentId}.pkg">{NetStandardTargetingPackComponentId}.pkg</pkg-ref>
7263
<pkg-ref id="{NetCoreAppHostPackComponentId}.pkg">{NetCoreAppHostPackComponentId}.pkg</pkg-ref>
7364
<pkg-ref id="{SharedFxComponentId}.pkg">{SharedFxComponentId}.pkg</pkg-ref>
7465
<pkg-ref id="{HostFxrComponentId}.pkg">{HostFxrComponentId}.pkg</pkg-ref>

‎src/Layout/redist/targets/GenerateMSIs.targets‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,12 +259,6 @@
259259
<!-- .NET Windows Desktop Runtime -->
260260
<_DotNetMsiPackages Include="$(DownloadsFolder)$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName);
261261
$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)"/>
262-
263-
<!-- Additional apphost and targeting packs -->
264-
<_DotNetMsiPackages Condition="'$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64'"
265-
Include="$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName);
266-
$(DownloadsFolder)$(DownloadedAlternateNetCoreAppHostPackInstallerFileName);
267-
$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)" />
268262
</ItemGroup>
269263

270264
<PropertyGroup>

‎src/Layout/redist/targets/GeneratePKG.targets‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<SharedFrameworkComponentId>com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(MicrosoftNETCoreAppRuntimePackageVersion).component.osx.$(TargetArchitecture)</SharedFrameworkComponentId>
1111
<NetCoreAppTargetingPackComponentId>com.microsoft.dotnet.pack.targeting.$(MicrosoftNETCoreAppRefPackageVersion).component.osx.$(TargetArchitecture)</NetCoreAppTargetingPackComponentId>
1212
<NetCoreAppHostPackComponentId>com.microsoft.dotnet.pack.apphost.$(MicrosoftNETCoreAppHostPackageVersion).component.osx.$(TargetArchitecture)</NetCoreAppHostPackComponentId>
13-
<NetStandardTargetingPackComponentId>com.microsoft.standard.pack.targeting.$(NETStandardLibraryRefPackageVersion).component.osx.$(TargetArchitecture)</NetStandardTargetingPackComponentId>
1413
<SdkComponentId>com.microsoft.dotnet.dev.$(Version).component.osx.$(TargetArchitecture)</SdkComponentId>
1514
<SdkProductArchiveId>com.microsoft.dotnet.dev.$(Version).osx.$(TargetArchitecture)</SdkProductArchiveId>
1615

@@ -32,7 +31,6 @@
3231
<SharedFrameworkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedFrameworkComponentId).pkg</SharedFrameworkPkgIntermediatePath>
3332
<NetCoreAppTargetingPackPkgIntermediatePath>$(PkgIntermediateDirectory)/$(NetCoreAppTargetingPackComponentId).pkg</NetCoreAppTargetingPackPkgIntermediatePath>
3433
<NetCoreAppHostPackPkgIntermediatePath>$(PkgIntermediateDirectory)/$(NetCoreAppHostPackComponentId).pkg</NetCoreAppHostPackPkgIntermediatePath>
35-
<NetStandardTargetingPackPkgIntermediatePath>$(PkgIntermediateDirectory)/$(NetStandardTargetingPackComponentId).pkg</NetStandardTargetingPackPkgIntermediatePath>
3634
<SharedHostPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedHostComponentId).pkg</SharedHostPkgIntermediatePath>
3735
<HostFxrPkgIntermediatePath>$(PkgIntermediateDirectory)/$(HostFxrComponentId).pkg</HostFxrPkgIntermediatePath>
3836

@@ -49,9 +47,6 @@
4947
<DistributionTemplateReplacement Include="{NetCoreAppTargetingPackComponentId}">
5048
<ReplacementString>$(NetCoreAppTargetingPackComponentId)</ReplacementString>
5149
</DistributionTemplateReplacement>
52-
<DistributionTemplateReplacement Include="{NetStandardTargetingPackComponentId}">
53-
<ReplacementString>$(NetStandardTargetingPackComponentId)</ReplacementString>
54-
</DistributionTemplateReplacement>
5550
<DistributionTemplateReplacement Include="{NetCoreAppHostPackComponentId}">
5651
<ReplacementString>$(NetCoreAppHostPackComponentId)</ReplacementString>
5752
</DistributionTemplateReplacement>
@@ -79,9 +74,6 @@
7974
<DistributionTemplateReplacement Include="{NetCoreAppHostPackBrandName}">
8075
<ReplacementString>$(NetCoreAppHostPackBrandName)</ReplacementString>
8176
</DistributionTemplateReplacement>
82-
<DistributionTemplateReplacement Include="{NetStandardTargetingPackBrandName}">
83-
<ReplacementString>$(NetStandardTargetingPackBrandName)</ReplacementString>
84-
</DistributionTemplateReplacement>
8577
<DistributionTemplateReplacement Include="{SharedHostBrandName}">
8678
<ReplacementString>$(SharedHostBrandName)</ReplacementString>
8779
</DistributionTemplateReplacement>
@@ -131,7 +123,6 @@
131123
<GenerateSdkProductArchiveInputs Include="$(DownloadedSharedFrameworkInstallerFile)" />
132124
<GenerateSdkProductArchiveInputs Include="$(DownloadedNetCoreAppTargetingPackInstallerFile)" />
133125
<GenerateSdkProductArchiveInputs Include="$(DownloadedNetCoreAppHostPackInstallerFile)" />
134-
<GenerateSdkProductArchiveInputs Include="$(DownloadedNetStandardTargetingPackInstallerFile)" />
135126
<GenerateSdkProductArchiveInputs Include="$(DownloadedHostFxrInstallerFile)" />
136127
<GenerateSdkProductArchiveInputs Include="$(DownloadedSharedHostInstallerFile)" />
137128
<GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveDistributionTemplateFile)" />
@@ -197,14 +188,12 @@
197188
$(DownloadsFolder)$(DownloadedSharedFrameworkInstallerFileName);
198189
$(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName);
199190
$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName);
200-
$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName);
201191
$(DownloadsFolder)$(DownloadedHostFxrInstallerFileName);
202192
$(DownloadsFolder)$(DownloadedSharedHostInstallerFileName)" />
203193
<PkgComponentsDestinationFiles Include="$(SdkPkgIntermediatePath);
204194
$(SharedFrameworkPkgIntermediatePath);
205195
$(NetCoreAppTargetingPackPkgIntermediatePath);
206196
$(NetCoreAppHostPackPkgIntermediatePath);
207-
$(NetStandardTargetingPackPkgIntermediatePath);
208197
$(HostFxrPkgIntermediatePath);
209198
$(SharedHostPkgIntermediatePath)" />
210199
</ItemGroup>

‎src/Layout/redist/targets/RestoreLayout.targets‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<AspNetCoreBlobVersion>$(MicrosoftAspNetCoreAppRefInternalPackageVersion)</AspNetCoreBlobVersion>
1616
<NetRuntimeBlobVersion>$(MicrosoftNETCorePlatformsPackageVersion)</NetRuntimeBlobVersion>
1717
<WindowsDesktopBlobVersion>$(MicrosoftWindowsDesktopAppInternalPackageVersion)</WindowsDesktopBlobVersion>
18-
<NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion>
1918

2019
<AlternateArchitecture Condition="'$(TargetArchitecture)' == 'x86'">x64</AlternateArchitecture>
2120
<AlternateArchitecture Condition="'$(TargetArchitecture)' == 'x64'">x86</AlternateArchitecture>
@@ -28,11 +27,6 @@
2827
<DownloadedAlternateNetCoreAppHostPackInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_$(AlternateArchitecture)$(InstallerExtension)</DownloadedAlternateNetCoreAppHostPackInstallerFileName>
2928
<DownloadedArm64NetCoreAppHostPackInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_arm64$(InstallerExtension)</DownloadedArm64NetCoreAppHostPackInstallerFileName>
3029
<DownloadedWindowsDesktopTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">windowsdesktop-targeting-pack-$(MicrosoftWindowsDesktopAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWindowsDesktopTargetingPackInstallerFileName>
31-
<DownloadedNetStandardTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetStandardTargetingPackInstallerFileName>
32-
<!-- osx-arm64 netstandard targeting pack pkg is unavailable. Use osx-x64.
33-
This should be OK, because the package is just a compressed file containing reference assemblies and
34-
runtime independent manifest text files. -->
35-
<DownloadedNetStandardTargetingPackInstallerFileName Condition="'$(SharedFrameworkInstallerFileRid)' == 'osx-arm64'">netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-osx-x64$(InstallerExtension)</DownloadedNetStandardTargetingPackInstallerFileName>
3630

3731
<SdkMSIInstallerFileName>$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFileName>
3832
<SdkTemplatesMSIInstallerFileName>dotnet-$(VersionMajor)$(VersionMinor)templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</SdkTemplatesMSIInstallerFileName>
@@ -65,7 +59,6 @@
6559

6660
<!-- Generate the version specific URLs to the targeting packs, runtime packs, etc. -->
6761
<NetRuntimeRootUrl>$(PublicBaseURL)Runtime/$(NetRuntimeBlobVersion)</NetRuntimeRootUrl>
68-
<NetStandardTargetingPackRootUrl>$(OfficialBaseURL)Runtime/$(NETStandardTargetingPackBlobVersion)</NetStandardTargetingPackRootUrl>
6962
<AspNetCoreSharedFxRootUrl>$(PublicBaseURL)aspnetcore/Runtime/$(AspNetCoreBlobVersion)</AspNetCoreSharedFxRootUrl>
7063
<WinFormsAndWpfSharedFxRootUrl>$(PublicBaseURL)WindowsDesktop/$(WindowsDesktopBlobVersion)</WinFormsAndWpfSharedFxRootUrl>
7164
<SdkRootUrl>$(PublicBaseURL)Sdk/$(FullNugetVersion)</SdkRootUrl>
@@ -81,11 +74,6 @@
8174
PackageVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
8275
RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
8376

84-
<BundledLayoutPackage Include="NETStandard.Library.Ref"
85-
PackageName="NETStandard.Library.Ref"
86-
PackageVersion="$(NETStandardLibraryRefPackageVersion)"
87-
RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
88-
8977
<BundledLayoutPackage Include="Microsoft.AspNetCore.App.Ref"
9078
PackageName="Microsoft.AspNetCore.App.Ref"
9179
PackageVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
@@ -212,13 +200,6 @@
212200
<DownloadFileName>$(DownloadedNetCoreAppTargetingPackInstallerFileName)</DownloadFileName>
213201
</BundledInstallerComponent>
214202

215-
<!-- TODO: Should we somehow obtain a .NET Standard ARM64 package? -->
216-
<BundledInstallerComponent Include="DownloadedNetStandardTargetingPackInstallerFile"
217-
Condition="'$(InstallerExtension)' != '' And (!$(TargetArchitecture.StartsWith('arm')) or '$(TargetRid)' == 'osx-arm64')">
218-
<BaseUrl>$(NetStandardTargetingPackRootUrl)</BaseUrl>
219-
<DownloadFileName>$(DownloadedNetStandardTargetingPackInstallerFileName)</DownloadFileName>
220-
</BundledInstallerComponent>
221-
222203
<BundledInstallerComponent Include="DownloadedNetCoreAppHostPackInstallerFile"
223204
Condition="'$(InstallerExtension)' != '' And (!$(TargetArchitecture.StartsWith('arm')) or '$(TargetRid)' == 'win-arm64' or '$(TargetRid)' == 'osx-arm64')">
224205
<BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>

0 commit comments

Comments
 (0)