diff --git a/docs/coding-guidelines/adding-api-guidelines.md b/docs/coding-guidelines/adding-api-guidelines.md index 1910130c9e7f8a..b9eba22012015f 100644 --- a/docs/coding-guidelines/adding-api-guidelines.md +++ b/docs/coding-guidelines/adding-api-guidelines.md @@ -24,8 +24,8 @@ the implementation without compat concerns in future releases. ### Determine target framework -`netcoreapp5.0` is the target framework version currently under development and the new apis -should be added to `netcoreapp5.0`. [More Information on TargetFrameworks](https://docs.microsoft.com/en-us/dotnet/standard/frameworks) +`net5.0` is the target framework version currently under development and the new apis +should be added to `net5.0`. [More Information on TargetFrameworks](https://docs.microsoft.com/en-us/dotnet/standard/frameworks) ## Making the changes in repo diff --git a/docs/coding-guidelines/project-guidelines.md b/docs/coding-guidelines/project-guidelines.md index 55728730a3c518..1f9793eb298e3f 100644 --- a/docs/coding-guidelines/project-guidelines.md +++ b/docs/coding-guidelines/project-guidelines.md @@ -28,7 +28,7 @@ Below is a list of all the various options we pivot the project builds on: ## Individual build properties The following are the properties associated with each build pivot -- `$(BuildTargetFramework) -> netstandard2.1 | netcoreapp5.0 | net472` +- `$(BuildTargetFramework) -> netstandard2.1 | net5.0 | net472` - `$(TargetOS) -> Windows | Linux | OSX | FreeBSD | [defaults to running OS when empty]` - `$(Configuration) -> Release | [defaults to Debug when empty]` - `$(TargetArchitecture) - x86 | x64 | arm | arm64 | [defaults to x64 when empty]` @@ -82,7 +82,7 @@ When we have a project that has a `netstandard2.0` target framework that means t A full or individual project build is centered around BuildTargetFramework, TargetOS, Configuration and TargetArchitecture. 1. `$(BuildTargetFramework), $(TargetOS), $(Configuration), $(TargetArchitecture)` can individually be passed in to change the default values. -2. If nothing is passed to the build then we will default value of these properties from the environment. Example: `netcoreapp5.0-[TargetOS Running On]-Debug-x64`. +2. If nothing is passed to the build then we will default value of these properties from the environment. Example: `net5.0-[TargetOS Running On]-Debug-x64`. 3. While Building an individual project from the VS, we build the project for all latest netcoreapp target frameworks. We also have `RuntimeOS` which can be passed to customize the specific OS and version needed for native package builds as well as package restoration. If not passed it will default based on the OS you are running on. @@ -121,7 +121,7 @@ The output for the ref project build will be a flat targeting pack folder in the ## src In the src directory for a library there should be only **one** `.csproj` file that contains any information necessary to build the library in various target frameworks. All supported target frameworks should be listed in the `TargetFrameworks` property. -All libraries should use `` for all their project references. That will cause them to be resolved against a targeting pack (i.e. `bin\ref\netcoreapp5.0` or `\bin\ref\netstanard2.0`) based on the project target framework. There should not be any direct project references to other libraries. The only exception to that rule right now is for partial facades which directly reference System.Private.CoreLib and thus need to directly reference other partial facades to avoid type conflicts. +All libraries should use `` for all their project references. That will cause them to be resolved against a targeting pack (i.e. `bin\ref\net5.0` or `\bin\ref\netstanard2.0`) based on the project target framework. There should not be any direct project references to other libraries. The only exception to that rule right now is for partial facades which directly reference System.Private.CoreLib and thus need to directly reference other partial facades to avoid type conflicts.
//**CONSIDER**: just using Reference and use a reference to System.Private.CoreLib as a trigger to turn the other References into a ProjectReference automatically. That will allow us to have consistency where all projects just use Reference. ### src output diff --git a/docs/design/coreclr/jit/viewing-jit-dumps.md b/docs/design/coreclr/jit/viewing-jit-dumps.md index 3d84c6872d7e86..3adf613fae85ef 100644 --- a/docs/design/coreclr/jit/viewing-jit-dumps.md +++ b/docs/design/coreclr/jit/viewing-jit-dumps.md @@ -20,7 +20,7 @@ The first thing to do is setup the .NET Core app we want to dump. Here are the s Exe - netcoreapp5.0 + net5.0 win-x64 @@ -58,17 +58,17 @@ The first thing to do is setup the .NET Core app we want to dump. Here are the s } ``` -* After you've finished editing the code, run `dotnet restore` and `dotnet publish -c Release`. This should drop all of the binaries needed to run your app in `bin/Release/netcoreapp5.0//publish`. +* After you've finished editing the code, run `dotnet restore` and `dotnet publish -c Release`. This should drop all of the binaries needed to run your app in `bin/Release/net5.0//publish`. * Overwrite the CLR dlls with the ones you've built locally. If you're a fan of the command line, here are some shell commands for doing this: ```shell # Windows - robocopy /e \artifacts\bin\coreclr\Windows_NT..Release \bin\Release\netcoreapp5.0\\publish > NUL - copy /y \artifacts\bin\coreclr\Windows_NT..Debug\clrjit.dll \bin\Release\netcoreapp5.0\\publish > NUL + robocopy /e \artifacts\bin\coreclr\Windows_NT..Release \bin\Release\net5.0\\publish > NUL + copy /y \artifacts\bin\coreclr\Windows_NT..Debug\clrjit.dll \bin\Release\net5.0\\publish > NUL # Unix - cp -rT /artifacts/bin/coreclr/..Release /bin/Release/netcoreapp5.0//publish - cp /artifacts/bin/coreclr/..Debug/libclrjit.so /bin/Release/netcoreapp5.0//publish + cp -rT /artifacts/bin/coreclr/..Release /bin/Release/net5.0//publish + cp /artifacts/bin/coreclr/..Debug/libclrjit.so /bin/Release/net5.0//publish ``` * Set the configuration knobs you need (see below) and run your published app. The info you want should be dumped to stdout. diff --git a/docs/project/dogfooding.md b/docs/project/dogfooding.md index 8af5db3b995a11..6b564f7ec239c3 100644 --- a/docs/project/dogfooding.md +++ b/docs/project/dogfooding.md @@ -117,8 +117,8 @@ This is the default case for applications - running against an installed .NET ru ```XML Exe - - netcoreapp5.0 + + net5.0 5.0.0-preview.1.20120.5 @@ -140,8 +140,8 @@ make it self-contained by adding a RuntimeIdentifier (RID). ```XML Exe - - netcoreapp5.0 + + net5.0 5.0.0-preview.1.20120.5 @@ -152,7 +152,7 @@ make it self-contained by adding a RuntimeIdentifier (RID). ``` $ dotnet restore $ dotnet publish -$ bin\Debug\netcoreapp5.0\win-x64\publish\App.exe +$ bin\Debug\net5.0\win-x64\publish\App.exe ``` ## More Advanced Scenario - Using your local CoreFx build diff --git a/docs/workflow/building/libraries/README.md b/docs/workflow/building/libraries/README.md index 620bd063b52d56..e790e9997659cd 100644 --- a/docs/workflow/building/libraries/README.md +++ b/docs/workflow/building/libraries/README.md @@ -74,7 +74,7 @@ The libraries build has two logical components, the native build which produces The build settings (BuildTargetFramework, TargetOS, Configuration, Architecture) are generally defaulted based on where you are building (i.e. which OS or which architecture) but we have a few shortcuts for the individual properties that can be passed to the build scripts: -- `-framework|-f` identifies the target framework for the build. Possible values include `netcoreapp5.0` (currently the latest .NET Core version) or `net472`. (msbuild property `BuildTargetFramework`) +- `-framework|-f` identifies the target framework for the build. Possible values include `net5.0` (currently the latest .NET version) or `net472`. (msbuild property `BuildTargetFramework`) - `-os` identifies the OS for the build. It defaults to the OS you are running on but possible values include `Windows_NT`, `Unix`, `Linux`, or `OSX`. (msbuild property `TargetOS`) - `-configuration|-c Debug|Release` controls the optimization level the compilers use for the build. It defaults to `Debug`. (msbuild property `Configuration`) - `-arch` identifies the architecture for the build. It defaults to `x64` but possible values include `x64`, `x86`, `arm`, or `arm64`. (msbuild property `TargetArchitecture`) @@ -98,7 +98,7 @@ By default the `build` script only builds the product libraries and none of the - Building for different target frameworks (restore and build are implicit again as no action is passed in) ```bash -./build.sh -subset libs -framework netcoreapp5.0 +./build.sh -subset libs -framework net5.0 ./build.sh -subset libs -framework net472 ``` diff --git a/docs/workflow/building/libraries/code-coverage.md b/docs/workflow/building/libraries/code-coverage.md index ad67ed4301d3e4..7b77512d767eb6 100644 --- a/docs/workflow/building/libraries/code-coverage.md +++ b/docs/workflow/building/libraries/code-coverage.md @@ -36,7 +36,7 @@ This runs the tests and generates the full code coverage report. The resulting i You can also build and test with code coverage for a particular test project rather than for the whole repo with the `/p:Coverage=true` property: - dotnet test -f netcoreapp5.0 /p:Coverage=true + dotnet test -f net5.0 /p:Coverage=true The results for this one library will then be available in this index.htm file, where $(OutDir) is the directory where the binaries were generated. @@ -44,7 +44,7 @@ The results for this one library will then be available in this index.htm file, For example, to build, test, and get code coverage results for the System.Diagnostics.Debug library, from the root of the repo one can do: - dotnet test src\libraries\System.Diagnostics.Debug -f netcoreapp5.0 /p:Coverage=true + dotnet test src\libraries\System.Diagnostics.Debug -f net5.0 /p:Coverage=true And then once the run completes: diff --git a/docs/workflow/building/libraries/cross-building.md b/docs/workflow/building/libraries/cross-building.md index 2db7c5887b8392..c7b0fe1fda42f2 100644 --- a/docs/workflow/building/libraries/cross-building.md +++ b/docs/workflow/building/libraries/cross-building.md @@ -85,7 +85,7 @@ You can also build just managed code with: $ ./build.sh --arch arm /p:BuildNative=false -The output is at `artifacts/bin/[BuildSettings]` where `BuildSettings` looks something like `netcoreapp5.0--Debug-`. Ex: `artifacts/bin/netcoreapp5.0-Linux-Debug-x64`. For more details on the build configurations see [project-guidelines](/docs/coding-guidelines/project-guidelines.md) +The output is at `artifacts/bin/[BuildSettings]` where `BuildSettings` looks something like `net5.0--Debug-`. Ex: `artifacts/bin/net5.0-Linux-Debug-x64`. For more details on the build configurations see [project-guidelines](/docs/coding-guidelines/project-guidelines.md) Building corefx for Linux ARM Emulator ======================================= @@ -118,14 +118,14 @@ When building for a new architecture you will need to build the native pieces se Example building for armel ``` src/Native/build-native.sh armel ---> Output goes to artifacts/bin/runtime/netcoreapp5.0-Linux-Debug-armel +--> Output goes to artifacts/bin/runtime/net5.0-Linux-Debug-armel build /p:TargetArchitecture=x64 /p:BuildNative=false ---> Output goes to artifacts/bin/runtime/netcoreapp5.0-Linux-Debug-x64 +--> Output goes to artifacts/bin/runtime/net5.0-Linux-Debug-x64 ``` The reason you need to build the managed portion for x64 is because it depends on runtime packages for the new architecture which don't exist yet so we use another existing architecture such as x64 as a proxy for building the managed binaries. -Similar if you want to try and run tests you will have to copy the managed assemblies from the proxy directory (i.e. `netcoreapp5.0-Linux-Debug-x64`) to the new architecture directory (i.e `netcoreapp5.0-Linux-Debug-armel`) and run code via another host such as corerun because dotnet is at a higher level and most likely doesn't exist for the new architecture yet. +Similar if you want to try and run tests you will have to copy the managed assemblies from the proxy directory (i.e. `net5.0-Linux-Debug-x64`) to the new architecture directory (i.e `net5.0-Linux-Debug-armel`) and run code via another host such as corerun because dotnet is at a higher level and most likely doesn't exist for the new architecture yet. Once all the necessary builds are setup and packages are published the splitting of the build and manual creation of the runtime should no longer be necessary. diff --git a/docs/workflow/testing/libraries/testing.md b/docs/workflow/testing/libraries/testing.md index a221d849330c64..bf100c4ba485a9 100644 --- a/docs/workflow/testing/libraries/testing.md +++ b/docs/workflow/testing/libraries/testing.md @@ -59,7 +59,7 @@ dotnet build /t:Test /p:Outerloop=true #### Running tests on a different target framework -Each test project can potentially have multiple target frameworks. There are some tests that might be OS-specific, or might be testing an API that is available only on some target frameworks, so the `TargetFrameworks` property specifies the valid target frameworks. By default we will build and run only the default build target framework which is `netcoreapp5.0`. The rest of the `TargetFrameworks` will need to be built and ran by specifying the `BuildTargetFramework` option, e.g.: +Each test project can potentially have multiple target frameworks. There are some tests that might be OS-specific, or might be testing an API that is available only on some target frameworks, so the `TargetFrameworks` property specifies the valid target frameworks. By default we will build and run only the default build target framework which is `net5.0`. The rest of the `TargetFrameworks` will need to be built and ran by specifying the `BuildTargetFramework` option, e.g.: ```cmd dotnet build src\libraries\System.Runtime\tests\System.Runtime.Tests.csproj /p:BuildTargetFramework=net472 ``` diff --git a/eng/Configurations.props b/eng/Configurations.props index 90749696535849..764887c3ae5a6f 100644 --- a/eng/Configurations.props +++ b/eng/Configurations.props @@ -19,7 +19,7 @@ 5.0 .NETCoreApp,Version=v$(NETCoreAppCurrentVersion) - netcoreapp$(NETCoreAppCurrentVersion) + net$(NETCoreAppCurrentVersion) net472 Microsoft.NETCore.App diff --git a/eng/Versions.props b/eng/Versions.props index b8db12d80bf14d..d06e2c5729cffa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ $(MajorVersion).$(MinorVersion) $(MajorVersion).$(MinorVersion) - netcoreapp$(NETCoreAppFrameworkVersion) + net$(NETCoreAppFrameworkVersion) $(TargetOS) diff --git a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj index 2301a43899e2ba..2c74bc81f267d2 100644 --- a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj +++ b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj @@ -34,7 +34,7 @@ - + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj index 088fd5b14e4ddb..61a5cedc58bd8c 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj index ef3813216e819d..13214ba45ced13 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj index 5708511e1d75b6..33d909eeb98384 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj @@ -5,7 +5,7 @@ true - + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj index ba800636123dd5..8e8efebdf748b0 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj index c9c24fe48da3ce..0333fb952b4613 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/Tfm.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/Tfm.cs index a52d1424907e43..fd74831782cd27 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/Tfm.cs +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/Tfm.cs @@ -14,7 +14,7 @@ public static class Tfm public const string NetCoreApp22 = "netcoreapp2.2"; public const string NetCoreApp30 = "netcoreapp3.0"; public const string NetCoreApp31 = "netcoreapp3.1"; - public const string NetCoreApp50 = "netcoreapp5.0"; + public const string NetCoreApp50 = "net5.0"; public static bool Matches(string tfm1, string tfm2) { diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj index f9a2de3e367185..d45b23a82569a9 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj @@ -10,7 +10,7 @@ Link="Common\Extensions\ProviderAliasUtilities\ProviderAliasUtilities.cs" /> - + 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 f08b27767fa03a..204a13c1432525 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 @@ -6,7 +6,7 @@ $(NoWarn);CS1591 - + diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj index 48984ed7608c7a..4d4d73f32c648c 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 - + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj index cbed80347f73a9..f5b1a59103b9c8 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 - + 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 4edccf648f5b57..92881fdf9439f0 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 @@ -23,7 +23,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj index 1e9169b5398f80..9980467a3404bd 100644 --- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 - + diff --git a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj index ceb7da4e10afef..c8a03b2300a2ce 100644 --- a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj @@ -15,7 +15,7 @@ Link="Common\src\Extensions\Logging\NullScope.cs" /> - + diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj index 6b2846fb2bfe7a..67e55d95d6322e 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj index 4dc98afb38bc84..043d82dc2348f7 100644 --- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj +++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj index e9ce2f94bc018d..94e49733c1e115 100644 --- a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj +++ b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj @@ -10,7 +10,7 @@ - + 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 09a6496d4f735e..b5de2b4e6f39d4 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -19,7 +19,7 @@ - + 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 3f5295069922f7..9721ceb1cf63c4 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj @@ -120,7 +120,7 @@ - + @@ -133,7 +133,7 @@ - + diff --git a/src/libraries/Native/build-native.sh b/src/libraries/Native/build-native.sh index 459d4efa7e7aed..84061ea1b2cefa 100755 --- a/src/libraries/Native/build-native.sh +++ b/src/libraries/Native/build-native.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -usage_list=("-outconfig: Configuration, typically a quadruplet such as 'netcoreapp5.0-Linux-Release-x64', used to name output directory.") +usage_list=("-outconfig: Configuration, typically a quadruplet such as 'net5.0-Linux-Release-x64', used to name output directory.") usage_list+=("-staticLibLink: Optional argument to statically link any native library.") __scriptpath="$(cd "$(dirname "$0")"; pwd -P)" 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 b6f83a9303612e..48e1f0bde560bd 100644 --- a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj @@ -7,7 +7,7 @@ - + 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 4f19c41a9566f0..d456db9f3e9a40 100644 --- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -103,7 +103,7 @@ - + diff --git a/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj b/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj index 066499e120e3f5..17571c6c8694fe 100644 --- a/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj +++ b/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj @@ -16,7 +16,7 @@ - + @@ -25,7 +25,7 @@ - + diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj index 0f21a324e8d371..eb8dda3696e84e 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj +++ b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj @@ -6,7 +6,7 @@ 9.9.9.9 $(NetCoreAppCurrent) - + diff --git a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj index fae1d4653d2659..5bb9d46a3a8f55 100644 --- a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj +++ b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj @@ -57,7 +57,7 @@ - + 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 6bd8dbaeb7932f..ada2f69d139ae2 100644 --- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj @@ -11,7 +11,7 @@ true SR.Odbc_PlatformNotSupported - + - + @@ -158,7 +158,7 @@ - + diff --git a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj index 69878d2f803d70..25f14fad33f0fe 100644 --- a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj +++ b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj @@ -7,7 +7,7 @@ $(NetCoreAppCurrent) true - + @@ -22,7 +22,7 @@ - + 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 88efa519d71d11..df8de8a03def2e 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj @@ -54,15 +54,15 @@ - + - + - + 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 0eb660d3721ce0..aa323c854672b5 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj @@ -10,7 +10,7 @@ true SR.PlatformNotSupported_EventLog - + 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 7ac7a3375add70..5c19edbe2729b6 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,7 @@ AnyCPU true - netcoreapp2.0-Windows_NT;netstandard2.0;net461;$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;netcoreapp2.0-Windows_NT;netstandard2.0;net461;$(NetFrameworkCurrent) true true @@ -11,7 +11,7 @@ true SR.PlatformNotSupported_PerfCounters - + diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj index 9fb4f91ebee6e5..ee76c5dd787b72 100644 --- a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj +++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj b/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj index 7b56805d4690dd..35c33d0095d48d 100644 --- a/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj +++ b/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj @@ -5,8 +5,8 @@ true true - - + + 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 0c4c35db9e2009..b165ae7c6e4de3 100644 --- a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj @@ -164,7 +164,7 @@ - + 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 0dc9008be083bf..323535b72d7817 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 @@ -11,7 +11,7 @@ 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 5a8578d0b8fea5..804d66203782d4 100644 --- a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj @@ -37,10 +37,10 @@ - + - + diff --git a/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj b/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj index 133a77ae229cd4..0e9b268811fcf8 100644 --- a/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj +++ b/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj @@ -3,7 +3,7 @@ true $(NetCoreAppCurrent);$(NetFrameworkCurrent) - + @@ -40,7 +40,7 @@ - + diff --git a/src/libraries/System.Net.Primitives/src/MatchingRefApiCompatBaseline.netcoreapp5.0.txt b/src/libraries/System.Net.Primitives/src/MatchingRefApiCompatBaseline.txt similarity index 100% rename from src/libraries/System.Net.Primitives/src/MatchingRefApiCompatBaseline.netcoreapp5.0.txt rename to src/libraries/System.Net.Primitives/src/MatchingRefApiCompatBaseline.txt diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj index fc39bc7522cfd6..8a245e86d30697 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj @@ -64,8 +64,6 @@ Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" /> - - diff --git a/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj b/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj index 820c670259c907..c82e88cf2d9074 100644 --- a/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj +++ b/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj @@ -5,8 +5,6 @@ - - \ No newline at end of file diff --git a/src/libraries/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj index 1a4c1eb0e8272d..0f61d84baa2576 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj +++ b/src/libraries/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/libraries/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj b/src/libraries/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj index 2cfa8befc7927b..4478a1e5b98bba 100644 --- a/src/libraries/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj +++ b/src/libraries/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj index a75198502f58b8..33546830d98fc0 100644 --- a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj @@ -11,9 +11,8 @@ - + - @@ -21,7 +20,7 @@ - + \ No newline at end of file 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 59a200e6f1f899..2ace8896347f87 100644 --- a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -95,14 +95,14 @@ - - + + - + @@ -261,6 +261,6 @@ - + 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 c3f11038664605..21c96c0c49de01 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj @@ -79,8 +79,8 @@ - - + + diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/include/netcoreapp5.0/coreassembly.h b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/include/net5.0/coreassembly.h similarity index 100% rename from src/libraries/System.Runtime.CompilerServices.Unsafe/src/include/netcoreapp5.0/coreassembly.h rename to src/libraries/System.Runtime.CompilerServices.Unsafe/src/include/net5.0/coreassembly.h diff --git a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj index a7b8530ad462bf..968f8f18097fab 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj +++ b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj @@ -89,6 +89,6 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj index 7ab1781829b810..ac8067e6b8b1bd 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj +++ b/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj @@ -101,7 +101,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/src/libraries/System.Runtime.Intrinsics.Experimental/pkg/System.Runtime.Intrinsics.Experimental.pkgproj b/src/libraries/System.Runtime.Intrinsics.Experimental/pkg/System.Runtime.Intrinsics.Experimental.pkgproj index ac6aec13465f5d..6af23d1c444546 100644 --- a/src/libraries/System.Runtime.Intrinsics.Experimental/pkg/System.Runtime.Intrinsics.Experimental.pkgproj +++ b/src/libraries/System.Runtime.Intrinsics.Experimental/pkg/System.Runtime.Intrinsics.Experimental.pkgproj @@ -2,7 +2,7 @@ - netcoreapp5.0 + net5.0 diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj b/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj index e88dfc5131e1d1..526780399721c7 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj +++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj @@ -15,7 +15,7 @@ - + @@ -28,11 +28,11 @@ - + - + diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj index 1abbad29262dbc..dfc0e200790df4 100644 --- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj +++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj @@ -7,11 +7,11 @@ - + - + \ No newline at end of file diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj index b6d81a8df6ce93..eec5f2ad4993da 100644 --- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj +++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj @@ -10,7 +10,7 @@ true 4.0.1.0 - + @@ -29,7 +29,7 @@ - + diff --git a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj index b08c25f6139884..93a7d07d648cff 100644 --- a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj +++ b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj @@ -18,13 +18,13 @@ - + - + diff --git a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj index 1740a7e4498999..6dae361dbffcd6 100644 --- a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj +++ b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj @@ -5,9 +5,6 @@ $(NoWarn);1698;0436 - 4.0.0.0 - 4.0.11.0 - $(DefineConstants);FEATURE_APPX $(NetCoreAppCurrent)-Windows_NT;netstandard1.0;netstandard1.2;netstandard2.0 true enable @@ -16,8 +13,11 @@ SR.PlatformNotSupported_WindowsRuntime true + 4.0.0.0 + 4.0.11.0 + $(DefineConstants);FEATURE_APPX - + @@ -75,13 +75,13 @@ - + - + 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 6cf626b7ac6aa1..d5c601747004d8 100644 --- a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj @@ -18,7 +18,7 @@ - + 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 38199f065079a2..5218ab9aa1ae9d 100644 --- a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj @@ -14,7 +14,7 @@ - + @@ -88,7 +88,7 @@ - + diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj index 95f54038aef8e4..5f3e261e923027 100644 --- a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj @@ -94,7 +94,7 @@ - + @@ -102,7 +102,7 @@ - + diff --git a/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj b/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj index 812fe3d3d806f9..6650cbce60e9d9 100644 --- a/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj +++ b/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj @@ -1,7 +1,6 @@ - $(DefineConstants);FEATURE_ECPARAMETERS - netcoreapp3.0;netstandard2.1;net461;net462;net47;$(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;net461;net462;net47;$(NetFrameworkCurrent) true true enable @@ -9,9 +8,10 @@ - $(DefineConstants);FEATURE_DSA_HASHDATA + $(DefineConstants);FEATURE_DSA_HASHDATA - $(DefineConstants);FEATURE_ECDH_DERIVEFROM + $(DefineConstants);FEATURE_ECDH_DERIVEFROM + $(DefineConstants);FEATURE_ECPARAMETERS true diff --git a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj index 4cf51963dbd2da..395f9a3db84454 100644 --- a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj @@ -68,7 +68,7 @@ - + diff --git a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj index 3c38c8db5a4c91..838235ca5248e1 100644 --- a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj @@ -28,8 +28,6 @@ Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs" /> - - diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj index d0679830b1ca5d..4f7eff09e987c6 100644 --- a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj +++ b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj @@ -1,11 +1,14 @@ true - 4.1.0.0 netcoreapp3.0-Unix;netcoreapp3.0;netstandard2.0;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) true enable + + + 4.1.0.0 + SR.PlatformNotSupported_CryptographyOpenSSL - $(DefineConstants);BUILDING_INBOX_LIBRARY - $(NoWarn);nullable + $(DefineConstants);BUILDING_INBOX_LIBRARY + $(NoWarn);nullable - + diff --git a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj index 85a5933182df83..1979d807a7c0c4 100644 --- a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj +++ b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj @@ -4,8 +4,6 @@ $(NoWarn);xUnit2008 $(NetCoreAppCurrent);$(NetFrameworkCurrent) - - @@ -34,7 +32,7 @@ - + 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 55a4fd065a7f4b..658b5221eade3c 100644 --- a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj @@ -1,16 +1,16 @@ - netcoreapp3.0;netstandard1.3;netstandard2.0;$(NetCoreAppCurrent) + $(NetCoreAppCurrent);netcoreapp3.0;netstandard1.3;netstandard2.0 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 bc19308afa4061..f6f466c6260210 100644 --- a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj @@ -8,16 +8,16 @@ - - + + - + - + @@ -38,7 +38,7 @@ - + diff --git a/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj b/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj index 60a49961d5b41c..a2811146aa12f7 100644 --- a/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj +++ b/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj @@ -5,9 +5,7 @@ - - @@ -16,4 +14,8 @@ + + + + diff --git a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj index c3ca5e07393daf..4ef79b71fc4671 100644 --- a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj +++ b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.netcoreapp5.0.cs b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.net5.0.cs similarity index 100% rename from src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.netcoreapp5.0.cs rename to src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.net5.0.cs diff --git a/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj b/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj index b33f9610b92986..92e4d04476e3ca 100644 --- a/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj +++ b/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj @@ -5,8 +5,6 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) true true - - true @@ -38,13 +36,13 @@ - + - + \ No newline at end of file diff --git a/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj b/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj index ee2ce0e455bc5d..f0ec4ac41eb927 100644 --- a/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj +++ b/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj @@ -6,7 +6,7 @@ - + \ No newline at end of file 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 d015a6a5d191b5..43c366dda9fac8 100644 --- a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj +++ b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj @@ -55,7 +55,7 @@ - + diff --git a/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj b/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj index 8323405d149a1b..330eda4f580be6 100644 --- a/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj +++ b/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj @@ -1,6 +1,5 @@ - System.Xml.XPath.XDocument true true $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix @@ -8,7 +7,7 @@ - + diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json index 54faecb5593b6e..5a90065e0e6640 100644 --- a/src/libraries/pkg/baseline/packageIndex.json +++ b/src/libraries/pkg/baseline/packageIndex.json @@ -87,7 +87,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.3.0", "netcoreapp2.1": "4.0.4.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+win8+wpa81": "4.0.0.0", "portable46-net451+win81+wpa81": "4.0.0.0", @@ -1119,7 +1119,7 @@ "InboxOn": { "netcoreapp2.0": "10.0.3.0", "netcoreapp2.1": "10.0.4.0", - "netcoreapp5.0": "10.0.6.0", + "net5.0": "10.0.6.0", "net45": "10.0.0.0", "portable45-net45+win8+wpa81": "10.0.0.0", "portable46-net451+win81+wpa81": "10.0.0.0", @@ -1152,7 +1152,7 @@ "BaselineVersion": "11.0.0", "InboxOn": { "netcoreapp3.0": "10.0.4.0", - "netcoreapp5.0": "10.0.6.0" + "net5.0": "10.0.6.0" } }, "Microsoft.VisualC": { @@ -1175,7 +1175,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", @@ -1536,7 +1536,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.1.0.0", "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", @@ -1565,7 +1565,7 @@ "netcoreapp2.0": "4.0.2.0", "netcoreapp2.1": "4.0.3.0", "netcoreapp3.0": "4.0.4.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "uap10.0.16299": "4.0.3.0" }, "AssemblyVersionInPackageVersion": { @@ -1601,7 +1601,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -1644,7 +1644,7 @@ "BaselineVersion": "4.3.0", "InboxOn": { "netcoreapp2.0": "4.0.14.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -1687,7 +1687,7 @@ "netcoreapp2.0": "1.2.2.0", "netcoreapp2.1": "1.2.3.0", "netcoreapp3.0": "1.2.4.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "uap10.0.16299": "1.2.3.0" }, "AssemblyVersionInPackageVersion": { @@ -1711,7 +1711,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", @@ -1738,7 +1738,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", @@ -1764,7 +1764,7 @@ "BaselineVersion": "4.3.0", "InboxOn": { "netcoreapp2.0": "4.0.3.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+win8+wpa81": "4.0.0.0", "portable46-net451+win81+wpa81": "4.0.0.0", @@ -1811,7 +1811,7 @@ "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", "netcoreapp3.0": "4.3.0.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable46-net451+win81": "4.0.0.0", @@ -1896,7 +1896,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -1939,7 +1939,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.1.0.0", "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", @@ -1966,7 +1966,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.1.0.0", "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", @@ -2117,7 +2117,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -2185,7 +2185,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.1.0.0", "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", @@ -2209,7 +2209,7 @@ "BaselineVersion": "4.5.0", "InboxOn": { "netcoreapp3.0": "4.0.0.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0" }, "AssemblyVersionInPackageVersion": { @@ -2352,7 +2352,7 @@ "BaselineVersion": "4.3.0", "InboxOn": { "netcoreapp2.0": "4.0.3.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+win8+wpa81": "4.0.0.0", "portable46-net451+win81+wpa81": "4.0.0.0", @@ -2394,7 +2394,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -2443,7 +2443,7 @@ "netcoreapp2.0": "4.0.2.1", "netcoreapp2.1": "4.0.3.1", "netcoreapp3.0": "4.0.4.0", - "netcoreapp5.0": "5.0.0.0" + "net5.0": "5.0.0.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", @@ -2478,7 +2478,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.2.0", "netcoreapp2.1": "4.0.3.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -2523,7 +2523,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.1.0.0", "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", @@ -2551,7 +2551,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.2.0", "netstandard2.0": "4.0.2.0", "monoandroid10": "Any", @@ -2578,7 +2578,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -2604,7 +2604,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+win8+wpa81": "4.0.0.0", "portable46-net451+win81+wpa81": "4.0.0.0", @@ -2654,7 +2654,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -2682,7 +2682,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net451": "4.0.10.0", "net46": "4.0.20.0", @@ -2799,7 +2799,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.2.0.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -2832,7 +2832,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -2882,7 +2882,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -2925,7 +2925,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", @@ -2952,7 +2952,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", @@ -2995,7 +2995,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "net461": "4.1.0.0", @@ -3040,7 +3040,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net461": "4.1.1.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -3069,7 +3069,7 @@ "System.IO.Compression.Brotli": { "InboxOn": { "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0" + "net5.0": "5.0.0.0" }, "AssemblyVersionInPackageVersion": { "4.2.0.0": "4.4.0", @@ -3079,7 +3079,7 @@ "System.IO.Compression.FileSystem": { "InboxOn": { "netcoreapp2.0": "4.0.0.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -3101,7 +3101,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.3.0", "netcoreapp2.1": "4.0.4.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", @@ -3128,7 +3128,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", @@ -3175,7 +3175,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -3201,7 +3201,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", @@ -3227,7 +3227,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -3253,7 +3253,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", @@ -3284,7 +3284,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -3346,7 +3346,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "uap10.0.16299": "4.1.1.0" @@ -3398,7 +3398,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", @@ -3446,7 +3446,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net461": "4.1.0.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -3490,7 +3490,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "net461": "4.1.0.0", @@ -3533,7 +3533,7 @@ "BaselineVersion": "4.3.0", "InboxOn": { "netcoreapp2.0": "4.0.3.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+win8+wpa81": "4.0.0.0", "portable46-net451+win81+wpa81": "4.0.0.0", @@ -3566,7 +3566,7 @@ "BaselineVersion": "5.0.0", "InboxOn": { "netcoreapp2.0": "4.0.3.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+win8+wpa81": "4.0.0.0", "portable46-net451+win81+wpa81": "4.0.0.0", @@ -3626,7 +3626,7 @@ "InboxOn": { "netcoreapp2.1": "4.1.0.0", "netcoreapp3.0": "4.2.0.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", "xamarinios10": "Any", @@ -3714,7 +3714,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net461": "4.1.1.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -3817,7 +3817,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.0.0", "netcoreapp2.1": "4.0.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", "uap10.0.16299": "4.0.1.0", @@ -3831,7 +3831,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.0.0", "netcoreapp2.1": "4.0.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", "uap10.0.16299": "4.0.1.0", @@ -3850,7 +3850,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -3876,7 +3876,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "net461": "4.1.0.0", @@ -3918,7 +3918,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -3948,7 +3948,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -3999,7 +3999,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -4046,7 +4046,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -4066,7 +4066,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.0.0", "netcoreapp2.1": "4.0.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", "uap10.0.16299": "4.0.1.0", @@ -4086,7 +4086,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.1.0.0", "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", @@ -4118,7 +4118,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.0.0", "netcoreapp2.1": "4.0.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "uap10.0.16299": "4.0.1.0" } }, @@ -4132,7 +4132,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net46": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -4153,7 +4153,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.0.0", "netcoreapp2.1": "4.0.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "uap10.0.16299": "4.0.1.0" } }, @@ -4166,7 +4166,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -4195,7 +4195,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -4276,7 +4276,7 @@ "netcoreapp2.0": "4.1.3.0", "netcoreapp2.1": "4.1.4.0", "netcoreapp3.0": "4.1.5.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net46": "4.0.0.0", "net461": "4.1.2.0", "monoandroid10": "Any", @@ -4324,7 +4324,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -4411,7 +4411,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "net461": "4.1.0.0", @@ -4482,7 +4482,7 @@ "netcoreapp2.0": "4.0.3.0", "netcoreapp2.1": "4.0.4.0", "netcoreapp3.0": "4.0.5.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", "uap10.0.16299": "4.0.4.0", @@ -4513,7 +4513,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "netstandard2.1": "4.0.0.0", "monoandroid10": "Any", @@ -4542,7 +4542,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.3.0", "netcoreapp3.0": "4.1.0.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+wp8": "4.0.0.0", "netstandard2.1": "4.0.0.0", @@ -4572,7 +4572,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.3.0", "netcoreapp3.0": "4.1.0.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+wp8": "4.0.0.0", "netstandard2.1": "4.0.0.0", @@ -4600,7 +4600,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+win8+wpa81": "4.0.0.0", "portable46-net451+win81+wpa81": "4.0.0.0", @@ -4650,7 +4650,7 @@ "netcoreapp2.0": "1.4.2.0", "netcoreapp2.1": "1.4.3.0", "netcoreapp3.0": "1.4.4.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "uap10.0.16299": "1.4.3.0" }, "AssemblyVersionInPackageVersion": { @@ -4686,7 +4686,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+win8+wpa81": "4.0.0.0", "portable46-net451+win81+wpa81": "4.0.0.0", @@ -4732,7 +4732,7 @@ "netcoreapp2.0": "4.1.2.0", "netcoreapp2.1": "4.1.3.0", "netcoreapp3.0": "4.1.4.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", "uap10.0.16299": "4.1.3.0", @@ -4771,7 +4771,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "uap10.0.16299": "4.1.1.0" @@ -4801,7 +4801,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+win8+wpa81": "4.0.0.0", "portable46-net451+win81+wpa81": "4.0.0.0", @@ -4841,7 +4841,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "uap10.0.16299": "4.1.1.0" @@ -4866,7 +4866,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net451": "4.0.10.0", "net46": "4.0.20.0", @@ -4936,7 +4936,7 @@ "BaselineVersion": "5.0.0", "InboxOn": { "netcoreapp3.0": "4.0.5.0", - "netcoreapp5.0": "5.0.0.0" + "net5.0": "5.0.0.0" }, "AssemblyVersionInPackageVersion": { "4.0.3.0": "4.4.0", @@ -4955,7 +4955,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -4990,7 +4990,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "net461": "4.1.0.0", @@ -5034,7 +5034,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net46": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -5063,7 +5063,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net451": "4.0.10.0", "net46": "4.0.20.0", @@ -5102,7 +5102,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.2.0", "netcoreapp2.1": "4.0.3.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", "uap10.0.16299": "4.0.3.0", @@ -5126,7 +5126,7 @@ "BaselineVersion": "5.0.0", "InboxOn": { "netcoreapp2.0": "4.0.3.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+win8+wpa81": "4.0.0.0", "portable46-net451+win81+wpa81": "4.0.0.0", @@ -5159,7 +5159,7 @@ "System.Runtime.Intrinsics": { "InboxOn": { "netcoreapp3.0": "4.0.0.0", - "netcoreapp5.0": "5.0.0.0" + "net5.0": "5.0.0.0" } }, "System.Runtime.Intrinsics.Experimental": { @@ -5180,7 +5180,7 @@ "netcoreapp2.0": "4.0.2.0", "netcoreapp2.1": "4.0.3.0", "netcoreapp3.0": "4.1.0.0", - "netcoreapp5.0": "5.0.0.0" + "net5.0": "5.0.0.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", @@ -5198,7 +5198,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+win8+wpa81": "4.0.0.0", "portable46-net451+win81+wpa81": "4.0.0.0", @@ -5263,7 +5263,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.2.0", "netcoreapp2.1": "4.0.3.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", @@ -5294,7 +5294,7 @@ "BaselineVersion": "4.3.0", "InboxOn": { "netcoreapp2.0": "4.0.4.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+win8+wpa81": "4.0.0.0", "portable46-net451+win81+wpa81": "4.0.0.0", @@ -5338,7 +5338,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "net461": "4.1.1.0", @@ -5387,7 +5387,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.3.0", "netcoreapp2.1": "4.1.4.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "net461": "4.1.1.0", @@ -5515,7 +5515,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", @@ -5543,7 +5543,7 @@ "InboxOn": { "netcoreapp2.0": "4.3.0.0", "netcoreapp2.1": "4.3.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.2.0.0", "netstandard2.0": "4.2.0.0", "monoandroid10": "Any", @@ -5601,7 +5601,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -5626,7 +5626,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -5698,7 +5698,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -5753,7 +5753,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.1.0.0", "netstandard2.0": "4.1.0.0", "monoandroid10": "Any", @@ -5813,7 +5813,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+win8+wpa81": "4.0.0.0", "portable46-net451+win81+wpa81": "4.0.0.0", @@ -5877,7 +5877,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -6111,7 +6111,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -6157,7 +6157,7 @@ "BaselineVersion": "5.0.0", "InboxOn": { "netcoreapp3.0": "4.1.2.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", "uap10.0.16299": "4.1.1.0", @@ -6187,7 +6187,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -6233,7 +6233,7 @@ "BaselineVersion": "5.0.0", "InboxOn": { "netcoreapp3.0": "4.0.4.0", - "netcoreapp5.0": "5.0.0.0" + "net5.0": "5.0.0.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", @@ -6251,7 +6251,7 @@ "BaselineVersion": "5.0.0", "InboxOn": { "netcoreapp3.0": "4.0.0.0", - "netcoreapp5.0": "5.0.0.0" + "net5.0": "5.0.0.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.6.0", @@ -6271,7 +6271,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "net461": "4.1.0.0", @@ -6316,7 +6316,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -6376,7 +6376,7 @@ "BaselineVersion": "5.0.0", "InboxOn": { "netcoreapp3.0": "4.0.1.0", - "netcoreapp5.0": "5.0.0.0" + "net5.0": "5.0.0.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.5.0", @@ -6394,7 +6394,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "uap10.0.16299": "4.1.1.0" @@ -6424,7 +6424,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -6472,7 +6472,7 @@ "netcoreapp2.0": "4.6.2.0", "netcoreapp2.1": "4.6.3.0", "netcoreapp3.0": "4.6.4.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "uap10.0.16299": "4.6.3.0" }, "AssemblyVersionInPackageVersion": { @@ -6499,7 +6499,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.1.0", "netcoreapp2.1": "4.3.0.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "monoandroid10": "Any", "monotouch10": "Any", "xamarinios10": "Any", @@ -6524,7 +6524,7 @@ "BaselineVersion": "4.3.0", "InboxOn": { "netcoreapp2.0": "4.0.3.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "portable45-net45+win8+wpa81": "4.0.0.0", "portable46-net451+win81+wpa81": "4.0.0.0", @@ -6557,7 +6557,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.0.0", "netstandard2.0": "4.0.0.0", "monoandroid10": "Any", @@ -6582,7 +6582,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.10.0", "netstandard2.0": "4.0.10.0", "monoandroid10": "Any", @@ -6608,7 +6608,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net451": "4.0.0.0", "portable46-net451+win81+wpa81": "4.0.0.0", "portable46-win81+wpa81": "4.0.0.0", @@ -6648,7 +6648,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.0.0", "netcoreapp2.1": "4.0.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "uap10.0.16299": "4.0.1.0" } }, @@ -6672,7 +6672,7 @@ "netcoreapp2.0": "4.0.2.0", "netcoreapp2.1": "4.0.3.0", "netcoreapp3.0": "4.0.4.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "netstandard2.0": "4.0.2.0", "monoandroid10": "Any", "monotouch10": "Any", @@ -6751,7 +6751,7 @@ "InboxOn": { "netcoreapp2.0": "4.0.0.0", "netcoreapp2.1": "4.0.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "uap10.0.16299": "4.0.1.0" } }, @@ -6943,7 +6943,7 @@ "InboxOn": { "netcoreapp2.0": "4.2.0.0", "netcoreapp2.1": "4.2.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "net461": "4.1.0.0", @@ -7015,7 +7015,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -7058,7 +7058,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", @@ -7086,7 +7086,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net45": "4.0.0.0", "net46": "4.0.10.0", "portable45-net45+win8+wpa81": "4.0.0.0", @@ -7129,7 +7129,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", @@ -7156,7 +7156,7 @@ "InboxOn": { "netcoreapp2.0": "4.1.0.0", "netcoreapp2.1": "4.1.1.0", - "netcoreapp5.0": "5.0.0.0", + "net5.0": "5.0.0.0", "net461": "4.0.1.0", "netstandard2.0": "4.0.1.0", "monoandroid10": "Any", diff --git a/src/libraries/restore/binplacePackages/binplacePackages.depproj b/src/libraries/restore/binplacePackages/binplacePackages.depproj index 850a6f367bbbd7..5b7928b270cec4 100644 --- a/src/libraries/restore/binplacePackages/binplacePackages.depproj +++ b/src/libraries/restore/binplacePackages/binplacePackages.depproj @@ -5,7 +5,7 @@ $(TargetFramework.SubString(11)) Reference true - net461;net472;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0;netstandard2.0;netcoreapp2.0;netcoreapp3.0;$(netcoreappCurrent) + net461;net472;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0;netstandard2.0;netcoreapp2.0;netcoreapp3.0;$(NetCoreAppCurrent) diff --git a/src/libraries/restore/netfx/netfx.depproj b/src/libraries/restore/netfx/netfx.depproj index 184b3c2bc1f4b5..7fcdb7329068fa 100644 --- a/src/libraries/restore/netfx/netfx.depproj +++ b/src/libraries/restore/netfx/netfx.depproj @@ -23,13 +23,6 @@ <_ShortFrameworkIdentifier>$(TargetFramework.TrimEnd('.0123456789')) <_ShortFrameworkVersion>$(TargetFramework.Substring($(_ShortFrameworkIdentifier.Length))) - - - - .NETStandard - .NETCoreApp - .NETFramework - @@ -43,6 +36,20 @@ v$(_ShortFrameworkVersion[0]).$(_ShortFrameworkVersion[1]).$(_ShortFrameworkVersion[2]) + + + .NETStandard + .NETCoreApp + + + .NETFramework + .NETCoreApp + + Microsoft.TargetingPack.NETFramework.$(TargetFrameworkVersion) diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/shims/ApiCompat.proj index fa8fb19352c738..d275e0efeacd82 100644 --- a/src/libraries/shims/ApiCompat.proj +++ b/src/libraries/shims/ApiCompat.proj @@ -1,19 +1,7 @@ - - + $(BuildTargetFramework) - - - - $(TargetFramework) - netcoreapp - $(IntermediateOutputPath)/apicompat.rsp - $(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netfx461.txt - $(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netfx461.ignore.txt - $(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netstandard.txt - $(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netstandardOnly.txt - $(BuildTargetFrameworkRefPath.TrimEnd('\/')) false <_RunApiCompat>true @@ -26,13 +14,28 @@ + + + + $(IntermediateOutputPath)apicompat.rsp + $(TargetFrameworkIdentifier.Substring(1).ToLower()) + $(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netfx461.txt + $(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netfx461.ignore.txt + $(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netstandard.txt + $(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netstandardOnly.txt + + + + $(BuildTargetFrameworkRefPath.TrimEnd('\/')) $(ApiCompatArgs) --exclude-attributes "$(ApiCompatExcludeAttributeList)" $(ApiCompatArgs) --impl-dirs "$(ApiCompatImplementationDirs)" --baseline "$(ApiCompatBaselineIgnoreFile)" @@ -46,8 +49,7 @@ Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' and '$(BaselineApiCompat)' == 'true'" CustomErrorRegularExpression="^[a-zA-Z]+ :" StandardOutputImportance="Low" - IgnoreExitCode="true" - > + IgnoreExitCode="true"> @@ -81,8 +83,7 @@ + IgnoreExitCode="true"> @@ -92,8 +93,7 @@ + IgnoreExitCode="true"> @@ -107,13 +107,12 @@ <_previousNetCoreAppBaselineParam Condition="'$(UpdatePreviousNetCoreAppBaseline)' == 'true'">> "$(_previousNetCoreAppBaselineFile)" - + + IgnoreExitCode="true"> @@ -124,8 +123,4 @@ - - - - diff --git a/src/libraries/targetframework.props b/src/libraries/targetframework.props index dee18432b75b74..3ee83b5d4aabf3 100644 --- a/src/libraries/targetframework.props +++ b/src/libraries/targetframework.props @@ -74,7 +74,6 @@ - $(BaseIntermediateOutputPath)$(TargetFramework)-$(TargetFrameworkSuffix)-$(Configuration)\ $(BaseIntermediateOutputPath)$(TargetFramework)-$(Configuration)\ diff --git a/src/mono/llvm/llvm-init.proj b/src/mono/llvm/llvm-init.proj index e4fd02d95ffa37..52227cc8454144 100644 --- a/src/mono/llvm/llvm-init.proj +++ b/src/mono/llvm/llvm-init.proj @@ -1,7 +1,7 @@ - netcoreapp5.0 + $(NetCoreAppCurrent) diff --git a/src/mono/netcore/tools/jitdiff/jitdiff.csproj b/src/mono/netcore/tools/jitdiff/jitdiff.csproj index 074afffcc1877d..bc6e2702ca8a66 100755 --- a/src/mono/netcore/tools/jitdiff/jitdiff.csproj +++ b/src/mono/netcore/tools/jitdiff/jitdiff.csproj @@ -1,7 +1,7 @@ Exe - netcoreapp5.0 + $(NetCoreAppCurrent) false