Skip to content

Commit 4d41f13

Browse files
authored
Remove netstandard packaging infra (#40239)
1 parent ca70fc9 commit 4d41f13

File tree

10 files changed

+1
-231
lines changed

10 files changed

+1
-231
lines changed

eng/Subsets.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,15 +215,11 @@
215215
<ItemGroup Condition="$(_subset.Contains('+installer.depprojs+'))">
216216
<DepprojProjectToBuild Condition="'$(RuntimeFlavor)' == 'CoreCLR'" Include="$(InstallerProjectRoot)pkg\projects\**\*.depproj" SignPhase="R2RBinaries" BuildInParallel="false" />
217217
<DepprojProjectToBuild Condition="'$(RuntimeFlavor)' == 'Mono'" Include="$(InstallerProjectRoot)pkg\projects\**\*.depproj" SignPhase="Binaries" BuildInParallel="false" />
218-
<!-- Disable netstandard infra for now and discuss if we should delete it: https://github.com/dotnet/runtime/issues/2294-->
219-
<DepprojProjectToBuild Remove="$(InstallerProjectRoot)pkg\projects\netstandard\src\netstandard.depproj" BuildInParallel="true" />
220218
<ProjectToBuild Include="@(DepprojProjectToBuild)" Pack="true" Category="installer" />
221219
</ItemGroup>
222220

223221
<ItemGroup Condition="$(_subset.Contains('+installer.pkgprojs+'))">
224222
<PkgprojProjectToBuild Include="$(InstallerProjectRoot)pkg\projects\**\*.pkgproj" SignPhase="MsiFiles" BuildInParallel="false" />
225-
<!-- Disable netstandard infra for now and discuss if we should delete it: https://github.com/dotnet/runtime/issues/2294-->
226-
<PkgprojProjectToBuild Remove="$(InstallerProjectRoot)pkg\projects\netstandard\pkg\NETStandard.Library.Ref.pkgproj" BuildInParallel="true" />
227223
<ProjectToBuild Include="@(PkgprojProjectToBuild)" Pack="true" Category="installer" />
228224
</ItemGroup>
229225

eng/Versions.props

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@
4646
<ItemGroup>
4747
<!-- Targeting packs are only patched in extreme cases. -->
4848
<ProjectServicingConfiguration Include="Microsoft.NETCore.App.Ref" PatchVersion="0" />
49-
<!-- Setting PatchVersion to "N/A" to not build it now or in the future, as "N/A" will never match the actual patch version. -->
50-
<!-- For more info see this issue: https://github.com/dotnet/runtime/issues/2294 -->
51-
<ProjectServicingConfiguration Include="NETStandard.Library.Ref" PatchVersion="N/A" />
5249
</ItemGroup>
5350
<PropertyGroup>
5451
<!-- Arcade dependencies -->
@@ -176,7 +173,7 @@
176173
<MicrosoftNETCoreRuntimeICUTransportPackage>Microsoft.NETCore.Runtime.ICU.Transport</MicrosoftNETCoreRuntimeICUTransportPackage>
177174
<!-- XmlDocFileRoot needs to be defined here since we use it in packaging.props and docs.targets.
178175
It also uses Arcade defined property NuGetPackageRoot, this is the only codepath shared in between
179-
packaging.props and docs.targets with arcade properties defined.
176+
packaging.props and docs.targets with arcade properties defined.
180177
-->
181178
<XmlDocFileRoot>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', '$(MicrosoftPrivateIntellisensePackage)', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles', 'net'))</XmlDocFileRoot>
182179
</PropertyGroup>

src/installer/pkg/projects/descriptions.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,5 @@
4848
"Name": "Microsoft.NETCore.App.Ref",
4949
"Description": "A set of .NET APIs that are included in the default .NET application model. Contains reference assemblies, documentation, and other design-time assets.",
5050
"CommonTypes": [ ]
51-
},
52-
{
53-
"Name": "NETStandard.Library.Ref",
54-
"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.",
55-
"CommonTypes": [ ]
5651
}
5752
]

src/installer/pkg/projects/netstandard/Directory.Build.props

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

src/installer/pkg/projects/netstandard/netstandardRIDs.props

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

src/installer/pkg/projects/netstandard/pkg/Directory.Build.props

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

src/installer/pkg/projects/netstandard/pkg/NETStandard.Library.Ref.pkgproj

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

src/installer/pkg/projects/netstandard/pkg/PackageOverrides.txt

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

src/installer/pkg/projects/netstandard/src/netstandard.depproj

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

src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs

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

0 commit comments

Comments
 (0)