diff --git a/Directory.Build.props b/Directory.Build.props index d862ee091fe81b..b9cc1470bb7805 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -305,5 +305,6 @@ $(RepositoryEngineeringDir)NoTargetsSdk.BeforeTargets.targets $(RepositoryEngineeringDir)TraversalSdk.AfterProps.props + $(RepositoryEngineeringDir)TraversalSdk.AfterTargets.targets diff --git a/docs/coding-guidelines/project-guidelines.md b/docs/coding-guidelines/project-guidelines.md index 5f27836900e25f..486a0afd091378 100644 --- a/docs/coding-guidelines/project-guidelines.md +++ b/docs/coding-guidelines/project-guidelines.md @@ -22,7 +22,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) -> Any .NETCoreApp or .NETFramework TFM, e.g. net5.0` +- `$(BuildTargetFramework) -> Any .NETCoreApp or .NETFramework TFM, e.g. net7.0` - `$(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]` @@ -37,22 +37,18 @@ Each project will define a set of supported TargetFrameworks ``` -- `$(BuildSettings) -> $(BuildTargetFramework)[-$(TargetOS)][-$(Configuration)][-$(TargetArchitecture)]` - - Note this property should be file path safe and thus can be used in file names or directories that need to a unique path for a project configuration. - - The only required Build Settings value is the `$(BuildTargetFramework)` the others are optional. - Example: -Pure netstandard configuration: +Non cross-targeting project that targets .NETStandard: ``` - netstandard2.0 + netstandard2.0 ``` -All supported targets with unique windows/unix build for netcoreapp: +A cross-targeting project which targets specific platform with `$(NetCoreAppCurrent)` and one .NETFramework tfm: ``` - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetFrameworkMinimum) ``` @@ -61,15 +57,15 @@ All supported targets with unique windows/unix build for netcoreapp: 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: `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. +2. If nothing is passed to the build then we will default value of these properties from the environment. Example: `net7.0-[TargetOS Running On]-Debug-x64`. +3. When building an individual project (either from the CLI or an IDE), all target frameworks are built. 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. -Any of the mentioned properties can be set via `/p:=` at the command line. When building using our run tool or any of the wrapper scripts around it (i.e. build.cmd) a number of these properties have aliases which make them easier to pass (run build.cmd/sh -? for the aliases). +Any of the mentioned properties can be set via `/p:=` at the command line. When building using any of the wrapper scripts around it (i.e. build.cmd) a number of these properties have aliases which make them easier to pass (run build.cmd/sh -? for the aliases). ## Selecting the correct BuildSettings -When building an individual project the `BuildTargetFramework` and `TargetOS` will be used to select the closest matching TargetFramework listed in the projects `TargetFrameworks` property. The rules used to select the targetFramework will consider compatible target frameworks and OS fallbacks. +When building an individual project the `BuildTargetFramework` and `TargetOS` will be used to select the compatible dependencies which are expressed as ProjectReference items. ## Supported full build settings - .NET Core latest on current OS (default) -> `$(NetCoreAppCurrent)-[RunningOS]` @@ -80,37 +76,64 @@ When building an individual project the `BuildTargetFramework` and `TargetOS` wi ## TargetFramework conditions `TargetFramework` conditions should be avoided in the first PropertyGroup as that causes DesignTimeBuild issues: https://github.com/dotnet/project-system/issues/6143 -1. Use an equality check if the TargetFramework isn't overloaded with the OS portion. +1. Use TargetFrameworkIdentifier to condition on an entire framework to differentiate between .NETCoreApp, .NETStandard and .NETFramework. +Example: +``` + + $(NetCoreAppCurrent);netstandard2.0;$(NetFrameworkMinimum) + +... +... +... +``` +2. Use equality checks if you want to condition on specific runtime agnostic target frameworks (i.e. without the `-windows` suffix). Example: ``` - netstandard2.0;netstandard2.1 + $(NetCoreAppCurrent);netstandard2.0;$(NetFrameworkMinimum) +... ... +... ``` -2. Use a StartsWith when you want to test for multiple .NETStandard or .NETFramework versions. +3. Use the `TargetPlatformIdentifier` property to condition on a .NETCoreApp platform specific target framework. Note that .NETStandard and .NETFramework target frameworks can't be platform specific. Example: ``` - netstandard2.0;netstandard2.1 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent) + +... +... +``` +Important: In contrast to the old `Targets*` checks, `TargetPlatformIdentifier` conditions apply to a single tfm only, inheritance between target frameworks can't be expressed. See the example below for Unix: +``` + + $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-android;$(NetCoreAppCurrent)-windows -... + +... ``` -3. Use a StartsWith if the TargetFramework is overloaded with the OS portion. +4. Set the `TargetPlatformIdentifier` property in the project to be able to condition on it in properties in the project file. +That is necessary as the SDK sets the `TargetPlatformIdentifier` in a .targets file after the project is evaluated. Because of that, the property isn't available during the project's evaluation and must be set manually. Example: ``` - netstandard2.0-windows;netstandard2.0-Unix + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-android + + + + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + $(DefineConstants);ANDROID_USE_BUFFER -... +... ... ``` @@ -119,11 +142,10 @@ Example: Library projects should use the following directory layout. ``` -src\\src - Contains the source code for the library. +src\\gen - Contains source code for the assembly's source generator. src\\ref - Contains any reference assembly projects for the library. -src\\pkg - Contains package projects for the library. +src\\src - Contains the source code for the library. src\\tests - Contains the test code for a library. -src\\gen - Contains source code for the assembly's source generator. ``` ## ref diff --git a/eng/BeforeTargetFrameworkInference.targets b/eng/BeforeTargetFrameworkInference.targets index 60b412845483fe..70de3444b58935 100644 --- a/eng/BeforeTargetFrameworkInference.targets +++ b/eng/BeforeTargetFrameworkInference.targets @@ -1,5 +1,22 @@ - + + true + true + + + 0.0 + + + <_EnableDefaultWindowsPlatform>false + <_targetPlatformIdentifier Condition="$(TargetFramework.Contains('-'))">$(TargetFramework.SubString($([MSBuild]::Add($(TargetFramework.IndexOf('-')), 1)))) + + + + 1.0 + diff --git a/eng/TraversalSdk.AfterTargets.targets b/eng/TraversalSdk.AfterTargets.targets new file mode 100644 index 00000000000000..f88c48dc8677d6 --- /dev/null +++ b/eng/TraversalSdk.AfterTargets.targets @@ -0,0 +1,18 @@ + + + + + $(BuildDependsOn);ResolveP2PReferences + $(CleanDependsOn);ResolveP2PReferences + $(RebuildDependsOn);ResolveP2PReferences + $(TestDependsOn);ResolveP2PReferences + $(VSTestDependsOn);ResolveP2PReferences + $(PackDependsOn);ResolveP2PReferences + $(PublishDependsOn);ResolveP2PReferences + + + + + + + \ No newline at end of file diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae6fdbb5972000..05a44e0bf9d7ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,9 +102,9 @@ https://github.com/dotnet/arcade 78eaf78761027d225030be2b28aaf4e8bf392929 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + ff6cc4e9c3eef575f62a33a642ca80e79d27c9bb https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index e43cb18f09acd0..3c0663f6dd1628 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 7.0.0-beta.22110.7 7.0.0-beta.22110.7 7.0.0-beta.22110.7 - 7.0.0-beta.22110.7 + 7.0.0-beta.22111.10 7.0.0-beta.22110.7 7.0.0-beta.22110.7 7.0.0-beta.22110.7 diff --git a/eng/packaging.targets b/eng/packaging.targets index e705b4e7110114..fd2568f5d30cfb 100644 --- a/eng/packaging.targets +++ b/eng/packaging.targets @@ -10,9 +10,9 @@ AddNETStandardCompatErrorFileForPackaging;IncludeAnalyzersInPackage;$(PackDependsOn) AddNETStandardCompatErrorFileForPackaging;IncludeAnalyzersInPackage;$(BeforePack) $(TargetsForTfmSpecificContentInPackage);AddRuntimeSpecificFilesToPackage;IncludeProjectReferencesWithPackAttributeInPackage - false + false - true + true $(MSBuildThisFileDirectory)useSharedDesignerContext.txt @@ -101,7 +101,7 @@ DocumentationProjectOutputGroup; SatelliteDllsProjectOutputGroup; $(TargetsForTfmSpecificBuildOutput)" - Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetPlatformIdentifier)' != ''"> + Condition="'$(TargetPlatformIdentifier)' != ''"> $(TargetDir)$(TargetName).pdb <_packageTargetRuntime>$(TargetPlatformIdentifier.ToLowerInvariant().Replace('windows', 'win')) diff --git a/eng/targetframeworksuffix.props b/eng/targetframeworksuffix.props deleted file mode 100644 index f7074fe3e199f4..00000000000000 --- a/eng/targetframeworksuffix.props +++ /dev/null @@ -1,101 +0,0 @@ - - - - true - true - - - 0.0 - $(TargetFramework.SubString($([MSBuild]::Add($(TargetFramework.IndexOf('-')), 1)))) - - - - 1.0 - - - - - - true - - - - - true - - - - - true - true - - - - - true - true - true - - - - - true - true - - - - - true - true - - - - - true - true - - - - - true - true - - - - - true - true - - - - - true - true - - - - - true - true - - - - - true - true - - - - - true - - - - - true - - - - diff --git a/eng/testing/tests.props b/eng/testing/tests.props index f23f4cc62e9560..e91ec1bbcf0e38 100644 --- a/eng/testing/tests.props +++ b/eng/testing/tests.props @@ -34,8 +34,8 @@ - - + + diff --git a/eng/versioning.targets b/eng/versioning.targets index 4dacec01a8686b..37e9eba03cd60f 100644 --- a/eng/versioning.targets +++ b/eng/versioning.targets @@ -25,8 +25,8 @@ - - true + + true @@ -38,16 +38,18 @@ - + - - - - - + + + + + - + <_unsupportedOSPlatforms Include="$(UnsupportedOSPlatforms)" /> @@ -85,7 +89,7 @@ - + diff --git a/src/libraries/Common/tests/Common.Tests.csproj b/src/libraries/Common/tests/Common.Tests.csproj index 24841a2dedcf79..0dc2a91ebd82f0 100644 --- a/src/libraries/Common/tests/Common.Tests.csproj +++ b/src/libraries/Common/tests/Common.Tests.csproj @@ -112,7 +112,7 @@ - + - + @@ -140,12 +140,12 @@ Link="System\PasteArguments.Unix.cs" /> - + - + diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 7858515cfc41de..961c33028eab16 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -66,7 +66,6 @@ - diff --git a/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj index 739cd0edbbe8a8..eede850861ac6f 100644 --- a/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj +++ b/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj index 8f9de151dfdab8..b41b3ec1f93213 100644 --- a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj +++ b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj @@ -4,14 +4,16 @@ enable $(NoWarn);nullable + - true - $(DefineConstants);ENABLECOMBINDER - true + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + true + $(DefineConstants);ENABLECOMBINDER + true - + diff --git a/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj b/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj index b9faefd40f2f07..1e2a601e8065f7 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj @@ -10,11 +10,11 @@ true - + - + diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.targets b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.targets index 77a182fa4649aa..768d626074be83 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.targets +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.targets @@ -1,7 +1,7 @@ - netstandard2.0 + netstandard2.0 $(MSBuildThisFileName) $(MSBuildThisFileName) SR diff --git a/src/libraries/Microsoft.VisualBasic.Core/ref/Microsoft.VisualBasic.Core.csproj b/src/libraries/Microsoft.VisualBasic.Core/ref/Microsoft.VisualBasic.Core.csproj index 7eba5c85af4926..e2aa9431990aae 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/ref/Microsoft.VisualBasic.Core.csproj +++ b/src/libraries/Microsoft.VisualBasic.Core/ref/Microsoft.VisualBasic.Core.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj index cdc18e0dd43918..060ab1a99b1a72 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj +++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj @@ -9,19 +9,21 @@ Binary 42025 $(DefineConstants),LATEBINDING=True - $(DefineConstants),TARGET_WINDOWS=True $(NoWarn),CA1052,CA1810,CA2200 - $(NoWarn);CA1823 Microsoft.VisualBasic.Core false $(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows + - $(MSBuildProjectDirectory)\ILLink\ILLink.Descriptors.Windows.xml + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + $(MSBuildProjectDirectory)\ILLink\ILLink.Descriptors.Windows.xml + $(DefineConstants),TARGET_WINDOWS=True + $(NoWarn);CA1823 - + diff --git a/src/libraries/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj b/src/libraries/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj index 8a722c2adb5339..553bc7bf128eb0 100644 --- a/src/libraries/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj +++ b/src/libraries/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj b/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj +++ b/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj index 506507556b4437..a86ab3b729f438 100644 --- a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj +++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj @@ -14,12 +14,12 @@ System.Security.AccessControl.RegistrySecurity - SR.PlatformNotSupported_RegistryAccessControl + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) true + SR.PlatformNotSupported_RegistryAccessControl - + diff --git a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj index 8d2c8aaa1e1b13..95230a12da938c 100644 --- a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable 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 d1308100580327..82bd8109039997 100644 --- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -8,7 +8,9 @@ - $(NoWarn);CA1823 + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + + $(NoWarn);CA1823 - + - + 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 86e6af7fdab5b5..09adc148feb5f3 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj @@ -12,13 +12,14 @@ Microsoft.Win32.SystemEvents + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) $(DefineConstants);FEATURE_CER true - SR.PlatformNotSupported_SystemEvents + SR.PlatformNotSupported_SystemEvents - + ..\..\System.Private.Xml\src\Resources\Strings.resx FxResources.$(AssemblyName.Replace('-', '_')).SR Exe - netstandard2.0 + netstandard2.0 false true $(MSBuildProjectName) diff --git a/src/libraries/System.AppContext/ref/System.AppContext.csproj b/src/libraries/System.AppContext/ref/System.AppContext.csproj index 55b863d4d48edb..0d19d92c18f17e 100644 --- a/src/libraries/System.AppContext/ref/System.AppContext.csproj +++ b/src/libraries/System.AppContext/ref/System.AppContext.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.AppContext/src/System.AppContext.csproj b/src/libraries/System.AppContext/src/System.AppContext.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.AppContext/src/System.AppContext.csproj +++ b/src/libraries/System.AppContext/src/System.AppContext.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Buffers/ref/System.Buffers.csproj b/src/libraries/System.Buffers/ref/System.Buffers.csproj index 86924bfc712a31..7d42c1fc58bee3 100644 --- a/src/libraries/System.Buffers/ref/System.Buffers.csproj +++ b/src/libraries/System.Buffers/ref/System.Buffers.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Buffers/src/System.Buffers.csproj b/src/libraries/System.Buffers/src/System.Buffers.csproj index 7e9aff4eedd4db..fe3825b1c1066a 100644 --- a/src/libraries/System.Buffers/src/System.Buffers.csproj +++ b/src/libraries/System.Buffers/src/System.Buffers.csproj @@ -3,7 +3,7 @@ true true true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj b/src/libraries/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj index fb225b25b13d1a..c54a6732d98030 100644 --- a/src/libraries/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj +++ b/src/libraries/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj b/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj index 0584d13dbe8e72..00088cbdd4e7e8 100644 --- a/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj +++ b/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj b/src/libraries/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj index 84646e61be0041..c73a0c807bf046 100644 --- a/src/libraries/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj +++ b/src/libraries/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) $(NoWarn);0618 enable diff --git a/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj b/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj index 5009669653d115..95df0000154e34 100644 --- a/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj +++ b/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj b/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj index c4211d66d7aecf..43b7e5d06dd694 100644 --- a/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj +++ b/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj index de6e924bef12af..5fef936424d718 100644 --- a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj +++ b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Collections/ref/System.Collections.csproj b/src/libraries/System.Collections/ref/System.Collections.csproj index 9ab356c8121961..92f76098f4e2a1 100644 --- a/src/libraries/System.Collections/ref/System.Collections.csproj +++ b/src/libraries/System.Collections/ref/System.Collections.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Collections/src/System.Collections.csproj b/src/libraries/System.Collections/src/System.Collections.csproj index 28dd9816dc245b..09c90780f7d25e 100644 --- a/src/libraries/System.Collections/src/System.Collections.csproj +++ b/src/libraries/System.Collections/src/System.Collections.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj b/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj index 2267869cc4b980..88199b61fc5ee6 100644 --- a/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj +++ b/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj b/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj index 9c9dfebee9accc..7c62a82550e8d8 100644 --- a/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj +++ b/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable - + @@ -35,7 +35,7 @@ Link="Common\Interop\Unix\Interop.Libraries.cs" /> - + Common\Interop\Android\Interop.Logcat.cs @@ -45,7 +45,7 @@ - + @@ -61,7 +61,7 @@ Link="Common\Interop\Unix\Interop.IOErrors.cs" /> - + @@ -155,7 +155,7 @@ Link="Common\System\Text\ValueStringBuilder.cs" /> - + @@ -232,7 +232,7 @@ - + diff --git a/src/libraries/System.Console/tests/System.Console.Tests.csproj b/src/libraries/System.Console/tests/System.Console.Tests.csproj index 4418da53021a70..076efd2213a00d 100644 --- a/src/libraries/System.Console/tests/System.Console.Tests.csproj +++ b/src/libraries/System.Console/tests/System.Console.Tests.csproj @@ -39,10 +39,10 @@ Link="%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" /> - + - + $(NoWarn);0618 - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Data.Common/src/System.Data.Common.csproj b/src/libraries/System.Data.Common/src/System.Data.Common.csproj index b836c7f2c8e149..a9ad614630fd39 100644 --- a/src/libraries/System.Data.Common/src/System.Data.Common.csproj +++ b/src/libraries/System.Data.Common/src/System.Data.Common.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.csproj b/src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.csproj index cedcb0aac65962..ae3518dee7cc75 100644 --- a/src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.csproj +++ b/src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Data.DataSetExtensions/src/System.Data.DataSetExtensions.csproj b/src/libraries/System.Data.DataSetExtensions/src/System.Data.DataSetExtensions.csproj index e5ff6a463dd773..bcb4ad6f1fb839 100644 --- a/src/libraries/System.Data.DataSetExtensions/src/System.Data.DataSetExtensions.csproj +++ b/src/libraries/System.Data.DataSetExtensions/src/System.Data.DataSetExtensions.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) true enable 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 d0818649229c5c..de391f5ebf36d1 100644 --- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj @@ -20,15 +20,16 @@ System.Data.Odbc.OdbcTransaction + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) true $(NoWarn);SA1121 - SR.Odbc_PlatformNotSupported + SR.Odbc_PlatformNotSupported - + - + - + - + diff --git a/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj b/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj index 3ca325a2f883e9..85a15ebe3d2415 100644 --- a/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj +++ b/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj @@ -4,7 +4,8 @@ - $(DefineConstants);TargetsWindows + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + $(DefineConstants);TargetsWindows @@ -18,28 +19,28 @@ - + - + - + - + - + - + diff --git a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj index ff915761659221..1f83a1ca2948df 100644 --- a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj @@ -26,12 +26,13 @@ System.Data.OleDb.OleDbTransaction + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) true - SR.PlatformNotSupported_OleDb + SR.PlatformNotSupported_OleDb $(NoWarn);CS0618 - + - + + - - - - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj b/src/libraries/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj index dd3dc2940a54b1..5ecfe239de6f7a 100644 --- a/src/libraries/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj +++ b/src/libraries/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj b/src/libraries/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj index 1d1a2b817e9778..7ae0399d1ab0c6 100644 --- a/src/libraries/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj +++ b/src/libraries/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj b/src/libraries/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj index dd3dc2940a54b1..5ecfe239de6f7a 100644 --- a/src/libraries/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj +++ b/src/libraries/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj index a9191d5aa8289b..e57e7a1ccec14f 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj @@ -6,7 +6,7 @@ $(DefineConstants);MEMORYMARSHAL_SUPPORT - + diff --git a/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj b/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj index d2ad06b758f4ab..56a71b1d27b686 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj @@ -1,6 +1,6 @@ - netstandard2.0 + netstandard2.0 EventLogMessages.res 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 fd558833ee2dfc..a97fd6227e0cd4 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj @@ -17,11 +17,12 @@ System.Diagnostics.EventLog + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) true - SR.PlatformNotSupported_EventLog + SR.PlatformNotSupported_EventLog - + @@ -151,7 +152,7 @@ System.Diagnostics.EventLog - + - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj index fae2dee2392256..3bc748311c5f68 100644 --- a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj +++ b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj @@ -6,14 +6,15 @@ - SR.DiagnosticsFileVersionInfo_PlatformNotSupported + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.DiagnosticsFileVersionInfo_PlatformNotSupported - + - + @@ -32,7 +33,7 @@ - + @@ -49,7 +50,7 @@ - + diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj index 9b99ef0ab81242..36f5ea370f995f 100644 --- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj +++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj @@ -29,14 +29,14 @@ - + - + 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 f90314643f412b..ff0ebc6c358346 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -3,7 +3,6 @@ true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) $(NoWarn);CA1847 - $(NoWarn);CA1066 annotations true Provides the System.Diagnostics.PerformanceCounter class, which allows access to Windows performance counters. @@ -13,10 +12,12 @@ System.Diagnostics.PerformanceCounter + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + $(NoWarn);CA1066 true - SR.PlatformNotSupported_PerfCounters + SR.PlatformNotSupported_PerfCounters - + diff --git a/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj b/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj index e30075373d5477..2f392d43da1890 100644 --- a/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj +++ b/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj index 8a41187ffa5cb9..c91e7c693aad7b 100644 --- a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj +++ b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj @@ -2,17 +2,16 @@ $(DefineConstants);FEATURE_REGISTRY true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent) enable - + - SR.Process_PlatformNotSupported + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.Process_PlatformNotSupported + true - - true - - + @@ -44,7 +43,7 @@ - + - - + Link="Common\Interop\Windows\kernel32\Interop.DuplicateHandle_SafeFileHandle.cs" /> - + @@ -285,15 +282,15 @@ - + - + - + @@ -308,7 +305,7 @@ - + @@ -321,17 +318,17 @@ - + - + - + @@ -344,12 +341,12 @@ - + - + diff --git a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj index 783e4ad21e9c70..089d4fdeb4dcff 100644 --- a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj +++ b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj @@ -1,12 +1,16 @@  true - $(DefineConstants);TargetsWindows true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser true true + + + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + $(DefineConstants);TargetsWindows + @@ -37,7 +41,7 @@ - + @@ -50,7 +54,7 @@ - + diff --git a/src/libraries/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj b/src/libraries/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj index 35e82eee5e77b2..ed8643bdf44e32 100644 --- a/src/libraries/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj +++ b/src/libraries/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj b/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj index 8cecf8e2327cd7..7962381d9d74be 100644 --- a/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj +++ b/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj @@ -3,7 +3,7 @@ true true enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj index d83d56c13eb411..7238adfa34574e 100644 --- a/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj +++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj index d179081ce20e39..cf755b59130cff 100644 --- a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj +++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj b/src/libraries/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj index d1f6b1fa858688..81fa1ed3e681d9 100644 --- a/src/libraries/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj +++ b/src/libraries/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj b/src/libraries/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj +++ b/src/libraries/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj b/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj index a344553052ce6b..093d289611fad5 100644 --- a/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj +++ b/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj index 7b62f85f073baa..2910efd27197f7 100644 --- a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj +++ b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj @@ -1,7 +1,7 @@ $(DefineConstants);TRACE - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj b/src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj index 4a57f065745ff9..b59d58aabfd2d6 100644 --- a/src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj +++ b/src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj b/src/libraries/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj index dd3dc2940a54b1..5ecfe239de6f7a 100644 --- a/src/libraries/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj +++ b/src/libraries/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable 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 66eb092dee110b..c8f85a372ea7ca 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 @@ -6,7 +6,7 @@ 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 b518e6ecd1f3dc..8c92ed4fc9ed83 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj @@ -16,9 +16,10 @@ - SR.DirectoryServicesAccountManagement_PlatformNotSupported + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.DirectoryServicesAccountManagement_PlatformNotSupported - + @@ -224,7 +225,7 @@ - + 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 366ab1b31854d2..43c120b0a74a09 100644 --- a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj @@ -13,9 +13,10 @@ - SR.DirectoryServicesProtocols_PlatformNotSupported + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.DirectoryServicesProtocols_PlatformNotSupported - + @@ -52,7 +53,7 @@ Common\Interop\Windows\Interop.BOOL.cs - + @@ -70,7 +71,7 @@ Common\Interop\Windows\Wldap32\Interop.Ber.cs - + @@ -89,12 +90,12 @@ Common\Interop\Linux\OpenLdap\Interop.Ber.cs - + Common\Interop\Linux\Interop.Libraries.cs - + Common\Interop\OSX\Interop.Libraries.cs @@ -124,7 +125,7 @@ - + diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj index 9f4bbc7733bedf..409bae7e786ba9 100644 --- a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj @@ -25,9 +25,10 @@ System.DirectoryServices.ActiveDirectory.DomainController - SR.DirectoryServices_PlatformNotSupported + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.DirectoryServices_PlatformNotSupported - + @@ -273,7 +274,7 @@ System.DirectoryServices.ActiveDirectory.DomainController - + diff --git a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj index 7c86e128ac5624..51fee5865b7ad3 100644 --- a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj +++ b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj @@ -27,11 +27,9 @@ PreserveNewest - + - - 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 5a34aa4d3ada00..65731f1d129045 100644 --- a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj @@ -3,7 +3,6 @@ $(DefineConstants);DRAWING_NAMESPACE true CS0618 - $(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS;FEATURE_SYSTEM_EVENTS true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-Unix;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable @@ -23,14 +22,16 @@ Unix support is disabled by default. See https://aka.ms/systemdrawingnonwindows + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + $(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS;FEATURE_SYSTEM_EVENTS true - SR.SystemDrawingCommon_PlatformNotSupported + SR.SystemDrawingCommon_PlatformNotSupported - + @@ -201,7 +202,7 @@ Unix support is disabled by default. See https://aka.ms/systemdrawingnonwindows - + @@ -331,23 +332,14 @@ Unix support is disabled by default. See https://aka.ms/systemdrawingnonwindows Link="Common\Interop\Windows\User32\Interop.WindowFromDC.cs" /> - - - - - - - - - + @@ -393,7 +385,7 @@ Unix support is disabled by default. See https://aka.ms/systemdrawingnonwindows placeholder.ico - + - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj index e8328af20cde96..dd2b9b692ad3a7 100644 --- a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj +++ b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj @@ -1,10 +1,14 @@  System.Drawing - $(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) enable + + + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + $(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS + @@ -27,7 +31,7 @@ - + - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj b/src/libraries/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj index 152b87d25dd610..55eadef5a9a797 100644 --- a/src/libraries/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj +++ b/src/libraries/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj b/src/libraries/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj index ca034e36a686ce..b53ef51fbacc26 100644 --- a/src/libraries/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj +++ b/src/libraries/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj b/src/libraries/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj +++ b/src/libraries/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj b/src/libraries/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj index 54c76201458d61..231fb39433fb38 100644 --- a/src/libraries/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj +++ b/src/libraries/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj b/src/libraries/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj index 495dad9cebeb77..6beae5c98dbd48 100644 --- a/src/libraries/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj +++ b/src/libraries/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Globalization/ref/System.Globalization.csproj b/src/libraries/System.Globalization/ref/System.Globalization.csproj index 9a0c64de5b036b..5cf1bb07a61ec1 100644 --- a/src/libraries/System.Globalization/ref/System.Globalization.csproj +++ b/src/libraries/System.Globalization/ref/System.Globalization.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Globalization/src/System.Globalization.csproj b/src/libraries/System.Globalization/src/System.Globalization.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.Globalization/src/System.Globalization.csproj +++ b/src/libraries/System.Globalization/src/System.Globalization.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO.Compression.Brotli/ref/System.IO.Compression.Brotli.csproj b/src/libraries/System.IO.Compression.Brotli/ref/System.IO.Compression.Brotli.csproj index bce17a52f8fce9..662f5a31b64f54 100644 --- a/src/libraries/System.IO.Compression.Brotli/ref/System.IO.Compression.Brotli.csproj +++ b/src/libraries/System.IO.Compression.Brotli/ref/System.IO.Compression.Brotli.csproj @@ -1,7 +1,7 @@ enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj index 80ad7a7940bb60..6786fda165831d 100644 --- a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj +++ b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj @@ -6,9 +6,10 @@ - SR.IOCompressionBrotli_PlatformNotSupported + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.IOCompressionBrotli_PlatformNotSupported - + @@ -26,12 +27,12 @@ Link="Common\Microsoft\Win32\SafeHandles\SafeBrotliHandle.cs" /> - + - + diff --git a/src/libraries/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj b/src/libraries/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj index 1c175660be30d9..a72c3f36f42299 100644 --- a/src/libraries/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj +++ b/src/libraries/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj b/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj index 66827e87964fbf..de869f13e93532 100644 --- a/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj +++ b/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj @@ -17,7 +17,7 @@ Link="Common\System\IO\PathInternal.CaseSensitivity.cs" /> - + - + diff --git a/src/libraries/System.IO.Compression/ref/System.IO.Compression.csproj b/src/libraries/System.IO.Compression/ref/System.IO.Compression.csproj index 8b14159415b7ec..ff7cf6d8c3846d 100644 --- a/src/libraries/System.IO.Compression/ref/System.IO.Compression.csproj +++ b/src/libraries/System.IO.Compression/ref/System.IO.Compression.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj b/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj index 8a33c737f13e66..4d5e69f94d8ab3 100644 --- a/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj +++ b/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj @@ -44,13 +44,13 @@ Link="Common\System\Threading\Tasks\TaskToApm.cs" /> - + - + diff --git a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj index 5aab0ab81639e0..da1ac825505ffd 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) 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 e7a90eb3a6eb58..28465e91788be6 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 @@ -5,11 +5,12 @@ - true - SR.PlatformNotSupported_AccessControl + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + true + SR.PlatformNotSupported_AccessControl - + - - + + - + - + - + - + diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj index 9f6b2e37bcd697..bd014e7f4b1cdc 100644 --- a/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj +++ b/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj index 7cdd5006490a06..686750ba9496fb 100644 --- a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj +++ b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj @@ -19,7 +19,7 @@ - + - + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser - - - - + + + + \ No newline at end of file diff --git a/src/libraries/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj b/src/libraries/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj index 31a3c74ddc9488..d3418bd9442f35 100644 --- a/src/libraries/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj +++ b/src/libraries/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj b/src/libraries/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj index 94d0c640130480..36c7cb1bdde2ad 100644 --- a/src/libraries/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj +++ b/src/libraries/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj b/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj index 2ee74d6667a9d8..d9fca4d4667f28 100644 --- a/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj +++ b/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj index f8a57395aa6ef6..b31c940615c087 100644 --- a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj +++ b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj @@ -1,14 +1,15 @@  true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-FreeBSD + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent) enable - SR.FileSystemWatcher_PlatformNotSupported + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.FileSystemWatcher_PlatformNotSupported - + @@ -32,7 +33,7 @@ - + - - - - + + - + @@ -81,7 +80,7 @@ - + @@ -110,7 +109,7 @@ - + @@ -126,7 +125,7 @@ - + diff --git a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj index 7bbb9eb5986b76..381f9dfc4e4c92 100644 --- a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj +++ b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj @@ -46,15 +46,15 @@ - + - + - + diff --git a/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.csproj b/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.csproj index 0ceabbf133b377..cf4cf19f19d059 100644 --- a/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.csproj +++ b/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj b/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj index 91447b65b71e64..8d75eca3bbe2bc 100644 --- a/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj +++ b/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj @@ -1,7 +1,7 @@  true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO.FileSystem/tests/DisabledFileLockingTests/System.IO.FileSystem.DisabledFileLocking.Tests.csproj b/src/libraries/System.IO.FileSystem/tests/DisabledFileLockingTests/System.IO.FileSystem.DisabledFileLocking.Tests.csproj index cefda71097791f..99230625e3c9d1 100644 --- a/src/libraries/System.IO.FileSystem/tests/DisabledFileLockingTests/System.IO.FileSystem.DisabledFileLocking.Tests.csproj +++ b/src/libraries/System.IO.FileSystem/tests/DisabledFileLockingTests/System.IO.FileSystem.DisabledFileLocking.Tests.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj index 967338535cd01f..053c913a456206 100644 --- a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj +++ b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj @@ -71,12 +71,12 @@ - + - + @@ -103,7 +103,7 @@ - + diff --git a/src/libraries/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj b/src/libraries/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj index 39903d836f8078..167ebaf32a1f55 100644 --- a/src/libraries/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj +++ b/src/libraries/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj index 40664e48643298..025f454662f448 100644 --- a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj +++ b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj @@ -1,12 +1,14 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) - enable + enable + - SR.IsolatedStorage_PlatformNotSupported + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.IsolatedStorage_PlatformNotSupported - + @@ -18,24 +20,22 @@ - + - + - + + + + - - - - - - + diff --git a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj index 6f9c8a97195150..b075376fa8bf89 100644 --- a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj +++ b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj @@ -13,11 +13,11 @@ Link="Internals\Helper.Win32Unix.cs" /> - + - + diff --git a/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj b/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj index 328e5db6032a5b..06957485174c36 100644 --- a/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj +++ b/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj @@ -1,7 +1,7 @@ enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj index 6285027286b7c7..156867fd41bc31 100644 --- a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj +++ b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj @@ -22,7 +22,7 @@ - + @@ -81,7 +81,7 @@ - + - - + + diff --git a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj b/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj index 685a31dbdf26ae..7a5d6dbd57b7f0 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj +++ b/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) 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 5e08c91b938064..34382fb6082314 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 @@ -6,14 +6,15 @@ - SR.PlatformNotSupported_AccessControl - true + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + true true + SR.PlatformNotSupported_AccessControl - true + true diff --git a/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj b/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj index bc664b2c29020b..adef3b2144fc58 100644 --- a/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj +++ b/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj index 0cf60c20c9a1c5..e3e522f09b61f2 100644 --- a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj +++ b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj @@ -5,11 +5,13 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) enable + - SR.Pipes_PlatformNotSupported + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.Pipes_PlatformNotSupported - + @@ -26,7 +28,7 @@ - + - + - + @@ -177,11 +179,11 @@ - + - + diff --git a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj index 52ce3056b534d5..dcec96f7ec54a7 100644 --- a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj +++ b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj @@ -10,7 +10,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj index 6dc6c00f09d760..67e40c9fef6a6e 100644 --- a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj +++ b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj @@ -14,11 +14,12 @@ System.IO.Ports.SerialPort + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) true - SR.PlatformNotSupported_IOPorts + SR.PlatformNotSupported_IOPorts - + @@ -36,13 +37,12 @@ System.IO.Ports.SerialPort - - + - + @@ -122,7 +122,7 @@ System.IO.Ports.SerialPort Link="Common\Interop\Windows\Kernel32\Interop.FileOperations.cs" /> - + @@ -144,17 +144,17 @@ System.IO.Ports.SerialPort - + - + - + - + diff --git a/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj b/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj index 36756fdbb541da..9a1592778a7dcc 100644 --- a/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj +++ b/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj @@ -109,7 +109,7 @@ - + diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj b/src/libraries/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj index 0ee67eedafd726..af369779ebac80 100644 --- a/src/libraries/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj +++ b/src/libraries/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj b/src/libraries/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj +++ b/src/libraries/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO/ref/System.IO.csproj b/src/libraries/System.IO/ref/System.IO.csproj index 7439befee6f575..0ea49f44dad2c1 100644 --- a/src/libraries/System.IO/ref/System.IO.csproj +++ b/src/libraries/System.IO/ref/System.IO.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO/src/System.IO.csproj b/src/libraries/System.IO/src/System.IO.csproj index 3b108d6826762c..e2eb3417533b67 100644 --- a/src/libraries/System.IO/src/System.IO.csproj +++ b/src/libraries/System.IO/src/System.IO.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.csproj b/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.csproj index 024288147d0b85..8ce6d5b73701ac 100644 --- a/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.csproj +++ b/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) $(NoWarn);CS0618 enable diff --git a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj index dce8fedbf2ac8c..fba337b000b6e1 100644 --- a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj +++ b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj @@ -3,16 +3,19 @@ $(NetCoreAppCurrent);$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-MacCatalyst enable false - true - ILLink\ILLink.Substitutions.IsInterpreting.LibraryBuild.xml $(DefineConstants);FEATURE_FAST_CREATE - + + + + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + true + ILLink\ILLink.Substitutions.IsInterpreting.LibraryBuild.xml - true + true diff --git a/src/libraries/System.Linq.Parallel/ref/System.Linq.Parallel.csproj b/src/libraries/System.Linq.Parallel/ref/System.Linq.Parallel.csproj index 02094314ac02e8..7f0337a585cf80 100644 --- a/src/libraries/System.Linq.Parallel/ref/System.Linq.Parallel.csproj +++ b/src/libraries/System.Linq.Parallel/ref/System.Linq.Parallel.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj b/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj index b78dd81e422a9b..5d2db8f850ac0a 100644 --- a/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj +++ b/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Linq.Queryable/ref/System.Linq.Queryable.csproj b/src/libraries/System.Linq.Queryable/ref/System.Linq.Queryable.csproj index dc7cc09400acf8..ef12af1519ae1b 100644 --- a/src/libraries/System.Linq.Queryable/ref/System.Linq.Queryable.csproj +++ b/src/libraries/System.Linq.Queryable/ref/System.Linq.Queryable.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj b/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj index d3def1d1063a46..0df3e5cb4780d5 100644 --- a/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj +++ b/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Linq/ref/System.Linq.csproj b/src/libraries/System.Linq/ref/System.Linq.csproj index f2c0fd1178a7b1..476d2cbc4f0f48 100644 --- a/src/libraries/System.Linq/ref/System.Linq.csproj +++ b/src/libraries/System.Linq/ref/System.Linq.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Linq/src/System.Linq.csproj b/src/libraries/System.Linq/src/System.Linq.csproj index 4126dfb64148c7..508041619b3d40 100644 --- a/src/libraries/System.Linq/src/System.Linq.csproj +++ b/src/libraries/System.Linq/src/System.Linq.csproj @@ -2,7 +2,11 @@ $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS enable - true + + + + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + true diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj index e64ebcf61db51e..7f530935c20b48 100644 --- a/src/libraries/System.Management/src/System.Management.csproj +++ b/src/libraries/System.Management/src/System.Management.csproj @@ -20,9 +20,10 @@ System.Management.SelectQuery - SR.PlatformNotSupported_SystemManagement + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.PlatformNotSupported_SystemManagement - + true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Memory/src/System.Memory.csproj b/src/libraries/System.Memory/src/System.Memory.csproj index b9f9e1e818f11f..f11858f7e2f878 100644 --- a/src/libraries/System.Memory/src/System.Memory.csproj +++ b/src/libraries/System.Memory/src/System.Memory.csproj @@ -3,7 +3,7 @@ true true enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) $(DefineConstants);MAKE_ABW_PUBLIC diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj index 41d016898b1a25..e1aa13b7c867c9 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true enable true @@ -13,11 +13,11 @@ System.Net.Http.WinHttpHandler - SR.PlatformNotSupported_WinHttpHandler + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.PlatformNotSupported_WinHttpHandler - + Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> - + @@ -135,7 +135,7 @@ System.Net.Http.WinHttpHandler - + diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj index 381230d2a9bc3e..e9d68fbff06eff 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj @@ -11,7 +11,7 @@ - + - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/libraries/System.Net.Http/src/System.Net.Http.csproj index 0792ba26c05514..41a0065fa038db 100644 --- a/src/libraries/System.Net.Http/src/System.Net.Http.csproj +++ b/src/libraries/System.Net.Http/src/System.Net.Http.csproj @@ -6,41 +6,26 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent) enable - - $(DefineConstants);SYSNETHTTP_NO_OPENSSL - - - $(DefineConstants);TARGET_MOBILE - - - $(DefineConstants);TARGET_ANDROID - - - $(DefineConstants);TARGET_IOS - - - $(DefineConstants);TARGET_MACCATALYST - - - $(DefineConstants);TARGET_TVOS - - - $(DefineConstants);TARGET_BROWSER - - - - $(MSBuildThisFileDirectory)ILLink\ - $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) SR.PlatformNotSupported_NetHttp + $(DefineConstants);SYSNETHTTP_NO_OPENSSL + $(DefineConstants);TARGET_MOBILE + $(DefineConstants);TARGET_ANDROID + $(DefineConstants);TARGET_IOS + $(DefineConstants);TARGET_MACCATALYST + $(DefineConstants);TARGET_TVOS + $(DefineConstants);TARGET_BROWSER + + $(MSBuildThisFileDirectory)ILLink\ - - + + + + @@ -60,11 +45,11 @@ - - - @@ -165,7 +150,7 @@ Link="Common\System\Net\Http\aspnetcore\Http3\QPack\H3StaticTable.cs" /> - + @@ -173,7 +158,7 @@ - + @@ -222,7 +207,7 @@ - @@ -332,17 +317,17 @@ - + - + - + @@ -361,7 +346,7 @@ - + - + - + - + - + @@ -532,7 +517,7 @@ - + - + - + - + - + - + - + diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj index 1b4a5aa3769239..f8d30de1f7b0d5 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj @@ -1,8 +1,6 @@  ../../src/Resources/Strings.resx - $(DefineConstants);TargetsWindows - $(DefineConstants);TARGETS_BROWSER $(DefineConstants);SYSNETHTTP_NO_OPENSSL;HTTP3 true true @@ -10,6 +8,13 @@ true + + + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + $(DefineConstants);TargetsWindows + $(DefineConstants);TARGETS_BROWSER + + @@ -34,13 +39,13 @@ - - @@ -68,9 +73,9 @@ Link="Common\System\Net\HttpsTestServer.cs" /> - - @@ -162,7 +167,7 @@ - @@ -209,7 +214,7 @@ Link="ProductionCode\Common\System\Net\StreamBuffer.cs" /> - + - + - + diff --git a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj index f676e0381bd1f3..0ad988c4e54158 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj +++ b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj @@ -233,26 +233,26 @@ Link="ProductionCode\System\Net\Http\SocketsHttpHandler\RuntimeSettingParser.cs" /> - - - - - - + diff --git a/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.csproj b/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.csproj index 00bc53369a021a..470e002db23173 100644 --- a/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.csproj +++ b/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj index 1da319175f0d29..f50c50e9eed6c8 100644 --- a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj +++ b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj @@ -4,7 +4,11 @@ false $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) enable - SR.SystemNetHttpListener_PlatformNotSupported + + + + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.SystemNetHttpListener_PlatformNotSupported @@ -35,7 +39,7 @@ - + @@ -87,7 +91,7 @@ - + @@ -251,7 +255,7 @@ - + diff --git a/src/libraries/System.Net.Mail/ref/System.Net.Mail.csproj b/src/libraries/System.Net.Mail/ref/System.Net.Mail.csproj index 99ae2fb8049c95..119925b1b0e217 100644 --- a/src/libraries/System.Net.Mail/ref/System.Net.Mail.csproj +++ b/src/libraries/System.Net.Mail/ref/System.Net.Mail.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj index c80216d012cb21..d73fe7a77ce481 100644 --- a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj +++ b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj @@ -3,12 +3,12 @@ true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent) enable - $(DefineConstants);NO_NTAUTHENTICATION $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) SR.PlatformNotSupported_NetMail + $(DefineConstants);NO_NTAUTHENTICATION @@ -78,12 +78,12 @@ Link="Common\System\HexConverter.cs" /> - + - + @@ -119,7 +119,7 @@ - + - + - + - + - + @@ -148,7 +148,7 @@ Link="Common\System\HexConverter.cs" /> - + - + - + - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj index 250bc924fbd894..31a4fa7072e4bd 100644 --- a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj +++ b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj @@ -8,7 +8,7 @@ $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) SR.SystemNetNameResolution_PlatformNotSupported - ExcludeApiList.PNSE.Browser.txt + ExcludeApiList.PNSE.Browser.txt @@ -36,7 +36,7 @@ - + - + @@ -109,7 +109,7 @@ - + diff --git a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj index 7adb69687b6b8b..13bdf57acf38ff 100644 --- a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj +++ b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj @@ -21,9 +21,9 @@ - - @@ -36,7 +36,7 @@ - + - + - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj index 66bcfce21b428a..4a0125314b19ec 100644 --- a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj +++ b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj @@ -4,10 +4,12 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent) enable + - SR.SystemNetNetworkInformation_PlatformNotSupported + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.SystemNetNetworkInformation_PlatformNotSupported - + @@ -26,7 +28,7 @@ - + @@ -52,7 +54,7 @@ - + @@ -97,7 +99,7 @@ - + @@ -121,7 +123,7 @@ - + @@ -147,7 +149,7 @@ - + @@ -158,7 +160,7 @@ - + @@ -177,7 +179,7 @@ - + @@ -186,15 +188,15 @@ - + - + - + @@ -217,11 +219,11 @@ - + - + diff --git a/src/libraries/System.Net.Ping/ref/System.Net.Ping.csproj b/src/libraries/System.Net.Ping/ref/System.Net.Ping.csproj index b91f82444f42e0..3a766d263145ec 100644 --- a/src/libraries/System.Net.Ping/ref/System.Net.Ping.csproj +++ b/src/libraries/System.Net.Ping/ref/System.Net.Ping.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj index 206fe170799c15..076d8bcd974b5e 100644 --- a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj +++ b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj @@ -4,11 +4,13 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent) enable + - SR.SystemNetPing_PlatformNotSupported - true + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.SystemNetPing_PlatformNotSupported + true - + @@ -37,7 +39,7 @@ - + @@ -68,14 +70,14 @@ - + - + - + - + diff --git a/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.csproj b/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.csproj index da2cdd8e41a4e3..a52552a435c7a9 100644 --- a/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.csproj +++ b/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj index cbb369186fa279..3c17ba5634a473 100644 --- a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj +++ b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj @@ -87,7 +87,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -125,7 +125,7 @@ - + - + - + - + - + - + - + - + - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable false diff --git a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj index 31e565288099df..12bcced0a5f970 100644 --- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj +++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj @@ -3,14 +3,15 @@ true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent) enable - $(DefineConstants);SOCKADDR_HAS_LENGTH - SR.SystemNetQuic_PlatformNotSupported + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + $(DefineConstants);SOCKADDR_HAS_LENGTH + SR.SystemNetQuic_PlatformNotSupported - + @@ -30,9 +31,7 @@ Common\DisableRuntimeMarshalling.cs - - - + @@ -40,7 +39,7 @@ - + @@ -56,7 +55,7 @@ - + @@ -82,20 +81,20 @@ - + - + - + @@ -130,13 +129,13 @@ - + - diff --git a/src/libraries/System.Net.Requests/ref/System.Net.Requests.csproj b/src/libraries/System.Net.Requests/ref/System.Net.Requests.csproj index 78b1a6fa04b1db..36d4f9a3d03537 100644 --- a/src/libraries/System.Net.Requests/ref/System.Net.Requests.csproj +++ b/src/libraries/System.Net.Requests/ref/System.Net.Requests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) $(NoWarn);CS0809;SYSLIB0014 enable diff --git a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj index fabcc644d972aa..d2c9530d5f6bd0 100644 --- a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj +++ b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj @@ -78,20 +78,19 @@ - + - + - @@ -110,6 +109,7 @@ + diff --git a/src/libraries/System.Net.Security/ref/System.Net.Security.csproj b/src/libraries/System.Net.Security/ref/System.Net.Security.csproj index f5519a69b6028f..9c747a8b91e28b 100644 --- a/src/libraries/System.Net.Security/ref/System.Net.Security.csproj +++ b/src/libraries/System.Net.Security/ref/System.Net.Security.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.Security/src/System.Net.Security.csproj b/src/libraries/System.Net.Security/src/System.Net.Security.csproj index a71d01bc0b7943..b33246299b9da9 100644 --- a/src/libraries/System.Net.Security/src/System.Net.Security.csproj +++ b/src/libraries/System.Net.Security/src/System.Net.Security.csproj @@ -4,20 +4,18 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent) $(DefineConstants);PRODUCT - $(DefineConstants);TARGET_WINDOWS enable + - SR.SystemNetSecurity_PlatformNotSupported + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.SystemNetSecurity_PlatformNotSupported + $(DefineConstants);TARGET_WINDOWS + true + true + $(DefineConstants);SYSNETSECURITY_NO_OPENSSL - - true - true - - - $(DefineConstants);SYSNETSECURITY_NO_OPENSSL - - + @@ -100,7 +98,7 @@ - + True True @@ -108,14 +106,14 @@ - + True True TlsCipherSuiteData.Lookup.tt - + True True @@ -136,7 +134,7 @@ - + @@ -240,7 +238,7 @@ - + - + - + - + @@ -433,7 +431,7 @@ - + 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 72ef0e0c581326..8f2d6f40e17efa 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 @@ -10,7 +10,7 @@ - + @@ -107,18 +107,18 @@ - + - + - + diff --git a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj index 46056c9b64f285..0fd7b6b55f481d 100644 --- a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj +++ b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj @@ -17,11 +17,11 @@ - + - + @@ -38,7 +38,7 @@ - + diff --git a/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj b/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj index 8041ebea6f80eb..a7b78ca9ecacf6 100644 --- a/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj +++ b/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj b/src/libraries/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj index b67c9ae2f0d416..659e23ec47d3ee 100644 --- a/src/libraries/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj +++ b/src/libraries/System.Net.ServicePoint/src/System.Net.ServicePoint.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.csproj b/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.csproj index 9387aa994199f2..0ca0235e6ca78c 100644 --- a/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.csproj +++ b/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj index a437542c5ffe1f..4f2f27f215d0a8 100644 --- a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj +++ b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj @@ -4,15 +4,17 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) enable + - SR.SystemNetSockets_PlatformNotSupported + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.SystemNetSockets_PlatformNotSupported $(DefineConstants);SYSTEM_NET_SOCKETS_DLL - + @@ -86,7 +88,7 @@ - + @@ -177,7 +179,7 @@ - + @@ -297,7 +299,7 @@ - + diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj index 63e0987f7ac1a2..1d3155798c4f09 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/libraries/System.Net.WebClient/ref/System.Net.WebClient.csproj b/src/libraries/System.Net.WebClient/ref/System.Net.WebClient.csproj index 9174f984584489..732d3211ae5248 100644 --- a/src/libraries/System.Net.WebClient/ref/System.Net.WebClient.csproj +++ b/src/libraries/System.Net.WebClient/ref/System.Net.WebClient.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj b/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj index 48a1a9c82537cc..c317fabee22bd0 100644 --- a/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj +++ b/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj @@ -5,9 +5,10 @@ enable - SR.SystemNetWebClient_PlatformNotSupported + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.SystemNetWebClient_PlatformNotSupported - + diff --git a/src/libraries/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj b/src/libraries/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj index f0726067311629..6c776532e36760 100644 --- a/src/libraries/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj +++ b/src/libraries/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable $(NoWarn);CS8765 diff --git a/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj b/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj index d52760c4c646bc..ccec383b56f750 100644 --- a/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj +++ b/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.WebProxy/ref/System.Net.WebProxy.csproj b/src/libraries/System.Net.WebProxy/ref/System.Net.WebProxy.csproj index 43de7648955007..7fe0be4f8c5c80 100644 --- a/src/libraries/System.Net.WebProxy/ref/System.Net.WebProxy.csproj +++ b/src/libraries/System.Net.WebProxy/ref/System.Net.WebProxy.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.WebProxy/src/System.Net.WebProxy.csproj b/src/libraries/System.Net.WebProxy/src/System.Net.WebProxy.csproj index 5fd9532a47b374..e77de26b82c9f4 100644 --- a/src/libraries/System.Net.WebProxy/src/System.Net.WebProxy.csproj +++ b/src/libraries/System.Net.WebProxy/src/System.Net.WebProxy.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj b/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj index 7f5666d3064840..7793983c080b99 100644 --- a/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj +++ b/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj b/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj index 946ab8f773bdf0..79fdea54f1fdd6 100644 --- a/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj +++ b/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj @@ -7,15 +7,15 @@ - + - + - + @@ -36,10 +36,10 @@ - + - + diff --git a/src/libraries/System.Net.WebSockets/ref/System.Net.WebSockets.csproj b/src/libraries/System.Net.WebSockets/ref/System.Net.WebSockets.csproj index 134ea19cd36e51..3f0cf3c8211621 100644 --- a/src/libraries/System.Net.WebSockets/ref/System.Net.WebSockets.csproj +++ b/src/libraries/System.Net.WebSockets/ref/System.Net.WebSockets.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj b/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj index 9f2c2cc09cdaf0..f19710a0660374 100644 --- a/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj +++ b/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj @@ -36,12 +36,12 @@ Link="Common\Interop\Interop.zlib.cs" /> - + - + diff --git a/src/libraries/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj b/src/libraries/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj index 42ba04da8db712..05a66d765113ab 100644 --- a/src/libraries/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj +++ b/src/libraries/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj b/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj +++ b/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.ObjectModel/ref/System.ObjectModel.csproj b/src/libraries/System.ObjectModel/ref/System.ObjectModel.csproj index 623c85ec556705..76645a7f2ed38d 100644 --- a/src/libraries/System.ObjectModel/ref/System.ObjectModel.csproj +++ b/src/libraries/System.ObjectModel/ref/System.ObjectModel.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj b/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj index ecf4f2a77fe9e2..58f389a2659126 100644 --- a/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj +++ b/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj index 57474c6e2464b1..1e407a2091bc08 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj +++ b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj @@ -2,7 +2,7 @@ $(NoWarn);1634;1691;649 true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) false enable diff --git a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj index ce5a97d87051bf..7e19a856a103e2 100644 --- a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj +++ b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj @@ -37,10 +37,10 @@ - + - + diff --git a/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj b/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj index a174b927459d72..7c5de0f140e78b 100644 --- a/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj +++ b/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj @@ -1,7 +1,7 @@ System.Xml - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj b/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj index 613e07f835e94e..091753a1dbb929 100644 --- a/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj +++ b/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj @@ -779,10 +779,10 @@ - + - + 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 2759e12af1204f..6039cbc7d5e262 100644 --- a/src/libraries/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj +++ b/src/libraries/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj b/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj index babd7f14e4ed69..4fd66210d47eff 100644 --- a/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj +++ b/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj b/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj index 48837d6105f259..709b299efec007 100644 --- a/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj +++ b/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj b/src/libraries/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj +++ b/src/libraries/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj b/src/libraries/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj index f5ee53a8ae064b..5c26ae3990a1e1 100644 --- a/src/libraries/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj +++ b/src/libraries/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) true enable diff --git a/src/libraries/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj b/src/libraries/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj +++ b/src/libraries/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection.Emit/ref/System.Reflection.Emit.csproj b/src/libraries/System.Reflection.Emit/ref/System.Reflection.Emit.csproj index be3da7e1429229..69f55b0c9a6938 100644 --- a/src/libraries/System.Reflection.Emit/ref/System.Reflection.Emit.csproj +++ b/src/libraries/System.Reflection.Emit/ref/System.Reflection.Emit.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection.Emit/src/System.Reflection.Emit.csproj b/src/libraries/System.Reflection.Emit/src/System.Reflection.Emit.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.Reflection.Emit/src/System.Reflection.Emit.csproj +++ b/src/libraries/System.Reflection.Emit/src/System.Reflection.Emit.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj b/src/libraries/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj index ac1351c0752b89..fc9bd6eb7bd6d7 100644 --- a/src/libraries/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj +++ b/src/libraries/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj b/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj index 94d0c640130480..36c7cb1bdde2ad 100644 --- a/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj +++ b/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj b/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj index 9d2d488b8cc112..2902a67fdf076d 100644 --- a/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj +++ b/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj b/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj index dd3dc2940a54b1..5ecfe239de6f7a 100644 --- a/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj +++ b/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj b/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj index 5463928fbaf07d..b2a838b7f814e8 100644 --- a/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj +++ b/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj @@ -1,7 +1,7 @@ enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) 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 e078dd282ebe7b..e000ddd696ce76 100644 --- a/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj +++ b/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Reflection/ref/System.Reflection.csproj b/src/libraries/System.Reflection/ref/System.Reflection.csproj index 61b26cc370d896..721d268bc56937 100644 --- a/src/libraries/System.Reflection/ref/System.Reflection.csproj +++ b/src/libraries/System.Reflection/ref/System.Reflection.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection/src/System.Reflection.csproj b/src/libraries/System.Reflection/src/System.Reflection.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.Reflection/src/System.Reflection.csproj +++ b/src/libraries/System.Reflection/src/System.Reflection.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj index dc2bb32692ebe7..ad289dc63190c6 100644 --- a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj +++ b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/libraries/System.Resources.Reader/ref/System.Resources.Reader.csproj b/src/libraries/System.Resources.Reader/ref/System.Resources.Reader.csproj index a58632790d72ad..ac31c124d77d69 100644 --- a/src/libraries/System.Resources.Reader/ref/System.Resources.Reader.csproj +++ b/src/libraries/System.Resources.Reader/ref/System.Resources.Reader.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Resources.Reader/src/System.Resources.Reader.csproj b/src/libraries/System.Resources.Reader/src/System.Resources.Reader.csproj index 81ff3cda55d884..1a509db46e8141 100644 --- a/src/libraries/System.Resources.Reader/src/System.Resources.Reader.csproj +++ b/src/libraries/System.Resources.Reader/src/System.Resources.Reader.csproj @@ -2,7 +2,7 @@ System.Resources true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj b/src/libraries/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj index a1367c6a97a114..7bfbabc81984b0 100644 --- a/src/libraries/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj +++ b/src/libraries/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj b/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj +++ b/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Resources.Writer/ref/System.Resources.Writer.csproj b/src/libraries/System.Resources.Writer/ref/System.Resources.Writer.csproj index 5d9d0ee9332d6b..89d629821c6eff 100644 --- a/src/libraries/System.Resources.Writer/ref/System.Resources.Writer.csproj +++ b/src/libraries/System.Resources.Writer/ref/System.Resources.Writer.csproj @@ -1,7 +1,7 @@ enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Resources.Writer/src/System.Resources.Writer.csproj b/src/libraries/System.Resources.Writer/src/System.Resources.Writer.csproj index b910ab24e06a6b..b476784344b6b8 100644 --- a/src/libraries/System.Resources.Writer/src/System.Resources.Writer.csproj +++ b/src/libraries/System.Resources.Writer/src/System.Resources.Writer.csproj @@ -3,7 +3,7 @@ true System.Resources enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj index a567a23967c5da..a9da990b9c9ddf 100644 --- a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj +++ b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj @@ -66,7 +66,7 @@ System.Runtime.Caching.ObjectCache - + @@ -74,7 +74,7 @@ System.Runtime.Caching.ObjectCache - + diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj b/src/libraries/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj index c63584df9a6fa0..a4367378e73fd3 100644 --- a/src/libraries/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj +++ b/src/libraries/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj @@ -1,7 +1,7 @@ enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj b/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj index d0ca0d4c3203d5..e870ee097993f9 100644 --- a/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj +++ b/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj @@ -2,7 +2,7 @@ enable true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj b/src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj index 7114edf7757f10..f229a1681202d6 100644 --- a/src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj +++ b/src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj @@ -9,7 +9,7 @@ Remove warning disable when nullable attributes are respected, Type has no accessible constructors which use only CLS-compliant types --> $(NoWarn);0809;0618;CS8614;CS3015;NU5131 - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj b/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj index 32152c73ed4d0f..23001b05b96ff4 100644 --- a/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj +++ b/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) $(NoWarn);CS0618 enable diff --git a/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj index b6029a4baee65e..748322734e2cf2 100644 --- a/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj +++ b/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable 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 71788c421b44ed..9574f7d433c480 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 @@ -1,12 +1,16 @@  true - $(DefineConstants);Unix true true true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + + + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + $(DefineConstants);Unix + @@ -76,7 +80,7 @@ - + diff --git a/src/libraries/System.Runtime.Handles/ref/System.Runtime.Handles.csproj b/src/libraries/System.Runtime.Handles/ref/System.Runtime.Handles.csproj index 87bea6d58fdc25..39ab002c1e77b1 100644 --- a/src/libraries/System.Runtime.Handles/ref/System.Runtime.Handles.csproj +++ b/src/libraries/System.Runtime.Handles/ref/System.Runtime.Handles.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj b/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj index 94d0c640130480..36c7cb1bdde2ad 100644 --- a/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj +++ b/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj index f752541dd4440e..6a61700686d61e 100644 --- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj +++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj @@ -1,7 +1,7 @@ enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj index 94d0c640130480..36c7cb1bdde2ad 100644 --- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj +++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj b/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj index f2533619f265f9..c7219439445e2f 100644 --- a/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj +++ b/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj @@ -5,7 +5,7 @@ $(NoWarn);618;CS8765 true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj b/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj index 3bc59997f7f0c4..49ebaf784dc66d 100644 --- a/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj +++ b/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System.Runtime.InteropServices.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System.Runtime.InteropServices.Tests.csproj index 4dc5e6b4350916..072080790a255d 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System.Runtime.InteropServices.Tests.csproj +++ b/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System.Runtime.InteropServices.Tests.csproj @@ -22,7 +22,7 @@ - + @@ -61,47 +61,47 @@ - + - + - + - - + + - + - + - + - + - + - + - + - + - + @@ -109,7 +109,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -171,14 +171,14 @@ - + - + - + @@ -186,10 +186,10 @@ - + - + diff --git a/src/libraries/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.csproj b/src/libraries/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.csproj index 99d42572c65e5e..a2f37c85cd4030 100644 --- a/src/libraries/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.csproj +++ b/src/libraries/System.Runtime.Intrinsics/ref/System.Runtime.Intrinsics.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime.Intrinsics/src/System.Runtime.Intrinsics.csproj b/src/libraries/System.Runtime.Intrinsics/src/System.Runtime.Intrinsics.csproj index dd3dc2940a54b1..5ecfe239de6f7a 100644 --- a/src/libraries/System.Runtime.Intrinsics/src/System.Runtime.Intrinsics.csproj +++ b/src/libraries/System.Runtime.Intrinsics/src/System.Runtime.Intrinsics.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime.Loader/ref/System.Runtime.Loader.csproj b/src/libraries/System.Runtime.Loader/ref/System.Runtime.Loader.csproj index f167ed3e9ded8f..92bc3b365e0687 100644 --- a/src/libraries/System.Runtime.Loader/ref/System.Runtime.Loader.csproj +++ b/src/libraries/System.Runtime.Loader/ref/System.Runtime.Loader.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj b/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj index dd3dc2940a54b1..5ecfe239de6f7a 100644 --- a/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj +++ b/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj b/src/libraries/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj index 39e712be0627ac..03c9a9dd37e279 100644 --- a/src/libraries/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj +++ b/src/libraries/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj @@ -1,7 +1,7 @@ enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj b/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj index d61ea2546b168b..5c2f63834c360d 100644 --- a/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj +++ b/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj @@ -3,7 +3,7 @@ System.Numerics true enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj b/src/libraries/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj index 20657fa0322d06..c3192c2662a1df 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj +++ b/src/libraries/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj b/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj index 137d1e55d6af8e..45a23280109370 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj +++ b/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj @@ -1,16 +1,18 @@ - $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android; + $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android enable - - $(NoWarn);CS0649 + + $(MSBuildThisFileDirectory)ILLink\ - + - $(MSBuildThisFileDirectory)ILLink\ + $(TargetFramework.SubString($([MSBuild]::Add($(TargetFramework.IndexOf('-')), 1)))) + + $(NoWarn);CS0649 - - + + @@ -67,14 +69,14 @@ - + Common\System\LocalAppContextSwitches.Common.cs - + 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 0974cc86d7d3f5..bb5a72a9fd2805 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 @@ -12,7 +12,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/src/libraries/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj b/src/libraries/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj index a25d7b6d5c157e..8f1c520afdcbaa 100644 --- a/src/libraries/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj +++ b/src/libraries/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj b/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj index 9cdaf74ee951e8..0ad2fb06652cdd 100644 --- a/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj +++ b/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj b/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj index bcb2151821ac8d..065dfb3ceb9572 100644 --- a/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj +++ b/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj @@ -1,7 +1,7 @@ enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj index e314354aef4a47..7026150754ea93 100644 --- a/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj +++ b/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj b/src/libraries/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj index 4e128a35ab0c3a..a79c1b8fae2542 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj +++ b/src/libraries/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj b/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj index dfb110cefca463..7834886d249143 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj +++ b/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime/ref/System.Runtime.csproj b/src/libraries/System.Runtime/ref/System.Runtime.csproj index 9cbad9dddb8044..1bdbbe8c5bffc4 100644 --- a/src/libraries/System.Runtime/ref/System.Runtime.csproj +++ b/src/libraries/System.Runtime/ref/System.Runtime.csproj @@ -8,7 +8,7 @@ Remove warning disable when nullable attributes are respected, Type has no accessible constructors which use only CLS-compliant types --> $(NoWarn);0809;0618;CS8614;CS3015 - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime/src/System.Runtime.csproj b/src/libraries/System.Runtime/src/System.Runtime.csproj index 8d726a13147929..b8df760b6ba3fc 100644 --- a/src/libraries/System.Runtime/src/System.Runtime.csproj +++ b/src/libraries/System.Runtime/src/System.Runtime.csproj @@ -3,7 +3,7 @@ $(LibrariesProjectRoot)System.Runtime.Experimental\ref\System.Runtime.Experimental.csproj true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable True diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj index 051fe609d634b0..c45a71ac87238e 100644 --- a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj +++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj @@ -247,7 +247,7 @@ - + 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 391997c918a936..46e8ce511e772f 100644 --- a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) 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 98ab4777d2f60a..8bdc585baa15c8 100644 --- a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj @@ -6,9 +6,10 @@ - SR.PlatformNotSupported_AccessControl + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.PlatformNotSupported_AccessControl - + diff --git a/src/libraries/System.Security.Claims/ref/System.Security.Claims.csproj b/src/libraries/System.Security.Claims/ref/System.Security.Claims.csproj index 33820c62332313..df5828adf20140 100644 --- a/src/libraries/System.Security.Claims/ref/System.Security.Claims.csproj +++ b/src/libraries/System.Security.Claims/ref/System.Security.Claims.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj b/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj index ca4bd80a6eb1c4..3af8bb328c7d3c 100644 --- a/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj +++ b/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj b/src/libraries/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj index 6f78fdf5bfd120..959864f04e6574 100644 --- a/src/libraries/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj +++ b/src/libraries/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) $(NoWarn);SYSLIB0021;SYSLIB0022 enable diff --git a/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj b/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj index ccd9e34fe31e1a..6af3caadf5a586 100644 --- a/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj +++ b/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj @@ -1,7 +1,7 @@  true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable 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 a333acc0151826..f9381da6532dbc 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,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj b/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj index 1fe031a388f591..40d5a22195c9f4 100644 --- a/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj +++ b/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) 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 3ab50a56b049ec..e6d642f010d23c 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 @@ -14,7 +14,7 @@ - + - - + + - - - - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) $(NoWarn);CS0809 enable diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj b/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj index 722700b99b1517..5e5200e76e470e 100644 --- a/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj +++ b/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj b/src/libraries/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj index 482a8c25218fd0..e11be11a50cfe5 100644 --- a/src/libraries/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj +++ b/src/libraries/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj b/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj index da0251ebe3492f..6102b48ffc2944 100644 --- a/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj +++ b/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) true enable diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj index 225e8cf6880823..474b4123f3b60c 100644 --- a/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj +++ b/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable 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 1fe031a388f591..40d5a22195c9f4 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,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) true diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj index e139314a91c378..c57a5864c559c3 100644 --- a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj @@ -5,7 +5,7 @@ https://github.com/dotnet/runtime/issues/49083 --> true - true + true true true 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 4c0f530d5faed4..57ed54ee88f0a6 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 @@ -16,12 +16,12 @@ System.Security.Cryptography.Pkcs.EnvelopedCms true true + - - + + @@ -49,11 +49,8 @@ System.Security.Cryptography.Pkcs.EnvelopedCms - - - - - + + @@ -65,13 +62,6 @@ System.Security.Cryptography.Pkcs.EnvelopedCms Link="Internal\Cryptography\Helpers.cs" /> - - - - - - Common\System\Security\Cryptography\Asn1\Pkcs7\ContentInfoAsn.xml @@ -144,8 +134,14 @@ System.Security.Cryptography.Pkcs.EnvelopedCms System\Security\Cryptography\Pkcs\Asn1\RecipientKeyIdentifier.xml - - + + + + + + + @@ -163,9 +159,8 @@ System.Security.Cryptography.Pkcs.EnvelopedCms - - - + + Link="Common\Interop\Windows\NCrypt\Interop.NCryptFreeObject.cs" /> - - - + + + - + + @@ -563,6 +559,7 @@ System.Security.Cryptography.Pkcs.EnvelopedCms + @@ -675,7 +672,7 @@ System.Security.Cryptography.Pkcs.EnvelopedCms - + diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj index b2c2be9f8f0221..dbcbe329391bac 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj b/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj index 85b76a7c369070..958cfe9a0761a3 100644 --- a/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj +++ b/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj b/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj index 01600a4d505ca1..d3eb8cf67d3617 100644 --- a/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj +++ b/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj index 4880ca0aa094d8..9d505846d2f949 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj +++ b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj @@ -13,11 +13,12 @@ System.Security.Cryptography.ProtectedData + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) true true - SR.PlatformNotSupported_CryptographyProtectedData + SR.PlatformNotSupported_CryptographyProtectedData - + - + diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj index 71d56f25038d49..c195646e0e51c0 100644 --- a/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj +++ b/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable $(NoWarn);SYSLIB0026 diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj index 1fe031a388f591..40d5a22195c9f4 100644 --- a/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj +++ b/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) true diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj index 2155c7384eff53..fe4112c15fe4a1 100644 --- a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj @@ -2,15 +2,17 @@ true $(DefineConstants);HAVE_THUMBPRINT_OVERLOADS - $(DefineConstants);Unix true $(NoWarn);SYSLIB0026;SYSLIB0027;SYSLIB0028 $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS true + - true - true + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + $(DefineConstants);Unix + true + true @@ -79,7 +81,7 @@ - + - + @@ -155,7 +157,7 @@ - + @@ -163,7 +165,7 @@ - + - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable $(NoWarn);SYSLIB0026 diff --git a/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj b/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj index b503389947d916..e76f61affe9de7 100644 --- a/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj +++ b/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj @@ -3,22 +3,24 @@ true $(DefineConstants);INTERNAL_ASYMMETRIC_IMPLEMENTATIONS $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent) - $(NoWarn);CA5350;CA5351;CA5379;CA5384 + $(NoWarn);CA5350;CA5351;CA5379;CA5384;SYSLIB0026 enable + + - SR.SystemSecurityCryptography_PlatformNotSupported - $(NoWarn);SYSLIB0026 - - - true - true - true - true + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.SystemSecurityCryptography_PlatformNotSupported + true + true + true + true true + + @@ -533,7 +535,7 @@ System\Security\Cryptography\X509Certificates\Asn1\PolicyInformationAsn.xml - + - + - + - + - + diff --git a/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj b/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj index dafa4adb4bff23..0f028bf8d148f2 100644 --- a/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj +++ b/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj @@ -6,8 +6,10 @@ true true + - true + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + 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 955e29d0da1ff5..51a48de7604ce2 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,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) 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 f99bbc68881419..e1b2637e0864ad 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 @@ -1,19 +1,20 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) enable - - SR.PlatformNotSupported_Principal + + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.PlatformNotSupported_Principal - annotations + annotations - + diff --git a/src/libraries/System.Security.Principal/ref/System.Security.Principal.csproj b/src/libraries/System.Security.Principal/ref/System.Security.Principal.csproj index 06941c80cb7793..94f0959b038012 100644 --- a/src/libraries/System.Security.Principal/ref/System.Security.Principal.csproj +++ b/src/libraries/System.Security.Principal/ref/System.Security.Principal.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj b/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj +++ b/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Security.SecureString/ref/System.Security.SecureString.csproj b/src/libraries/System.Security.SecureString/ref/System.Security.SecureString.csproj index 38d76bbb6123dc..69f78b5ef868dc 100644 --- a/src/libraries/System.Security.SecureString/ref/System.Security.SecureString.csproj +++ b/src/libraries/System.Security.SecureString/ref/System.Security.SecureString.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Security.SecureString/src/System.Security.SecureString.csproj b/src/libraries/System.Security.SecureString/src/System.Security.SecureString.csproj index c1ef027e6f6aa5..817af0da465218 100644 --- a/src/libraries/System.Security.SecureString/src/System.Security.SecureString.csproj +++ b/src/libraries/System.Security.SecureString/src/System.Security.SecureString.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable 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 4ee87fe36d3297..44fc5893c98dee 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -14,13 +14,14 @@ System.ServiceProcess.ServiceType + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) true true - SR.PlatformNotSupported_ServiceController + SR.PlatformNotSupported_ServiceController $(NoWarn);CA1066 - + + + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) - true - SR.PlatformNotSupported_SystemSpeech + SR.PlatformNotSupported_SystemSpeech + true - + @@ -221,11 +223,11 @@ System.Speech.Recognition.SpeechRecognizer - + - + true ExceptionStringTable 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 094f9c43ec7db1..2dc3052b7602fa 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 @@ -44,7 +44,7 @@ System.Text.CodePagesEncodingProvider - + @@ -57,7 +57,7 @@ System.Text.CodePagesEncodingProvider - + diff --git a/src/libraries/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj b/src/libraries/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj index fa92b90a39b6c2..0dcefeb2a1288e 100644 --- a/src/libraries/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj +++ b/src/libraries/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj b/src/libraries/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj index dd3dc2940a54b1..5ecfe239de6f7a 100644 --- a/src/libraries/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj +++ b/src/libraries/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Text.Encoding/ref/System.Text.Encoding.csproj b/src/libraries/System.Text.Encoding/ref/System.Text.Encoding.csproj index 7cfd7365e0d1aa..01856a50e8420f 100644 --- a/src/libraries/System.Text.Encoding/ref/System.Text.Encoding.csproj +++ b/src/libraries/System.Text.Encoding/ref/System.Text.Encoding.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj b/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj +++ b/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable 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 ec39570c09d82c..75702453c1fb5c 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 @@ -16,7 +16,8 @@ System.Text.Encodings.Web.JavaScriptEncoder - $(DefineConstants);TARGET_BROWSER + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + $(DefineConstants);TARGET_BROWSER diff --git a/src/libraries/System.Text.Encodings.Web/tools/GenDefinedCharList/GenDefinedCharList.csproj b/src/libraries/System.Text.Encodings.Web/tools/GenDefinedCharList/GenDefinedCharList.csproj index da2080cc5e87a6..d1b3c292347b23 100644 --- a/src/libraries/System.Text.Encodings.Web/tools/GenDefinedCharList/GenDefinedCharList.csproj +++ b/src/libraries/System.Text.Encodings.Web/tools/GenDefinedCharList/GenDefinedCharList.csproj @@ -1,7 +1,7 @@ Exe - netcoreapp3.1 + netcoreapp3.1 false diff --git a/src/libraries/System.Text.Encodings.Web/tools/GenUnicodeRanges/GenUnicodeRanges.csproj b/src/libraries/System.Text.Encodings.Web/tools/GenUnicodeRanges/GenUnicodeRanges.csproj index da2080cc5e87a6..d1b3c292347b23 100644 --- a/src/libraries/System.Text.Encodings.Web/tools/GenUnicodeRanges/GenUnicodeRanges.csproj +++ b/src/libraries/System.Text.Encodings.Web/tools/GenUnicodeRanges/GenUnicodeRanges.csproj @@ -1,7 +1,7 @@ Exe - netcoreapp3.1 + netcoreapp3.1 false diff --git a/src/libraries/System.Text.Json/gen/System.Text.Json.SourceGeneration.targets b/src/libraries/System.Text.Json/gen/System.Text.Json.SourceGeneration.targets index 97d78152396485..f9e1d021b674b7 100644 --- a/src/libraries/System.Text.Json/gen/System.Text.Json.SourceGeneration.targets +++ b/src/libraries/System.Text.Json/gen/System.Text.Json.SourceGeneration.targets @@ -1,6 +1,6 @@ - netstandard2.0 + netstandard2.0 $(MSBuildThisFileName) $(MSBuildThisFileName) SR diff --git a/src/libraries/System.Text.RegularExpressions/gen/System.Text.RegularExpressions.Generator.csproj b/src/libraries/System.Text.RegularExpressions/gen/System.Text.RegularExpressions.Generator.csproj index e6982a3b83ce0e..51c49cc2e6d48b 100644 --- a/src/libraries/System.Text.RegularExpressions/gen/System.Text.RegularExpressions.Generator.csproj +++ b/src/libraries/System.Text.RegularExpressions/gen/System.Text.RegularExpressions.Generator.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + netstandard2.0 true false true diff --git a/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj b/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj index 9b41914783020b..1a11a90ac115e5 100644 --- a/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj +++ b/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj index 0034d373563a96..641d32f3553102 100644 --- a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj +++ b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj index 572fbfcb4e6cdb..7c73b994648a02 100644 --- a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj +++ b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj @@ -18,10 +18,11 @@ System.Security.AccessControl.SemaphoreSecurity + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) true - SR.PlatformNotSupported_AccessControl + SR.PlatformNotSupported_AccessControl - + true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj b/src/libraries/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj index dd3dc2940a54b1..5ecfe239de6f7a 100644 --- a/src/libraries/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj +++ b/src/libraries/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.Tasks.Extensions/ref/System.Threading.Tasks.Extensions.csproj b/src/libraries/System.Threading.Tasks.Extensions/ref/System.Threading.Tasks.Extensions.csproj index 76e0ee495e8fd5..2a359768071e21 100644 --- a/src/libraries/System.Threading.Tasks.Extensions/ref/System.Threading.Tasks.Extensions.csproj +++ b/src/libraries/System.Threading.Tasks.Extensions/ref/System.Threading.Tasks.Extensions.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj b/src/libraries/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj +++ b/src/libraries/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj b/src/libraries/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj index aa3558ef5bd594..300626789bb46a 100644 --- a/src/libraries/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj +++ b/src/libraries/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj b/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj index fc06ab309921c0..16c2fc66318e73 100644 --- a/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj +++ b/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.Tasks/ref/System.Threading.Tasks.csproj b/src/libraries/System.Threading.Tasks/ref/System.Threading.Tasks.csproj index fd998b62bb8038..abb8e0de95b27e 100644 --- a/src/libraries/System.Threading.Tasks/ref/System.Threading.Tasks.csproj +++ b/src/libraries/System.Threading.Tasks/ref/System.Threading.Tasks.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj b/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj +++ b/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj b/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj index 2ebad89669d3db..8fd273891553d6 100644 --- a/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj +++ b/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj b/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj index dd3dc2940a54b1..5ecfe239de6f7a 100644 --- a/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj +++ b/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj b/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj index a86046bb60d448..6d53cf798f5985 100644 --- a/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj +++ b/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj b/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj index dd3dc2940a54b1..5ecfe239de6f7a 100644 --- a/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj +++ b/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.Timer/ref/System.Threading.Timer.csproj b/src/libraries/System.Threading.Timer/ref/System.Threading.Timer.csproj index 398e3eafe32ac3..4ce7799f86ae12 100644 --- a/src/libraries/System.Threading.Timer/ref/System.Threading.Timer.csproj +++ b/src/libraries/System.Threading.Timer/ref/System.Threading.Timer.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.Timer/src/System.Threading.Timer.csproj b/src/libraries/System.Threading.Timer/src/System.Threading.Timer.csproj index 4f2d15aa3b6a58..a9c43608342deb 100644 --- a/src/libraries/System.Threading.Timer/src/System.Threading.Timer.csproj +++ b/src/libraries/System.Threading.Timer/src/System.Threading.Timer.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading/ref/System.Threading.csproj b/src/libraries/System.Threading/ref/System.Threading.csproj index 8a140934e7f27c..a0726a8e926cd5 100644 --- a/src/libraries/System.Threading/ref/System.Threading.csproj +++ b/src/libraries/System.Threading/ref/System.Threading.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading/src/System.Threading.csproj b/src/libraries/System.Threading/src/System.Threading.csproj index 895b458279376d..f4f99d24965e2e 100644 --- a/src/libraries/System.Threading/src/System.Threading.csproj +++ b/src/libraries/System.Threading/src/System.Threading.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Transactions.Local/ref/System.Transactions.Local.csproj b/src/libraries/System.Transactions.Local/ref/System.Transactions.Local.csproj index ce48f9db195f15..aa7f862958cc2b 100644 --- a/src/libraries/System.Transactions.Local/ref/System.Transactions.Local.csproj +++ b/src/libraries/System.Transactions.Local/ref/System.Transactions.Local.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj b/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj index 1715d21528c971..8180b39112f8ce 100644 --- a/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj +++ b/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.ValueTuple/ref/System.ValueTuple.csproj b/src/libraries/System.ValueTuple/ref/System.ValueTuple.csproj index 48439ada9ee5b1..53c1df4d9a37f7 100644 --- a/src/libraries/System.ValueTuple/ref/System.ValueTuple.csproj +++ b/src/libraries/System.ValueTuple/ref/System.ValueTuple.csproj @@ -3,7 +3,7 @@ 4.0.3.0 - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.ValueTuple/src/System.ValueTuple.csproj b/src/libraries/System.ValueTuple/src/System.ValueTuple.csproj index 7a4c9970551301..c3bdb22267397a 100644 --- a/src/libraries/System.ValueTuple/src/System.ValueTuple.csproj +++ b/src/libraries/System.ValueTuple/src/System.ValueTuple.csproj @@ -2,7 +2,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj b/src/libraries/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj index 0c8fb1555c678e..3edccaeb578f58 100644 --- a/src/libraries/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj +++ b/src/libraries/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj @@ -1,7 +1,7 @@ enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj b/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj index 2b5750a3707838..31af47b3b1f780 100644 --- a/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj +++ b/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) 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 b2de19721e30a7..3eebeafe4770ed 100644 --- a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj +++ b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj @@ -12,10 +12,11 @@ System.Security.Cryptography.X509Certificates.X509Certificate2UI System.Security.Cryptography.X509Certificates.X509SelectionFlag - - SR.PlatformNotSupported_System_Windows_Extensions + + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + SR.PlatformNotSupported_System_Windows_Extensions - + @@ -82,7 +83,7 @@ System.Security.Cryptography.X509Certificates.X509SelectionFlag - + diff --git a/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj b/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj index fac6e53faf4105..310e822d4cf8b1 100644 --- a/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj +++ b/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj @@ -2,7 +2,7 @@ $(NetCoreAppCurrent)-windows - + diff --git a/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj b/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj index 7ce26ea71e1fdf..025908422291ef 100644 --- a/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj +++ b/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj b/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj index 87b021333ac17c..43a3ccb9fcc01c 100644 --- a/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj +++ b/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj @@ -2,7 +2,7 @@ System.Xml true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj b/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj index e49f7c30e2e34d..4c769629707a82 100644 --- a/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj +++ b/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj b/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj index a27331293a226e..81fe13f13dafdb 100644 --- a/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj +++ b/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj @@ -2,7 +2,7 @@ System.Xml true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj b/src/libraries/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj index 1bc5c5bd1fe484..ada222c6f4056d 100644 --- a/src/libraries/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj +++ b/src/libraries/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable 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 456c96962cd9fb..f9101146971936 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 @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Xml.XPath/ref/System.Xml.XPath.csproj b/src/libraries/System.Xml.XPath/ref/System.Xml.XPath.csproj index 6cbf41c40f82ba..01888d73a15db0 100644 --- a/src/libraries/System.Xml.XPath/ref/System.Xml.XPath.csproj +++ b/src/libraries/System.Xml.XPath/ref/System.Xml.XPath.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj b/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj index a2a87b23e74cf8..d8e7c78820a1ae 100644 --- a/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj +++ b/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj b/src/libraries/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj index 1844179cd812da..b6e90cfde9d431 100644 --- a/src/libraries/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj +++ b/src/libraries/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj b/src/libraries/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj index e6d999dc4c2ff5..a46b8c977682a6 100644 --- a/src/libraries/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj +++ b/src/libraries/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj b/src/libraries/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj index a626176aed788a..901bd833ca5df5 100644 --- a/src/libraries/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj +++ b/src/libraries/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj b/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj index a2a87b23e74cf8..d8e7c78820a1ae 100644 --- a/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj +++ b/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj index c04d47d9f897e7..20eed5139a994d 100644 --- a/src/libraries/externals.csproj +++ b/src/libraries/externals.csproj @@ -3,7 +3,7 @@ $(PackageRID) true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) false true diff --git a/src/libraries/native-binplace.proj b/src/libraries/native-binplace.proj index 9d9ee882b1f62d..82427d8f27b01c 100644 --- a/src/libraries/native-binplace.proj +++ b/src/libraries/native-binplace.proj @@ -2,7 +2,6 @@ - $(NetCoreAppCurrent) $(NetCoreAppCurrent) false true diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj index dc879eb62d5f13..ac410f828662b1 100644 --- a/src/libraries/pretest.proj +++ b/src/libraries/pretest.proj @@ -17,7 +17,7 @@ the targeting and runtimepack before the test runners which consume that asset are built. --> - + diff --git a/src/libraries/ref.proj b/src/libraries/ref.proj index e3a63ad2bb8484..4d67c2f01c6b94 100644 --- a/src/libraries/ref.proj +++ b/src/libraries/ref.proj @@ -6,6 +6,13 @@ false + + $(BuildTargetFramework) + + true + true + + <_allRef Include="$(MSBuildThisFileDirectory)*\ref\*.csproj" Exclude="@(ProjectExclusions)" /> diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj index f5fd1292fed267..3b938a01682001 100644 --- a/src/libraries/sendtohelix.proj +++ b/src/libraries/sendtohelix.proj @@ -16,12 +16,11 @@ $(NetCoreAppCurrent) - true - SetStressModes_$(Scenario).cmd - SetStressModes_$(Scenario).sh + SetStressModes_$(Scenario).cmd + SetStressModes_$(Scenario).sh @@ -117,11 +116,12 @@ $(NetCoreAppCurrentTestHostPath)$(TestEnvFileName) + <_targetsWindows Condition="'$(TargetOS)' == 'windows'">true <_ProjectsToBuild Include="$(RepoRoot)\src\tests\Common\testenvironment.proj"> - Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows) + Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(_targetsWindows) @@ -156,8 +156,8 @@ <_RuntimeInput Include="$(NetCoreAppCurrentTestHostPath)**\*.dll" /> - <_RuntimeInput Condition=" '$(Scenarios)' != '' and '$(TargetsWindows)' == 'true' " Include="$(NetCoreAppCurrentTestHostPath)**\*.cmd" /> - <_RuntimeInput Condition=" '$(Scenarios)' != '' and '$(TargetsWindows)' != 'true' " Include="$(NetCoreAppCurrentTestHostPath)**\*.sh" /> + <_RuntimeInput Condition="'$(Scenarios)' != '' and '$(TargetOS)' == 'windows'" Include="$(NetCoreAppCurrentTestHostPath)**\*.cmd" /> + <_RuntimeInput Condition="'$(Scenarios)' != '' and '$(TargetOS)' != 'windows'" Include="$(NetCoreAppCurrentTestHostPath)**\*.sh" /> diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 3875c28fdf383d..53a700a1eb2f91 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -6,8 +6,7 @@ --> - true - true + true $(BUILD_BUILDNUMBER) @@ -98,15 +97,15 @@ (which is when this project is invoked to call the "CreateTestEnvFile" target). --> - SetStressModes_$(Scenario).cmd - SetStressModes_$(Scenario).sh + SetStressModes_$(Scenario).cmd + SetStressModes_$(Scenario).sh - + @@ -114,7 +113,7 @@ - + @@ -213,11 +212,11 @@ - + $(HelixPostCommands); %HELIX_PYTHONPATH% %HELIX_CORRELATION_PAYLOAD%\gen-debug-dump-docs.py -buildid $(BUILD_BUILDID) -workitem %HELIX_WORKITEM_FRIENDLYNAME% -jobid %HELIX_CORRELATION_ID% -outdir %HELIX_WORKITEM_UPLOAD_ROOT% -templatedir %HELIX_CORRELATION_PAYLOAD% -dumpdir %HELIX_DUMP_FOLDER% -productver $(ProductVersion) - + $(HelixPostCommands); $HELIX_PYTHONPATH $HELIX_CORRELATION_PAYLOAD/gen-debug-dump-docs.py -buildid $(BUILD_BUILDID) -workitem $HELIX_WORKITEM_FRIENDLYNAME -jobid $HELIX_CORRELATION_ID -outdir $HELIX_WORKITEM_UPLOAD_ROOT -templatedir $HELIX_CORRELATION_PAYLOAD -dumpdir $HELIX_DUMP_FOLDER -productver $(ProductVersion) diff --git a/src/libraries/shims/generated/Directory.Build.props b/src/libraries/shims/generated/Directory.Build.props index 6b2ab04d6acff2..4694448ae164b8 100644 --- a/src/libraries/shims/generated/Directory.Build.props +++ b/src/libraries/shims/generated/Directory.Build.props @@ -11,7 +11,7 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/shims/manual/Directory.Build.props b/src/libraries/shims/manual/Directory.Build.props index e5f08175e8c44f..d2bb299a05ed78 100644 --- a/src/libraries/shims/manual/Directory.Build.props +++ b/src/libraries/shims/manual/Directory.Build.props @@ -12,7 +12,7 @@ true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) diff --git a/src/libraries/src.proj b/src/libraries/src.proj index 4e0fea066f7507..35479848aaee18 100644 --- a/src/libraries/src.proj +++ b/src/libraries/src.proj @@ -4,6 +4,13 @@ BuildAllProjects=true + + $(BuildTargetFramework) + + true + true + + <_allSrc Include="$(MSBuildThisFileDirectory)*\src\*.*proj" Exclude="@(ProjectExclusions); @@ -33,7 +40,7 @@ - +