Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove netstandard packaging infra #40239

Merged
merged 1 commit into from
Aug 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions eng/Subsets.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 1 addition & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions src/installer/pkg/projects/descriptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [ ]
}
]
8 changes: 0 additions & 8 deletions src/installer/pkg/projects/netstandard/Directory.Build.props

This file was deleted.

6 changes: 0 additions & 6 deletions src/installer/pkg/projects/netstandard/netstandardRIDs.props

This file was deleted.

28 changes: 0 additions & 28 deletions src/installer/pkg/projects/netstandard/pkg/Directory.Build.props

This file was deleted.

This file was deleted.

95 changes: 0 additions & 95 deletions src/installer/pkg/projects/netstandard/pkg/PackageOverrides.txt

This file was deleted.

25 changes: 0 additions & 25 deletions src/installer/pkg/projects/netstandard/src/netstandard.depproj

This file was deleted.

This file was deleted.