未验证 提交 4d41f13e 编写于 作者: A Adeel Mujahid 提交者: GitHub

Remove netstandard packaging infra (#40239)

上级 ca70fc99
......@@ -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>
......
......@@ -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 -->
......@@ -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>
......
......@@ -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": [ ]
}
]
<Project>
<PropertyGroup>
<RIDPropsFile>$(MSBuildThisFileDirectory)netstandardRIDs.props</RIDPropsFile>
</PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
</Project>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- .NET Standard has no shared framework, so there are no RIDs. -->
</Project>
<Project>
<PropertyGroup>
<IsFrameworkPackage>true</IsFrameworkPackage>
<ShortFrameworkName>netstandard</ShortFrameworkName>
<ProductBrandPrefix>Microsoft .NET Standard</ProductBrandPrefix>
</PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
<PropertyGroup>
<ProductBandVersion>2.1</ProductBandVersion>
<PatchVersion>$(NETStandardPatchVersion)</PatchVersion>
<FrameworkListName>.NET Standard 2.1</FrameworkListName>
<FrameworkListTargetFrameworkIdentifier>.NETStandard</FrameworkListTargetFrameworkIdentifier>
<FrameworkListTargetFrameworkVersion>2.1</FrameworkListTargetFrameworkVersion>
<FrameworkListFrameworkName>NETStandard.Library</FrameworkListFrameworkName>
<VSInsertionProductName>NetStandard</VSInsertionProductName>
</PropertyGroup>
<!-- Redistribute package content from other nuget packages. -->
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)..\src\netstandard.depproj">
<AdditionalProperties Condition="'$(PackageTargetRuntime)' != ''">RuntimeIdentifier=$(PackageTargetRuntime)</AdditionalProperties>
</ProjectReference>
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- .NET Standard has no shared framework, so there is no data for a platform manifest. -->
<PlatformManifestTargetPath />
</PropertyGroup>
<ItemGroup>
<!-- File contents are copied from https://github.com/dotnet/sdk/blob/ec2f3741092f164daeb023e7caa4364c810461e2/src/Tasks/Common/targets/Microsoft.NET.DefaultPackageConflictOverrides.targets#L133 -->
<File Include="PackageOverrides.txt" TargetPath="data/" />
</ItemGroup>
</Project>
Microsoft.Win32.Primitives|4.3.0
System.AppContext|4.3.0
System.Collections|4.3.0
System.Collections.Concurrent|4.3.0
System.Collections.Immutable|1.4.0
System.Collections.NonGeneric|4.3.0
System.Collections.Specialized|4.3.0
System.ComponentModel|4.3.0
System.ComponentModel.EventBasedAsync|4.3.0
System.ComponentModel.Primitives|4.3.0
System.ComponentModel.TypeConverter|4.3.0
System.Console|4.3.0
System.Data.Common|4.3.0
System.Diagnostics.Contracts|4.3.0
System.Diagnostics.Debug|4.3.0
System.Diagnostics.FileVersionInfo|4.3.0
System.Diagnostics.Process|4.3.0
System.Diagnostics.StackTrace|4.3.0
System.Diagnostics.TextWriterTraceListener|4.3.0
System.Diagnostics.Tools|4.3.0
System.Diagnostics.TraceSource|4.3.0
System.Diagnostics.Tracing|4.3.0
System.Dynamic.Runtime|4.3.0
System.Globalization|4.3.0
System.Globalization.Calendars|4.3.0
System.Globalization.Extensions|4.3.0
System.IO|4.3.0
System.IO.Compression|4.3.0
System.IO.Compression.ZipFile|4.3.0
System.IO.FileSystem|4.3.0
System.IO.FileSystem.DriveInfo|4.3.0
System.IO.FileSystem.Primitives|4.3.0
System.IO.FileSystem.Watcher|4.3.0
System.IO.IsolatedStorage|4.3.0
System.IO.MemoryMappedFiles|4.3.0
System.IO.Pipes|4.3.0
System.IO.UnmanagedMemoryStream|4.3.0
System.Linq|4.3.0
System.Linq.Expressions|4.3.0
System.Linq.Queryable|4.3.0
System.Net.Http|4.3.0
System.Net.NameResolution|4.3.0
System.Net.Primitives|4.3.0
System.Net.Requests|4.3.0
System.Net.Security|4.3.0
System.Net.Sockets|4.3.0
System.Net.WebHeaderCollection|4.3.0
System.ObjectModel|4.3.0
System.Private.DataContractSerialization|4.3.0
System.Reflection|4.3.0
System.Reflection.Emit|4.3.0
System.Reflection.Emit.ILGeneration|4.3.0
System.Reflection.Emit.Lightweight|4.3.0
System.Reflection.Extensions|4.3.0
System.Reflection.Primitives|4.3.0
System.Reflection.TypeExtensions|4.3.0
System.Resources.ResourceManager|4.3.0
System.Runtime|4.3.0
System.Runtime.Extensions|4.3.0
System.Runtime.Handles|4.3.0
System.Runtime.InteropServices|4.3.0
System.Runtime.InteropServices.RuntimeInformation|4.3.0
System.Runtime.Loader|4.3.0
System.Runtime.Numerics|4.3.0
System.Runtime.Serialization.Formatters|4.3.0
System.Runtime.Serialization.Json|4.3.0
System.Runtime.Serialization.Primitives|4.3.0
System.Security.AccessControl|4.4.0
System.Security.Claims|4.3.0
System.Security.Cryptography.Algorithms|4.3.0
System.Security.Cryptography.Csp|4.3.0
System.Security.Cryptography.Encoding|4.3.0
System.Security.Cryptography.Primitives|4.3.0
System.Security.Cryptography.X509Certificates|4.3.0
System.Security.Cryptography.Xml|4.4.0
System.Security.Principal|4.3.0
System.Security.Principal.Windows|4.4.0
System.Text.Encoding|4.3.0
System.Text.Encoding.Extensions|4.3.0
System.Text.RegularExpressions|4.3.0
System.Threading|4.3.0
System.Threading.Overlapped|4.3.0
System.Threading.Tasks|4.3.0
System.Threading.Tasks.Extensions|4.3.0
System.Threading.Tasks.Parallel|4.3.0
System.Threading.Thread|4.3.0
System.Threading.ThreadPool|4.3.0
System.Threading.Timer|4.3.0
System.ValueTuple|4.3.0
System.Xml.ReaderWriter|4.3.0
System.Xml.XDocument|4.3.0
System.Xml.XmlDocument|4.3.0
System.Xml.XmlSerializer|4.3.0
System.Xml.XPath|4.3.0
System.Xml.XPath.XDocument|4.3.0
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<NETStandardTargetFramework>netstandard2.1</NETStandardTargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="$(NETStandardLibraryPackage)" Version="$(NETStandardLibraryVersion)" />
</ItemGroup>
<!--
Redistribute files from the netstandard package's build/ dir. When this project consumes a
transport package from dotnet/standard with ref assemblies in ref/netstandard2.1, this target
can be removed.
-->
<Target Name="GetNETStandardRefFilesToPackage"
BeforeTargets="GetFilesToPackage">
<ItemGroup>
<FilesToPackage
Include="$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryVersion)\build\$(NETStandardTargetFramework)\ref\*"
TargetPath="ref/$(NETStandardTargetFramework)" />
</ItemGroup>
</Target>
</Project>
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
using Microsoft.DotNet.CoreSetup.Test;
using Xunit;
namespace Microsoft.DotNet.CoreSetup.Packaging.Tests
{
public class NETStandardTests
{
private readonly RepoDirectoriesProvider dirs = new RepoDirectoriesProvider();
[Fact]
public void NETStandardTargetingPackIsValid()
{
using (var tester = NuGetArtifactTester.OpenOrNull(
dirs,
"NETStandard.Library.Ref"))
{
// Allow no targeting pack in case this is a servicing build.
// This condition should be tightened: https://github.com/dotnet/core-setup/issues/8830
if (tester == null)
{
return;
}
tester.HasOnlyTheseDataFiles(
"data/FrameworkList.xml",
"data/PackageOverrides.txt");
tester.IsTargetingPack();
// Most artifacts in the repo use the global Major.Minor, this package doesn't. Test
// this to make sure infra doesn't regress and cause netstandard to lose its special
// 2.1 version. The versioning difference is because netstandard targeting pack
// creation doesn't actually belong in Core-Setup: https://github.com/dotnet/standard/issues/1209
Assert.Equal(
(2, 1),
(tester.PackageVersion.Major, tester.PackageVersion.Minor));
}
}
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册