From b62894835d9443597f7cf2d7bae7d642c4d9c856 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 28 May 2021 19:32:48 +0200 Subject: [PATCH 1/8] Include NetCoreAppCurrent configs in packages The NetCoreAppCurrent configurations were omitted from packages to avoid ever growing packages. Now that we adhere to the support policy for packages we don't need to exclude them anymore as the policy defines a baseline for .NETCoreApp configurations. This will remove an artificial difference when source building the repository and also make it so that partner repositories which don't depend on a transport package like windowsdesktop (winforms) receive the very latest assets that are included in the shared framework as well. --- docs/coding-guidelines/libraries-packaging.md | 9 +-------- src/libraries/Directory.Build.targets | 4 ---- .../src/Microsoft.Extensions.Logging.Abstractions.csproj | 1 - .../src/Microsoft.Extensions.Logging.Console.csproj | 1 - .../src/Microsoft.Extensions.Logging.EventSource.csproj | 1 - .../src/Microsoft.Extensions.Primitives.csproj | 1 - .../src/Microsoft.Win32.Registry.csproj | 1 - .../src/Microsoft.Win32.SystemEvents.csproj | 1 - .../ref/System.Collections.Immutable.csproj | 1 - .../src/System.Collections.Immutable.csproj | 1 - .../src/System.ComponentModel.Composition.csproj | 1 - .../System.Data.Odbc/src/System.Data.Odbc.csproj | 1 - .../src/System.Diagnostics.DiagnosticSource.csproj | 1 - .../src/System.Diagnostics.EventLog.csproj | 1 - .../src/System.Diagnostics.PerformanceCounter.csproj | 1 - .../System.DirectoryServices.AccountManagement.csproj | 1 - .../src/System.DirectoryServices.Protocols.csproj | 1 - .../src/System.DirectoryServices.csproj | 1 - .../ref/System.Drawing.Common.csproj | 1 - .../src/System.Drawing.Common.csproj | 1 - .../System.Formats.Asn1/src/System.Formats.Asn1.csproj | 1 - .../System.Formats.Cbor/ref/System.Formats.Cbor.csproj | 1 - .../System.Formats.Cbor/src/System.Formats.Cbor.csproj | 1 - .../src/System.IO.FileSystem.AccessControl.csproj | 1 - .../System.IO.Pipelines/ref/System.IO.Pipelines.csproj | 4 ++-- .../System.IO.Pipelines/src/System.IO.Pipelines.csproj | 1 - .../src/System.IO.Pipes.AccessControl.csproj | 1 - .../System.Management/src/System.Management.csproj | 1 - .../System.Net.Http.Json/ref/System.Net.Http.Json.csproj | 1 - .../System.Net.Http.Json/src/System.Net.Http.Json.csproj | 1 - .../src/System.Reflection.Metadata.csproj | 1 - .../src/System.Reflection.MetadataLoadContext.csproj | 1 - .../src/System.Reflection.TypeExtensions.csproj | 1 - .../src/System.Runtime.CompilerServices.Unsafe.ilproj | 1 - .../ref/System.Security.AccessControl.csproj | 1 - .../src/System.Security.AccessControl.csproj | 1 - .../ref/System.Security.Cryptography.Pkcs.csproj | 1 - .../src/System.Security.Cryptography.Pkcs.csproj | 1 - .../src/System.Security.Permissions.csproj | 1 - .../ref/System.Security.Principal.Windows.csproj | 1 - .../src/System.Security.Principal.Windows.csproj | 1 - .../ref/System.ServiceModel.Syndication.csproj | 1 - .../src/System.ServiceModel.Syndication.csproj | 1 - .../src/System.ServiceProcess.ServiceController.csproj | 1 - src/libraries/System.Speech/src/System.Speech.csproj | 1 - .../src/System.Text.Encoding.CodePages.csproj | 1 - .../ref/System.Text.Encodings.Web.csproj | 1 - .../src/System.Text.Encodings.Web.csproj | 1 - .../System.Text.Json/src/System.Text.Json.csproj | 1 - .../ref/System.Threading.Channels.csproj | 1 - .../src/System.Threading.Channels.csproj | 1 - .../src/System.Threading.Tasks.Dataflow.csproj | 1 - .../ref/System.Windows.Extensions.csproj | 1 - .../src/System.Windows.Extensions.csproj | 1 - 54 files changed, 3 insertions(+), 65 deletions(-) diff --git a/docs/coding-guidelines/libraries-packaging.md b/docs/coding-guidelines/libraries-packaging.md index caf447ca598a1..f8dd661f07765 100644 --- a/docs/coding-guidelines/libraries-packaging.md +++ b/docs/coding-guidelines/libraries-packaging.md @@ -8,7 +8,7 @@ To add a library to the .NETCore shared framework, that library's `AssemblyName` The library should have both a `ref` and `src` project. Its reference assembly will be included in the ref-pack for the Microsoft.NETCore.App shared framework, and its implementation assembly will be included in the runtime pack. -Including a library in the shared framework only includes the best applicable TargetFramework build of that library: `$(NetCoreAppCurrent)` if it exists, but possibly `netstandard2.1` or another if that is best. If a library has builds for other frameworks those will only be shipped if the library also produces a [Nuget package](#nuget-package). If a library ships both in the shared framework and a nuget package, it may decide to exclude its latest `$(NetCoreAppCurrent)` build from the package. This can be done by setting `ExcludeCurrentNetCoreAppFromPackage` to true. Libraries should take care when doing this to ensure that whatever asset in the package that would apply to `$(NetCoreAppCurrent)` is functionally equivalent to that which it replaces from the shared framework, to avoid breaking applications which reference a newer package than the shared framework. If possible, it's preferable to avoid this by choosing to target frameworks which can both ship in the package and shared framework. +Including a library in the shared framework only includes the best applicable TargetFramework build of that library: `$(NetCoreAppCurrent)` if it exists, but possibly `netstandard2.1` or another if that is best. If a library has builds for other frameworks those will only be shipped if the library also produces a [Nuget package](#nuget-package). In some occasions we may want to include a library in the shared framework, but not expose it publicly. To do so, include the library in the `NetCoreAppLibraryNoReference` property in [NetCoreAppLibrary.props](../../src/libraries/NetCoreAppLibrary.props). The library should also be named in a way to discourage use at runtime, for example using the `System.Private` prefix. We should avoid hiding arbitrary public libraries as it complicates deployment and servicing, though some platform specific libraries are in this state due to historical reasons. @@ -61,13 +61,6 @@ By default all TargetFrameworks listed in your project will be included in the p ``` -A common pattern is to build for the latest .NET version, for example to include a library in the shared framework or a transport package, but then excluded this from the NuGet package. This can be done to avoid growing the NuGet package in size. To do this set -```xml - - true - -``` - When excluding TargetFrameworks from a package special care should be taken to ensure that the builds included are equivalent to those excluded. Avoid ifdef'ing the implementation only in an excluded TargetFramework. Doing so will result in testing something different than what we ship, or shipping a nuget package that degrades the shared framework. ### Build props / targets and other content diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 56d428cd34ed5..0bb22a512a937 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -246,10 +246,6 @@ - - true - - false true diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj index d63b42d63f3a6..71e35b67179fa 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj @@ -2,7 +2,6 @@ $(NetCoreAppCurrent);netstandard2.0;net461 - true true true diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj index c9f3ee93875a4..2dcab4ff90645 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj @@ -2,7 +2,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true true annotations $(DefineConstants);NO_SUPPRESS_GC_TRANSITION diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj index bf3aab8453c9f..3823f1cfac81d 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj @@ -2,7 +2,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true true true diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj index 3843dc8c292d4..25f981a38034e 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -3,7 +3,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true true - true false Primitives shared by framework extensions. Commonly used types include: diff --git a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index 845a6e4ab2f5e..b30d83a31cabf 100644 --- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -3,7 +3,6 @@ true $(DefineConstants);REGISTRY_ASSEMBLY $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows - true $(NoWarn);CA2249 enable diff --git a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj index 2b9dada8b1ecc..90622a10185d7 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj @@ -3,7 +3,6 @@ true enable $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0;net461 - true diff --git a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj index 3d1674e34b356..01c989df4fef6 100644 --- a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);netstandard2.0;net461 - true enable diff --git a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj index b9993c0d4afcc..716b12acaf62a 100644 --- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);netstandard2.0;net461 - true enable diff --git a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj index cf8fe4f6249a0..e35314716013a 100644 --- a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj +++ b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0 - true enable false diff --git a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj index d6e6bd80456eb..7a997cf9205c6 100644 --- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj @@ -2,7 +2,6 @@ true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-FreeBSD;netcoreapp3.1-Linux;netcoreapp3.1-OSX;netcoreapp3.1;netstandard2.0;net461-windows - true $(NoWarn);CA2249;CA1838 enable diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj index 42a0662cd2777..ccfc78e2ec13c 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj @@ -5,7 +5,6 @@ $(NoWarn);SA1205 enable $(NetCoreAppCurrent);net5.0;netstandard2.0;net461 - true diff --git a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj index 79220464303ad..7c18a94187215 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj @@ -2,7 +2,6 @@ true $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;net461;netstandard2.0 - true $(NoWarn);CA1838 diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj index 317c566411f6d..5ec71af7947ed 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -2,7 +2,6 @@ true $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0;net461 - true diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj index 5208f0039b8b7..7aed57a90fae8 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj @@ -4,7 +4,6 @@ $(DefineConstants);FLAVOR_WHIDBEY;PAPI_AD;PAPI_REGSAM;USE_CTX_CACHE true $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0 - true $(NoWarn);CA2249 diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj index 4eb0455b489a1..f805636800e74 100644 --- a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj @@ -3,7 +3,6 @@ true true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-Linux;netcoreapp3.1-windows;netcoreapp3.1-OSX;netcoreapp3.1-Linux;netstandard2.0 - true diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj index b7e9706b02ca5..29731cd69752f 100644 --- a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj @@ -2,7 +2,6 @@ true $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0 - true true enable diff --git a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj index baf975fbb72b1..5d75861c9a563 100644 --- a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj @@ -1,7 +1,6 @@  $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true true enable diff --git a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj index 35425e03b14ad..ff076314c944d 100644 --- a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj @@ -6,7 +6,6 @@ $(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS;FEATURE_SYSTEM_EVENTS true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-Unix;netcoreapp3.1;netstandard2.0;net461 - true enable diff --git a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj index 059af38e99b74..afc44a4843a83 100644 --- a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj @@ -3,7 +3,6 @@ true enable $(NetCoreAppCurrent);netstandard2.0;net461 - true diff --git a/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj b/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj index f2aa426354bd4..2e9b8acb3e497 100644 --- a/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj +++ b/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);net5.0 - true enable diff --git a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj index 23462998e03eb..f81c0cacfcece 100644 --- a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj +++ b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj @@ -2,7 +2,6 @@ net5.0;$(NetCoreAppCurrent) true - true enable diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj index a3d152ecf94b4..fc60ae30592aa 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent)-windows;netstandard2.0;netstandard2.0-windows;net461-windows - true enable diff --git a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj index 507822d223224..e51795c34c50d 100644 --- a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj @@ -2,9 +2,9 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 enable - - true + true diff --git a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj index 3357c47c3b7b6..be3d6242126f5 100644 --- a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true true enable diff --git a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj index f1f4091ea1f78..adf3f0fa983a5 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj +++ b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj @@ -2,7 +2,6 @@ enable $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);net5.0-windows;net5.0;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows - true diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj index 07f592cf332b6..e93f063795dbd 100644 --- a/src/libraries/System.Management/src/System.Management.csproj +++ b/src/libraries/System.Management/src/System.Management.csproj @@ -4,7 +4,6 @@ $(NoWarn);0618 true $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0 - true diff --git a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj index 9e23fb4e09236..1687a6caa509f 100644 --- a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj +++ b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj @@ -1,7 +1,6 @@  $(NetCoreAppCurrent);net5.0;netstandard2.0;net461 - true enable diff --git a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj index 120c77f330d3e..af6fa91b1c189 100644 --- a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj +++ b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);net5.0;netstandard2.0;net461 - true enable diff --git a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj index b07bbd75ebac2..49fbcc52589b9 100644 --- a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -4,7 +4,6 @@ en-US false $(NetCoreAppCurrent);netstandard2.0;net461 - true enable diff --git a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj index 2ef7aa05aedc3..ec33f379a73db 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj @@ -4,7 +4,6 @@ true $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true enable diff --git a/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj b/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj index 8668954a3efb4..3e598d9015c00 100644 --- a/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj +++ b/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj @@ -3,7 +3,6 @@ true enable $(NetCoreAppCurrent) - true diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj index 6c22cf9c86606..d742a0bf2d1dc 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj @@ -1,7 +1,6 @@  $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true IMPL OPT diff --git a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj index 403a6436ed2bd..93df430202634 100644 --- a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);netstandard2.0;net461 - true enable diff --git a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj index 4f1fd6cd42513..b3fab96c74e93 100644 --- a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj @@ -2,7 +2,6 @@ true $(NetCoreAppCurrent)-windows;net461-windows;netstandard2.0-windows;netstandard2.0 - true enable diff --git a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj index 07d10f8f66edb..c3816073efa46 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 - true enable diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj index 832bd3447c1d3..e0b6d61099c0b 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -5,7 +5,6 @@ $(NoWarn);CA5384 enable $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.1-windows;netstandard2.1;netstandard2.0-windows;netstandard2.0;net461-windows - true diff --git a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj index 9fc55eece247c..691bf86a92303 100644 --- a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -2,7 +2,6 @@ true $(NetCoreAppCurrent);net5.0;netcoreapp3.1;netstandard2.0;net461 - true diff --git a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj index 401c7aecccd53..9ec2638f81ef6 100644 --- a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj +++ b/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true enable diff --git a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj index 9cd81f55f9fa2..ef84fcf32d8c7 100644 --- a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj +++ b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj @@ -2,7 +2,6 @@ true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;netcoreapp3.1-windows;netcoreapp3.1-Unix;netstandard2.0-windows;netstandard2.0-Unix;netstandard2.0;net461-windows - true enable diff --git a/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj b/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj index 67f51b77a8624..9826a5f94e9ba 100644 --- a/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj +++ b/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true diff --git a/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj b/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj index 86a03a3f7c2ec..ecbd3de0f473c 100644 --- a/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj +++ b/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461-windows - true true diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj index 7cf866982fc86..b2ee67b3e0039 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -2,7 +2,6 @@ true $(NetCoreAppCurrent)-windows;netstandard2.0;netstandard2.0-windows;net461-windows - true $(NoWarn);CA2249 enable diff --git a/src/libraries/System.Speech/src/System.Speech.csproj b/src/libraries/System.Speech/src/System.Speech.csproj index 00b2c99d3a6a9..faee98668a30f 100644 --- a/src/libraries/System.Speech/src/System.Speech.csproj +++ b/src/libraries/System.Speech/src/System.Speech.csproj @@ -2,7 +2,6 @@ true $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0 - true $(NoWarn);CS0649;SA1129 diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj index 232b1cb17ef84..6373ec2bf7a68 100644 --- a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj @@ -3,7 +3,6 @@ true enable $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netstandard2.0-windows;netstandard2.0;net461-windows - true true diff --git a/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj b/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj index 51fc45949ef50..1f72a38924935 100644 --- a/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj +++ b/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true true $(NoWarn);CS3011 diff --git a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj index a4c22190c2628..31c8c610b4e89 100644 --- a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj +++ b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj @@ -2,7 +2,6 @@ true $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser;netcoreapp3.1;netstandard2.0;net461 - true enable diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj index 8a6315b1fe7c4..647cdfd440dda 100644 --- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj @@ -2,7 +2,6 @@ true $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true diff --git a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj index b1b6add200ce3..02b0092f90834 100644 --- a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 - true enable diff --git a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj index 9fd61f126bfa4..54bdd1c173868 100644 --- a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 - true enable diff --git a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj index 0625f1b876b92..d322570ef48ec 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);netstandard2.1;netstandard2.0;net461 - true enable diff --git a/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj b/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj index d04eae0963b75..080d2f34b074a 100644 --- a/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj +++ b/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);netcoreapp3.1 - true diff --git a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj index 916c0b133ea5b..e995c093bb7c9 100644 --- a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj +++ b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj @@ -2,7 +2,6 @@ true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1 - true From 9b64140d35946a1d6071e7699b8f48b0984011d5 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 31 May 2021 19:02:29 +0200 Subject: [PATCH 2/8] Update packageindex for 6.0.0 --- src/libraries/pkg/baseline/packageIndex.json | 30 +++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json index 33389f789205c..bd71d21feea34 100644 --- a/src/libraries/pkg/baseline/packageIndex.json +++ b/src/libraries/pkg/baseline/packageIndex.json @@ -2724,7 +2724,8 @@ "netcoreapp2.1": "4.0.3.1", "netcoreapp3.0": "4.0.4.0", "netcoreapp3.1": "4.0.5.0", - "net5.0": "5.0.0.0" + "net5.0": "5.0.0.0", + "net6.0": "6.0.0.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", @@ -3415,7 +3416,8 @@ "InboxOn": { "netcoreapp2.1": "4.2.1.0", "netcoreapp3.1": "4.2.2.0", - "net5.0": "5.0.0.0" + "net5.0": "5.0.0.0", + "net6.0": "6.0.0.0" }, "AssemblyVersionInPackageVersion": { "4.2.0.0": "4.4.0", @@ -4827,7 +4829,8 @@ }, "System.Private.Runtime.InteropServices.JavaScript": { "InboxOn": { - "net5.0": "5.0.0.0" + "net5.0": "5.0.0.0", + "net6.0": "6.0.0.0" } }, "System.Private.Uri": { @@ -5420,7 +5423,8 @@ "InboxOn": { "netcoreapp3.0": "4.0.5.0", "netcoreapp3.1": "4.0.6.0", - "net5.0": "5.0.0.0" + "net5.0": "5.0.0.0", + "net6.0": "6.0.0.0" }, "AssemblyVersionInPackageVersion": { "4.0.3.0": "4.4.0", @@ -5657,7 +5661,8 @@ "InboxOn": { "netcoreapp3.0": "4.0.0.0", "netcoreapp3.1": "4.0.1.0", - "net5.0": "5.0.0.0" + "net5.0": "5.0.0.0", + "net6.0": "6.0.0.0" } }, "System.Runtime.Loader": { @@ -5671,12 +5676,12 @@ "netcoreapp2.1": "4.0.3.0", "netcoreapp3.0": "4.1.0.0", "netcoreapp3.1": "4.1.1.0", - "net5.0": "5.0.0.0" + "net5.0": "5.0.0.0", + "net6.0": "6.0.0.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", - "4.0.1.0": "4.3.0", - "4.1.0.0": "4.6.0" + "4.0.1.0": "4.3.0" } }, "System.Runtime.Numerics": { @@ -6790,7 +6795,8 @@ "InboxOn": { "netcoreapp3.0": "4.0.4.0", "netcoreapp3.1": "4.0.5.0", - "net5.0": "5.0.0.0" + "net5.0": "5.0.0.0", + "net6.0": "6.0.0.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", @@ -6815,7 +6821,8 @@ "InboxOn": { "netcoreapp3.0": "4.0.0.0", "netcoreapp3.1": "4.0.1.0", - "net5.0": "5.0.0.0" + "net5.0": "5.0.0.0", + "net6.0": "6.0.0.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.6.0", @@ -6949,7 +6956,8 @@ "InboxOn": { "netcoreapp3.0": "4.0.1.0", "netcoreapp3.1": "4.0.2.0", - "net5.0": "5.0.0.0" + "net5.0": "5.0.0.0", + "net6.0": "6.0.0.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.5.0", From 57f292c05d41b6ae4d0ffc02d074d72fda6abe63 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 1 Jun 2021 08:25:04 +0200 Subject: [PATCH 3/8] Update packaging package version --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35a4f685aad5f..07ad67d2b9ab9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,7 +38,7 @@ https://github.com/dotnet/arcade c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade c2a8af3f309fc27402fa9c18bac6df757a9c41ed diff --git a/eng/Versions.props b/eng/Versions.props index ecdbf5c6d6da7..d7e5598a45070 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,7 +59,7 @@ 6.0.0-beta.21276.5 2.5.1-beta.21276.5 6.0.0-beta.21276.5 - 6.0.0-beta.21276.5 + 6.0.0-beta.21281.1 6.0.0-beta.21276.5 6.0.0-beta.21276.5 6.0.0-beta.21276.5 From 2651a4455ed1b6391ee7741ddd5f4a642410c684 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 1 Jun 2021 13:19:15 +0200 Subject: [PATCH 4/8] Update Microsoft.DotNet.PackageTesting version --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07ad67d2b9ab9..98ded0ae0fc6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -186,7 +186,7 @@ https://github.com/dotnet/xharness fd2a4a5bb1f3e81f909cd8999eb43a1e8ff4848e - + https://github.com/dotnet/arcade c2a8af3f309fc27402fa9c18bac6df757a9c41ed diff --git a/eng/Versions.props b/eng/Versions.props index d7e5598a45070..df8314483621f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,7 +63,7 @@ 6.0.0-beta.21276.5 6.0.0-beta.21276.5 6.0.0-beta.21276.5 - 6.0.0-beta.21276.5 + 6.0.0-beta.21281.1 5.9.0-preview.2 From 8be7c3fa76321496bca3b4ced26a293686ff0e53 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 8 Jun 2021 13:44:51 +0200 Subject: [PATCH 5/8] Use targetingpack for package testing --- eng/targetingpacks.targets | 53 +++++++------------ .../linker/SupportFiles/Directory.Build.props | 1 + .../SupportFiles/Directory.Build.targets | 10 ---- ...ndencyInjection.Specification.Tests.csproj | 3 +- src/libraries/pkg/test/packageTest.targets | 6 ++- .../pkg/test/project.csproj.template | 16 +++--- .../pkg/test/props/Directory.Build.props | 1 - .../pkg/test/props/Directory.Build.targets | 9 ++++ src/libraries/pkg/test/test.msbuild | 2 +- src/libraries/pkg/test/testPackages.proj | 45 ++++++++-------- src/libraries/sendtohelixhelp.proj | 4 ++ 11 files changed, 68 insertions(+), 82 deletions(-) create mode 100644 src/libraries/pkg/test/props/Directory.Build.targets diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index da9407c5090d0..324b9e811859b 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -1,13 +1,24 @@ + + - $(MicrosoftNetCoreAppFrameworkName) + $(MicrosoftNetCoreAppFrameworkName) + $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NetCoreAppCurrentVersion)'))"> true false + false false @@ -38,22 +49,6 @@ Condition="'@(KnownCrossgen2Pack)' == '' or !@(KnownCrossgen2Pack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))" /> - - - - - $(PkgMicrosoft_NETCore_App)\ref\netcoreapp$(TargetFrameworkVersion.TrimStart('v'))\ - - - - - - - @@ -61,13 +56,12 @@ - + + '$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <_NetCoreAppTargetFrameworkIdentifier Condition="$([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '5.0'))">netcoreapp @@ -91,18 +85,6 @@ - - - - - - - - + Exists('$(MicrosoftNetCoreAppRefPackDir)data\FrameworkList.xml')" /> + Condition="'$(MicrosoftNetCoreAppRuntimePackDir)' != '' and + '%(ResolvedRuntimePack.FrameworkName)' == '$(LocalFrameworkOverrideName)'" /> diff --git a/eng/testing/linker/SupportFiles/Directory.Build.props b/eng/testing/linker/SupportFiles/Directory.Build.props index c1220c719b9af..013fa4fe07439 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.props +++ b/eng/testing/linker/SupportFiles/Directory.Build.props @@ -9,6 +9,7 @@ false true false + false true true diff --git a/eng/testing/linker/SupportFiles/Directory.Build.targets b/eng/testing/linker/SupportFiles/Directory.Build.targets index ecdbc7771bc69..be65537929f22 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.targets +++ b/eng/testing/linker/SupportFiles/Directory.Build.targets @@ -6,16 +6,6 @@ project.dll - - - - - - - diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj index 8a2a6e74cc7ba..4c1f40cce828d 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj @@ -1,10 +1,11 @@ - netstandard2.0 + netstandard2.0;net461 true false false + 3.1.15 Suite of xUnit.net tests to check for container compatibility with Microsoft.Extensions.DependencyInjection. diff --git a/src/libraries/pkg/test/packageTest.targets b/src/libraries/pkg/test/packageTest.targets index 29015e217fd70..809ff6f1b8fb6 100644 --- a/src/libraries/pkg/test/packageTest.targets +++ b/src/libraries/pkg/test/packageTest.targets @@ -19,10 +19,11 @@ true + + true - @@ -136,7 +137,8 @@ + Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and + '$(DisableVerifyNotDependsOnNetStandardTest)' != 'true'"> diff --git a/src/libraries/pkg/test/project.csproj.template b/src/libraries/pkg/test/project.csproj.template index eb0b959b521e6..d8e8cee39eb4b 100644 --- a/src/libraries/pkg/test/project.csproj.template +++ b/src/libraries/pkg/test/project.csproj.template @@ -1,21 +1,21 @@ - {TFMs} + {TargetFrameworks} {PackageId} - {PackageVersion} + + + {NetCoreAppCurrentVersion} + {NetCoreAppCurrent} + {MicrosoftNetCoreAppFrameworkName} + false - 99.0 - - - true - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\support + $(NetCoreAppCurrentVersion) - diff --git a/src/libraries/pkg/test/props/Directory.Build.props b/src/libraries/pkg/test/props/Directory.Build.props index 537832e4ac1b1..80f498ab06ad2 100644 --- a/src/libraries/pkg/test/props/Directory.Build.props +++ b/src/libraries/pkg/test/props/Directory.Build.props @@ -1,6 +1,5 @@ - false true diff --git a/src/libraries/pkg/test/props/Directory.Build.targets b/src/libraries/pkg/test/props/Directory.Build.targets new file mode 100644 index 0000000000000..e430be41794cf --- /dev/null +++ b/src/libraries/pkg/test/props/Directory.Build.targets @@ -0,0 +1,9 @@ + + + $(MSBuildThisFileDirectory)support\ + + + + + + diff --git a/src/libraries/pkg/test/test.msbuild b/src/libraries/pkg/test/test.msbuild index e7ad573abf4df..6a3c2cd0f9fef 100644 --- a/src/libraries/pkg/test/test.msbuild +++ b/src/libraries/pkg/test/test.msbuild @@ -5,7 +5,7 @@ $(MSBuildThisFileDirectory)..\projects - <_projectProperties>SupportFilesDir=$(MSBuildThisFileDirectory) + <_projectProperties>SupportFilesDir=$(MSBuildThisFileDirectory);MicrosoftNetCoreAppRefPackDir=$(MicrosoftNetCoreAppRefPackDir) $(MSBuildThisFileDirectory)\packages diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj index 2e3823c6067e5..c48bad658c73a 100644 --- a/src/libraries/pkg/test/testPackages.proj +++ b/src/libraries/pkg/test/testPackages.proj @@ -19,7 +19,7 @@ - + @@ -42,24 +42,19 @@ - - $(TestToolsDir) - - - $(TestToolsDir)eng/ - - - $(TestToolsDir)%(RecursiveDir) - - - $(TestDir) - - - $(TestSupportDir)%(RecursiveDir) - - - $(TestSupportDir) - + + + + + @@ -69,10 +64,10 @@ - - + Inputs="@(TestSupportFile)" + Outputs="@(TestSupportFile->'%(DestinationFolder)\%(FileName)%(Extension)')"> + + @@ -123,7 +118,7 @@ @@ -167,6 +162,7 @@ $(TestRestoreCommand) restore $(TestRestoreCommand) --packages "$(TestPackageDir)" $(TestRestoreCommand) /p:LocalPackagesPath=$(ArtifactsPackagesDir) + $(TestRestoreCommand) /p:MicrosoftNetCoreAppRefPackDir=$(MicrosoftNetCoreAppRefPackDir) $(TestRestoreCommand) /nr:false $(TestRestoreCommand) /warnaserror $(TestRestoreCommand) /p:PackagesToTest=$(PackagesToTest) @@ -186,6 +182,7 @@ $(TestBuildCommand) /t:Test $(TestBuildCommand) /nr:false $(TestBuildCommand) /warnaserror + $(TestBuildCommand) /p:MicrosoftNetCoreAppRefPackDir=$(MicrosoftNetCoreAppRefPackDir) $(TestBuildCommand) /p:PackagesToTest=$(PackagesToTest) diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 297ef5db68bbe..9388971412d90 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -76,6 +76,9 @@ + + + @@ -84,6 +87,7 @@ $(HelixCommand) /warnaserror $(HelixCommand) /p:PackageTestProjectsDir=%HELIX_WORKITEM_PAYLOAD% $(HelixCommand) /p:LocalPackagesPath="%HELIX_CORRELATION_PAYLOAD%\packages\" + $(HelixCommand) /p:MicrosoftNetCoreAppRefPackDir="%HELIX_CORRELATION_PAYLOAD%\build\targetingpack\" From ef8434f1ab5498bccae45aecc8d520df03f3bfa6 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 8 Jun 2021 16:09:59 +0200 Subject: [PATCH 6/8] Fixes --- eng/targetingpacks.targets | 13 +++++++- .../linker/SupportFiles/Directory.Build.props | 1 - .../SupportFiles/Directory.Build.targets | 10 ++++++ .../test/{props => }/Directory.Build.props | 2 ++ .../pkg/test/Directory.Build.targets | 4 +++ .../frameworkSettings/net5.0/settings.targets | 8 ----- .../frameworkSettings/net6.0/settings.targets | 11 ------- .../netcoreapp/settings.targets | 9 ++++- .../netcoreapp3.0/settings.targets | 7 ---- .../{net => netframework}/settings.targets | 0 .../netstandard/settings.targets | 2 +- .../disableNetstandardTest.targets | 0 src/libraries/pkg/test/packageTest.targets | 22 ++++++------- .../pkg/test/project.csproj.template | 9 ++++- .../pkg/test/props/Directory.Build.targets | 9 ----- src/libraries/pkg/test/testPackages.proj | 33 +++++++++++-------- src/libraries/sendtohelixhelp.proj | 4 +-- 17 files changed, 77 insertions(+), 67 deletions(-) rename src/libraries/pkg/test/{props => }/Directory.Build.props (63%) create mode 100644 src/libraries/pkg/test/Directory.Build.targets delete mode 100644 src/libraries/pkg/test/frameworkSettings/net5.0/settings.targets delete mode 100644 src/libraries/pkg/test/frameworkSettings/net6.0/settings.targets delete mode 100644 src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets rename src/libraries/pkg/test/frameworkSettings/{net => netframework}/settings.targets (100%) rename src/libraries/pkg/test/packageSettings/Microsoft.XmlSerializer.Generator/{net => netframework}/disableNetstandardTest.targets (100%) delete mode 100644 src/libraries/pkg/test/props/Directory.Build.targets diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index 324b9e811859b..695a238aa3c66 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -18,7 +18,6 @@ $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NetCoreAppCurrentVersion)'))"> true false - false false @@ -85,6 +84,18 @@ + + + + + + + + false true false - false true true diff --git a/eng/testing/linker/SupportFiles/Directory.Build.targets b/eng/testing/linker/SupportFiles/Directory.Build.targets index be65537929f22..ecdbc7771bc69 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.targets +++ b/eng/testing/linker/SupportFiles/Directory.Build.targets @@ -6,6 +6,16 @@ project.dll + + + + + + + diff --git a/src/libraries/pkg/test/props/Directory.Build.props b/src/libraries/pkg/test/Directory.Build.props similarity index 63% rename from src/libraries/pkg/test/props/Directory.Build.props rename to src/libraries/pkg/test/Directory.Build.props index 80f498ab06ad2..5baf3287b2e1e 100644 --- a/src/libraries/pkg/test/props/Directory.Build.props +++ b/src/libraries/pkg/test/Directory.Build.props @@ -2,4 +2,6 @@ true + + diff --git a/src/libraries/pkg/test/Directory.Build.targets b/src/libraries/pkg/test/Directory.Build.targets new file mode 100644 index 0000000000000..31ce0ecab0ccc --- /dev/null +++ b/src/libraries/pkg/test/Directory.Build.targets @@ -0,0 +1,4 @@ + + + + diff --git a/src/libraries/pkg/test/frameworkSettings/net5.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/net5.0/settings.targets deleted file mode 100644 index bc6aa5222f105..0000000000000 --- a/src/libraries/pkg/test/frameworkSettings/net5.0/settings.targets +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/libraries/pkg/test/frameworkSettings/net6.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/net6.0/settings.targets deleted file mode 100644 index a8fa34134f435..0000000000000 --- a/src/libraries/pkg/test/frameworkSettings/net6.0/settings.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - $(MicrosoftNETCoreAppVersion) - - - - - - - - \ No newline at end of file diff --git a/src/libraries/pkg/test/frameworkSettings/netcoreapp/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcoreapp/settings.targets index 6a7fbbe96d647..f1604d74dae11 100644 --- a/src/libraries/pkg/test/frameworkSettings/netcoreapp/settings.targets +++ b/src/libraries/pkg/test/frameworkSettings/netcoreapp/settings.targets @@ -1,11 +1,18 @@ - + true true + + + + + + + diff --git a/src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets deleted file mode 100644 index 1aa65488bec59..0000000000000 --- a/src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/libraries/pkg/test/frameworkSettings/net/settings.targets b/src/libraries/pkg/test/frameworkSettings/netframework/settings.targets similarity index 100% rename from src/libraries/pkg/test/frameworkSettings/net/settings.targets rename to src/libraries/pkg/test/frameworkSettings/netframework/settings.targets diff --git a/src/libraries/pkg/test/frameworkSettings/netstandard/settings.targets b/src/libraries/pkg/test/frameworkSettings/netstandard/settings.targets index e25068d3eceb1..4a40cba07e36c 100644 --- a/src/libraries/pkg/test/frameworkSettings/netstandard/settings.targets +++ b/src/libraries/pkg/test/frameworkSettings/netstandard/settings.targets @@ -1,5 +1,5 @@ - + true diff --git a/src/libraries/pkg/test/packageSettings/Microsoft.XmlSerializer.Generator/net/disableNetstandardTest.targets b/src/libraries/pkg/test/packageSettings/Microsoft.XmlSerializer.Generator/netframework/disableNetstandardTest.targets similarity index 100% rename from src/libraries/pkg/test/packageSettings/Microsoft.XmlSerializer.Generator/net/disableNetstandardTest.targets rename to src/libraries/pkg/test/packageSettings/Microsoft.XmlSerializer.Generator/netframework/disableNetstandardTest.targets diff --git a/src/libraries/pkg/test/packageTest.targets b/src/libraries/pkg/test/packageTest.targets index 809ff6f1b8fb6..37501c1567808 100644 --- a/src/libraries/pkg/test/packageTest.targets +++ b/src/libraries/pkg/test/packageTest.targets @@ -1,14 +1,9 @@ - - <_targetFrameworkVersionIndex>$(TargetFramework.IndexOfAny(".-0123456789")) - <_targetFrameworkIdentifier Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(TargetFramework.SubString(0, $(_targetFrameworkVersionIndex))) - - <_targetFrameworkIdentifier Condition="'$(_targetFrameworkIdentifier)' == 'net' and !$(TargetFramework.StartsWith('net4'))">netcoreapp + + <_targetFrameworkIdentifier>$(TargetFrameworkIdentifier.Substring(1).ToLower()) - $(MSBuildThisFileDirectory)tools\ - https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json; https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; @@ -23,12 +18,17 @@ true - - + + + + - - + + diff --git a/src/libraries/pkg/test/project.csproj.template b/src/libraries/pkg/test/project.csproj.template index d8e8cee39eb4b..ef6b193e0cc5a 100644 --- a/src/libraries/pkg/test/project.csproj.template +++ b/src/libraries/pkg/test/project.csproj.template @@ -1,4 +1,10 @@ - + + + $(SupportFilesDir)Directory.Build.props + $(SupportFilesDir)Directory.Build.targets + + + {TargetFrameworks} @@ -18,4 +24,5 @@ + diff --git a/src/libraries/pkg/test/props/Directory.Build.targets b/src/libraries/pkg/test/props/Directory.Build.targets deleted file mode 100644 index e430be41794cf..0000000000000 --- a/src/libraries/pkg/test/props/Directory.Build.targets +++ /dev/null @@ -1,9 +0,0 @@ - - - $(MSBuildThisFileDirectory)support\ - - - - - - diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj index c48bad658c73a..455dfb67508dd 100644 --- a/src/libraries/pkg/test/testPackages.proj +++ b/src/libraries/pkg/test/testPackages.proj @@ -1,5 +1,5 @@ - + [a-zA-z\.]*\. @@ -29,12 +29,11 @@ - $(ArtifactsBinDir)testPkg/ - $(TestDir)support/ + $(ArtifactsBinDir)testPkg\ + $(TestDir)support\ test.msbuild $(TestSupportDir)$(TestProjectName) - $(TestSupportDir)tools/ - $(TestDir)projects/ + $(TestDir)projects\ $(ArtifactsBinDir)testPackages $(DotNetRoot)dotnet @@ -42,19 +41,25 @@ + + + + $(LibrariesProjectRoot)shims\netfxreference.props; + packageTest.targets; + Directory.Build.props; + Directory.Build.targets" + DestinationFolder="$(TestSupportDir)" /> - - - + + + @@ -196,5 +201,5 @@ - + diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 9388971412d90..c9aa2da028bcb 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -78,7 +78,7 @@ - + @@ -87,7 +87,7 @@ $(HelixCommand) /warnaserror $(HelixCommand) /p:PackageTestProjectsDir=%HELIX_WORKITEM_PAYLOAD% $(HelixCommand) /p:LocalPackagesPath="%HELIX_CORRELATION_PAYLOAD%\packages\" - $(HelixCommand) /p:MicrosoftNetCoreAppRefPackDir="%HELIX_CORRELATION_PAYLOAD%\build\targetingpack\" + $(HelixCommand) /p:MicrosoftNetCoreAppRefPackDir="%HELIX_CORRELATION_PAYLOAD%\targetingpack\" From 99c7033354c44e76d7036a8c5c314981957b6f3a Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 8 Jun 2021 17:47:34 +0200 Subject: [PATCH 7/8] Fix escaping --- src/libraries/sendtohelixhelp.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index c9aa2da028bcb..93bd404c0b347 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -86,8 +86,8 @@ $(HelixCommand) /bl:%HELIX_WORKITEM_UPLOAD_ROOT%\%HELIX_WORKITEM_FRIENDLYNAME%.package.test.binlog $(HelixCommand) /warnaserror $(HelixCommand) /p:PackageTestProjectsDir=%HELIX_WORKITEM_PAYLOAD% - $(HelixCommand) /p:LocalPackagesPath="%HELIX_CORRELATION_PAYLOAD%\packages\" - $(HelixCommand) /p:MicrosoftNetCoreAppRefPackDir="%HELIX_CORRELATION_PAYLOAD%\targetingpack\" + $(HelixCommand) /p:LocalPackagesPath=%HELIX_CORRELATION_PAYLOAD%\packages\ + $(HelixCommand) /p:MicrosoftNetCoreAppRefPackDir=%HELIX_CORRELATION_PAYLOAD%\targetingpack\ From 54ac36f03cfab812b8f52da6ea4b40416829fc7d Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 8 Jun 2021 21:29:56 +0200 Subject: [PATCH 8/8] Fix package validation for non exposed inbox libs --- src/libraries/pkg/test/packageTest.targets | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/libraries/pkg/test/packageTest.targets b/src/libraries/pkg/test/packageTest.targets index 37501c1567808..1ca80d6e15ad1 100644 --- a/src/libraries/pkg/test/packageTest.targets +++ b/src/libraries/pkg/test/packageTest.targets @@ -81,14 +81,24 @@ + + + + + <_referenceCopyLocalPathsPackages Include="@(ReferenceCopyLocalPaths->'%(NuGetPackageId)')" - Condition="'%(ReferenceCopyLocalPaths.RuntimeIdentifier)' == ''" - Exclude="@(ReferencePath->'%(NuGetPackageId)');$(TestPackageId)" /> + Condition="'%(ReferenceCopyLocalPaths.RuntimeIdentifier)' == ''" + Exclude="@(ReferencePath->'%(NuGetPackageId)');$(TestPackageId)" />