forge/ayaports
1
0
Fork 0
Code Issues 43 Pull requests 11 Projects Releases Packages Wiki Activity Actions
ayaports/community/dotnet7-build/runtime_enable-runtime-marshalling.diff

1808 lines
133 KiB
Diff
Raw Normal View History

user/dotnet7-build: new aport
2023-02-22 04:48:58 +00:00
From 98054ea87ce70247bb09ceafd2ad1a0b36d2fef4 Mon Sep 17 00:00:00 2001
Patch-Source: https://github.com/dotnet/runtime/issues/77364
From: Antoine Martin <dev@ayakael.net>
Date: Sat, 1 Oct 2022 09:21:58 -0400
Subject: [PATCH] Enable runtime marshalling
Dotnet7 introduced a bug where MkDir would sometimes have a snuffed errno.
This is a temporary workaround till upstream finds why the errno is being
turned into EAGAIN.
---
src/libraries/Common/src/DisableRuntimeMarshalling.cs | 2 +-
.../Common/src/Interop/Unix/System.Native/Interop.MkDir.cs | 4 ++--
src/libraries/Common/tests/Common.Tests.csproj | 2 +-
src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj | 2 +-
.../Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj | 4 ++--
.../UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj | 2 +-
.../tests/Common/Microsoft.Extensions.Logging.Tests.csproj | 2 +-
.../tests/Microsoft.Win32.Primitives.Tests.csproj | 2 +-
.../src/Microsoft.Win32.Registry.AccessControl.csproj | 2 +-
.../tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj | 2 +-
.../src/Microsoft.Win32.Registry.csproj | 2 +-
.../tests/Microsoft.Win32.Registry.Tests.csproj | 2 +-
.../src/Microsoft.Win32.SystemEvents.csproj | 2 +-
.../tests/Microsoft.Win32.SystemEvents.Tests.csproj | 2 +-
src/libraries/System.Console/src/System.Console.csproj | 2 +-
.../System.Console/tests/System.Console.Tests.csproj | 2 +-
src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj | 2 +-
.../System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj | 2 +-
src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj | 2 +-
.../System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj | 2 +-
.../tests/System.Diagnostics.Debug.Tests.csproj | 2 +-
.../src/System.Diagnostics.EventLog.csproj | 2 +-
.../tests/System.Diagnostics.EventLog.Tests.csproj | 2 +-
.../src/System.Diagnostics.FileVersionInfo.csproj | 2 +-
.../System.Diagnostics.FileVersionInfo.Tests.csproj | 2 +-
.../src/System.Diagnostics.PerformanceCounter.csproj | 2 +-
.../tests/System.Diagnostics.PerformanceCounter.Tests.csproj | 2 +-
.../src/System.Diagnostics.Process.csproj | 2 +-
.../tests/System.Diagnostics.Process.Tests.csproj | 2 +-
.../tests/System.Diagnostics.Tracing.Tests.csproj | 2 +-
.../src/System.DirectoryServices.AccountManagement.csproj | 2 +-
.../System.DirectoryServices.AccountManagement.Tests.csproj | 2 +-
.../src/System.DirectoryServices.Protocols.csproj | 2 +-
.../tests/System.DirectoryServices.Protocols.Tests.csproj | 2 +-
.../src/System.DirectoryServices.csproj | 2 +-
.../tests/System.DirectoryServices.Tests.csproj | 2 +-
.../System.Drawing.Common/src/System.Drawing.Common.csproj | 2 +-
.../tests/System.Drawing.Common.Tests.csproj | 2 +-
.../src/System.Drawing.Primitives.csproj | 2 +-
.../System.Formats.Tar/src/System.Formats.Tar.csproj | 2 +-
.../System.Formats.Tar/tests/System.Formats.Tar.Tests.csproj | 2 +-
.../NlsTests/System.Globalization.Extensions.Nls.Tests.csproj | 2 +-
.../tests/NlsTests/System.Globalization.Nls.Tests.csproj | 2 +-
.../src/System.IO.Compression.Brotli.csproj | 2 +-
.../tests/System.IO.Compression.Brotli.Tests.csproj | 2 +-
.../src/System.IO.Compression.ZipFile.csproj | 2 +-
.../tests/System.IO.Compression.ZipFile.Tests.csproj | 2 +-
.../System.IO.Compression/src/System.IO.Compression.csproj | 2 +-
.../tests/System.IO.Compression.Tests.csproj | 2 +-
.../src/System.IO.FileSystem.AccessControl.csproj | 2 +-
.../tests/System.IO.FileSystem.AccessControl.Tests.csproj | 2 +-
.../src/System.IO.FileSystem.DriveInfo.csproj | 2 +-
.../tests/System.IO.FileSystem.DriveInfo.Tests.csproj | 2 +-
.../src/System.IO.FileSystem.Watcher.csproj | 2 +-
.../tests/System.IO.FileSystem.Watcher.Tests.csproj | 2 +-
.../tests/System.IO.FileSystem.Tests.csproj | 2 +-
.../src/System.IO.IsolatedStorage.csproj | 2 +-
.../tests/System.IO.IsolatedStorage.Tests.csproj | 2 +-
.../src/System.IO.MemoryMappedFiles.csproj | 2 +-
.../tests/System.IO.MemoryMappedFiles.Tests.csproj | 2 +-
.../src/System.IO.Pipes.AccessControl.csproj | 2 +-
.../tests/System.IO.Pipes.AccessControl.Tests.csproj | 2 +-
src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj | 2 +-
.../System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj | 2 +-
src/libraries/System.IO.Ports/src/System.IO.Ports.csproj | 2 +-
.../System.IO.Ports/tests/System.IO.Ports.Tests.csproj | 2 +-
src/libraries/System.Management/src/System.Management.csproj | 2 +-
.../System.Management/tests/System.Management.Tests.csproj | 2 +-
.../src/System.Net.Http.WinHttpHandler.csproj | 2 +-
.../System.Net.Http.WinHttpHandler.Functional.Tests.csproj | 2 +-
.../System.Net.Http.WinHttpHandler.Unit.Tests.csproj | 2 +-
src/libraries/System.Net.Http/src/System.Net.Http.csproj | 2 +-
.../FunctionalTests/System.Net.Http.Functional.Tests.csproj | 2 +-
.../tests/UnitTests/System.Net.Http.Unit.Tests.csproj | 2 +-
.../src/System.Net.HttpListener.csproj | 2 +-
.../tests/System.Net.HttpListener.Tests.csproj | 2 +-
src/libraries/System.Net.Mail/src/System.Net.Mail.csproj | 2 +-
.../tests/Functional/System.Net.Mail.Functional.Tests.csproj | 2 +-
.../tests/Unit/System.Net.Mail.Unit.Tests.csproj | 2 +-
.../src/System.Net.NameResolution.csproj | 2 +-
.../System.Net.NameResolution.Functional.Tests.csproj | 2 +-
.../tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj | 2 +-
.../src/System.Net.NetworkInformation.csproj | 2 +-
src/libraries/System.Net.Ping/src/System.Net.Ping.csproj | 2 +-
.../FunctionalTests/System.Net.Ping.Functional.Tests.csproj | 2 +-
.../System.Net.Primitives/src/System.Net.Primitives.csproj | 2 +-
.../System.Net.Primitives.Functional.Tests.csproj | 2 +-
.../tests/PalTests/System.Net.Primitives.Pal.Tests.csproj | 2 +-
.../UnitTests/System.Net.Primitives.UnitTests.Tests.csproj | 2 +-
src/libraries/System.Net.Quic/src/System.Net.Quic.csproj | 2 +-
.../FunctionalTests/System.Net.Quic.Functional.Tests.csproj | 2 +-
.../System.Net.Requests/src/System.Net.Requests.csproj | 2 +-
.../System.Net.Security/src/System.Net.Security.csproj | 2 +-
.../tests/FunctionalTests/System.Net.Security.Tests.csproj | 2 +-
.../tests/UnitTests/System.Net.Security.Unit.Tests.csproj | 2 +-
.../System.Net.Sockets/src/System.Net.Sockets.csproj | 2 +-
.../tests/FunctionalTests/System.Net.Sockets.Tests.csproj | 2 +-
.../System.Net.WebSockets/src/System.Net.WebSockets.csproj | 2 +-
.../System.Private.Xml/src/System.Private.Xml.csproj | 2 +-
.../tests/System.Resources.Extensions.Tests.csproj | 2 +-
.../tests/System.Resources.ResourceManager.Tests.csproj | 2 +-
.../System.Runtime.Caching/src/System.Runtime.Caching.csproj | 2 +-
.../tests/System.Runtime.Caching.Tests.csproj | 2 +-
.../tests/System.Runtime.Extensions.Tests.csproj | 2 +-
...em.Runtime.InteropServices.RuntimeInformation.Tests.csproj | 2 +-
.../System.Runtime.InteropServices.Tests.csproj | 2 +-
.../tests/System.Runtime.Intrinsics.Tests.csproj | 2 +-
.../System.Runtime.Serialization.Formatters.Tests.csproj | 2 +-
.../tests/NlsTests/System.Runtime.Nls.Tests.csproj | 2 +-
.../System.Runtime/tests/System.Runtime.Tests.csproj | 2 +-
.../src/System.Security.AccessControl.csproj | 2 +-
.../tests/System.Security.AccessControl.Tests.csproj | 2 +-
.../tests/System.Security.Cryptography.Cng.Tests.csproj | 2 +-
.../tests/System.Security.Cryptography.Csp.Tests.csproj | 2 +-
.../src/System.Security.Cryptography.Pkcs.csproj | 2 +-
.../tests/System.Security.Cryptography.Pkcs.Tests.csproj | 2 +-
.../src/System.Security.Cryptography.ProtectedData.csproj | 2 +-
.../System.Security.Cryptography.ProtectedData.Tests.csproj | 2 +-
...System.Security.Cryptography.X509Certificates.Tests.csproj | 2 +-
.../src/System.Security.Cryptography.csproj | 2 +-
.../tests/System.Security.Cryptography.Tests.csproj | 2 +-
.../tests/System.Security.Permissions.Tests.csproj | 2 +-
.../src/System.Security.Principal.Windows.csproj | 2 +-
.../tests/System.Security.Principal.Windows.Tests.csproj | 2 +-
.../src/System.ServiceProcess.ServiceController.csproj | 2 +-
.../System.ServiceProcess.ServiceController.Tests.csproj | 2 +-
src/libraries/System.Speech/src/System.Speech.csproj | 2 +-
src/libraries/System.Speech/tests/System.Speech.Tests.csproj | 2 +-
.../src/System.Text.Encoding.CodePages.csproj | 2 +-
.../src/System.Threading.AccessControl.csproj | 2 +-
.../tests/System.Threading.AccessControl.Tests.csproj | 2 +-
.../src/System.Transactions.Local.csproj | 2 +-
.../src/System.Windows.Extensions.csproj | 2 +-
.../tests/System.Windows.Extensions.Tests.csproj | 2 +-
134 files changed, 136 insertions(+), 136 deletions(-)
diff --git a/src/runtime/src/libraries/Common/src/DisableRuntimeMarshalling.cs b/src/runtime/src/libraries/Common/src/DisableRuntimeMarshalling.cs
index 9a6bc544e55..10ec1fce44a 100644
--- a/src/runtime/src/libraries/Common/src/DisableRuntimeMarshalling.cs
+++ b/src/runtime/src/libraries/Common/src/DisableRuntimeMarshalling.cs
@@ -2,4 +2,4 @@
// The .NET Foundation licenses this file to you under the MIT license.
// Used to indicate that runtime marshalling should be disabled.
-[assembly: System.Runtime.CompilerServices.DisableRuntimeMarshalling]
+// [assembly: System.Runtime.CompilerServices.DisableRuntimeMarshalling]
diff --git a/src/runtime/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MkDir.cs b/src/runtime/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MkDir.cs
index a6bb1dc3c0f..751e0ac690b 100644
--- a/src/runtime/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MkDir.cs
+++ b/src/runtime/src/libraries/Common/src/Interop/Unix/System.Native/Interop.MkDir.cs
@@ -9,8 +9,8 @@ internal static partial class Interop
{
internal static partial class Sys
{
- [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_MkDir", SetLastError = true)]
- private static partial int MkDir(ref byte path, int mode);
+ [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_MkDir", SetLastError = true)]
+ private static extern int MkDir(ref byte path, int mode);
internal static int MkDir(ReadOnlySpan<char> path, int mode)
{
diff --git a/src/runtime/src/libraries/Common/tests/Common.Tests.csproj b/src/runtime/src/libraries/Common/tests/Common.Tests.csproj
index 72de3a2ba17..16adf14be81 100644
--- a/src/runtime/src/libraries/Common/tests/Common.Tests.csproj
+++ b/src/runtime/src/libraries/Common/tests/Common.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX</TargetFrameworks>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
diff --git a/src/runtime/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/runtime/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
index 19ee3bde1b5..d390a06be81 100644
--- a/src/runtime/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
+++ b/src/runtime/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<NoWarn>$(NoWarn);nullable</NoWarn>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
diff --git a/src/runtime/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/tests/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj b/src/runtime/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/tests/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj
index 93be9b87c96..10117338458 100644
--- a/src/runtime/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/tests/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj
+++ b/src/runtime/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/tests/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <!-- Use "$(NetCoreAppCurrent)-windows" to avoid PlatformNotSupportedExceptions from ServiceController. -->
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)</TargetFrameworks>
+ <!-- Use "" to avoid PlatformNotSupportedExceptions from ServiceController. -->
+ <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj b/src/runtime/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj
index 0743d679b15..8ec495e8345 100644
--- a/src/runtime/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj
+++ b/src/runtime/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<AutoGenerateBindingRedirects Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">true</AutoGenerateBindingRedirects>
diff --git a/src/runtime/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj b/src/runtime/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj
index 6586026447c..c284ea4f48c 100644
--- a/src/runtime/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj
+++ b/src/runtime/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj b/src/runtime/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj
index aa61641a9fa..56ed9a2c927 100644
--- a/src/runtime/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj
+++ b/src/runtime/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="Win32ExceptionTests.cs" />
diff --git a/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj b/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj
index 7f6d66bdba8..168a20a1115 100644
--- a/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj
+++ b/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<IsPackable>true</IsPackable>
<PackageDescription>Provides support for managing access and audit control lists for Microsoft.Win32.RegistryKey.
diff --git a/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj b/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj
index 76442c6fb1f..e92db98f790 100644
--- a/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj
+++ b/src/runtime/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="RegistryAclExtensionsTests.cs" />
diff --git a/src/runtime/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/runtime/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
index 98652656e9c..1972ac8ad18 100644
--- a/src/runtime/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
+++ b/src/runtime/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);REGISTRY_ASSEMBLY</DefineConstants>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<NoWarn>$(NoWarn);CA2249</NoWarn>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
diff --git a/src/runtime/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj b/src/runtime/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
index 1feb97ef841..ae5ad78ce7f 100644
--- a/src/runtime/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
+++ b/src/runtime/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<DefineConstants>$(DefineConstants);REGISTRY_ASSEMBLY</DefineConstants>
- <TargetFramework>$(NetCoreAppCurrent)-windows</TargetFramework>
+ <TargetFramework></TargetFramework>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
index d7e7dc61211..640179e2960 100644
--- a/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
+++ b/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>true</IsPackable>
<PackageDescription>Provides access to Windows system event notifications.
diff --git a/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj b/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj
index 1a8e130bee4..131134daa80 100644
--- a/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj
+++ b/src/runtime/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
diff --git a/src/runtime/src/libraries/System.Console/src/System.Console.csproj b/src/runtime/src/libraries/System.Console/src/System.Console.csproj
index 1c45c5a8f93..880b740def1 100644
--- a/src/runtime/src/libraries/System.Console/src/System.Console.csproj
+++ b/src/runtime/src/libraries/System.Console/src/System.Console.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Console/tests/System.Console.Tests.csproj b/src/runtime/src/libraries/System.Console/tests/System.Console.Tests.csproj
index f4b451d30e1..418f9b30039 100644
--- a/src/runtime/src/libraries/System.Console/tests/System.Console.Tests.csproj
+++ b/src/runtime/src/libraries/System.Console/tests/System.Console.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);</TargetFrameworks>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<StringResourcesPath>..\src\Resources\Strings.resx</StringResourcesPath>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj b/src/runtime/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
index 8fad480d961..6efc49b3004 100644
--- a/src/runtime/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
+++ b/src/runtime/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-FreeBSD;$(NetCoreAppMinimum)-Linux;$(NetCoreAppMinimum)-OSX;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-FreeBSD;$(NetCoreAppMinimum)-Linux;$(NetCoreAppMinimum)-OSX;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>$(NoWarn);CA2249;CA1838;CA1846</NoWarn>
<!-- Suppress CA1845: Use span-based 'string.Concat' and 'AsSpan' instead of 'Substring' to avoid ifdefs. -->
diff --git a/src/runtime/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj b/src/runtime/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj
index 85a15ebe3d2..a8183df7eef 100644
--- a/src/runtime/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj
+++ b/src/runtime/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetFrameworkMinimum)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/runtime/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj
index 1a1756a85ad..0fa7a416a0f 100644
--- a/src/runtime/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj
+++ b/src/runtime/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- Suppress CA2249: Consider using String.Contains instead of String.IndexOf to avoid ifdefs. -->
<NoWarn>$(NoWarn);CA2249</NoWarn>
diff --git a/src/runtime/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj b/src/runtime/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj
index 6f72486a944..66d1f92904e 100644
--- a/src/runtime/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj
+++ b/src/runtime/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="Helpers.cs" />
diff --git a/src/runtime/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/runtime/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
index 601c003fc30..6c22aac1e01 100644
--- a/src/runtime/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
+++ b/src/runtime/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<RootNamespace>System.Diagnostics.Tests</RootNamespace>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix</TargetFrameworks>
<TestRuntime>true</TestRuntime>
<!-- Some tests need types like System.Diagnostics.DebugProvider which are only exposed from System.Private.CoreLib -->
<CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies>
diff --git a/src/runtime/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj b/src/runtime/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
index dfae87cc90a..affb0753616 100644
--- a/src/runtime/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
+++ b/src/runtime/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>$(NoWarn);CA1847</NoWarn>
<!-- Suppressions to avoid ifdefs:
diff --git a/src/runtime/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj b/src/runtime/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj
index 39089edfa7b..c1bf6f6e03d 100644
--- a/src/runtime/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj
+++ b/src/runtime/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj b/src/runtime/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
index 183b62c5283..69b2406d13a 100644
--- a/src/runtime/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
+++ b/src/runtime/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj b/src/runtime/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj
index d052ccaa0b6..3563132cda3 100644
--- a/src/runtime/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj
+++ b/src/runtime/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
diff --git a/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
index a0dbb8e208b..4ae893f4765 100644
--- a/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
+++ b/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>$(NoWarn);CA1847</NoWarn>
<Nullable>annotations</Nullable>
diff --git a/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj b/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj
index 2146bf437cb..dd3dfeb4ae4 100644
--- a/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj
+++ b/src/runtime/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="PerformanceCounterTests.cs" />
diff --git a/src/runtime/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/runtime/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
index 2c273820afb..c158c49ec2e 100644
--- a/src/runtime/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
+++ b/src/runtime/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<DefineConstants>$(DefineConstants);FEATURE_REGISTRY</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj b/src/runtime/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
index e23bb4a94a7..bfa37a8f919 100644
--- a/src/runtime/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
+++ b/src/runtime/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj b/src/runtime/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj
index 35b1a833abb..18c323c28ae 100644
--- a/src/runtime/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj
+++ b/src/runtime/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<TestRuntime>true</TestRuntime>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
index 8152e3c7f05..be32f5d3b5d 100644
--- a/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
+++ b/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
<NoWarn>$(NoWarn);CA2249</NoWarn>
diff --git a/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj b/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj
index 0bb24c8eadd..6155cac4498 100644
--- a/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj
+++ b/src/runtime/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;net48</TargetFrameworks>
+ <TargetFrameworks>net48</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="PrincipalContextTests.cs" />
diff --git a/src/runtime/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj b/src/runtime/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
index 56862519355..3e11d02035a 100644
--- a/src/runtime/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
+++ b/src/runtime/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-OSX;$(NetCoreAppMinimum)-Linux;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-OSX;$(NetCoreAppMinimum)-Linux;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
<IsPackable>true</IsPackable>
diff --git a/src/runtime/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj b/src/runtime/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj
index 9a78a3acd54..632de15c235 100644
--- a/src/runtime/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj
+++ b/src/runtime/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;net48</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;net48</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="BerConverterTests.cs" />
diff --git a/src/runtime/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/runtime/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
index 83a118e940d..7b045dc3c0b 100644
--- a/src/runtime/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
+++ b/src/runtime/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
<!-- Suppressions to avoid ifdefs:
diff --git a/src/runtime/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj b/src/runtime/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj
index 37e3b348cb5..e2df9a9918e 100644
--- a/src/runtime/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj
+++ b/src/runtime/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<!-- SYSLIB0003: CAS is obsolete, but we still have tests referencing it -->
<NoWarn>$(NoWarn);SYSLIB0003</NoWarn>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;net48</TargetFrameworks>
+ <TargetFrameworks>net48</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="System\DirectoryServices\ActiveDirectorySecurityTests.cs" />
diff --git a/src/runtime/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/runtime/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
index df9c7ef864a..9cf9a016204 100644
--- a/src/runtime/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
+++ b/src/runtime/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<DefineConstants>$(DefineConstants);DRAWING_NAMESPACE</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<WarningsNotAsErrors>CS0618</WarningsNotAsErrors>
diff --git a/src/runtime/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj b/src/runtime/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj
index 33f175f1456..0b14a790777 100644
--- a/src/runtime/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj
+++ b/src/runtime/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;net48</TargetFrameworks>
+ <TargetFrameworks>net48</TargetFrameworks>
<IgnoreForCI Condition="'$(TargetsMobile)' == 'true'">true</IgnoreForCI>
</PropertyGroup>
<ItemGroup>
diff --git a/src/runtime/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj b/src/runtime/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
index 697be7783e2..2efcb61d950 100644
--- a/src/runtime/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
+++ b/src/runtime/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<RootNamespace>System.Drawing</RootNamespace>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Formats.Tar/src/System.Formats.Tar.csproj b/src/runtime/src/libraries/System.Formats.Tar/src/System.Formats.Tar.csproj
index 33a9aa8c1dc..ea69b03b8a8 100644
--- a/src/runtime/src/libraries/System.Formats.Tar/src/System.Formats.Tar.csproj
+++ b/src/runtime/src/libraries/System.Formats.Tar/src/System.Formats.Tar.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Formats.Tar/tests/System.Formats.Tar.Tests.csproj b/src/runtime/src/libraries/System.Formats.Tar/tests/System.Formats.Tar.Tests.csproj
index ca1b4d99e50..d4475c8781f 100644
--- a/src/runtime/src/libraries/System.Formats.Tar/tests/System.Formats.Tar.Tests.csproj
+++ b/src/runtime/src/libraries/System.Formats.Tar/tests/System.Formats.Tar.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<StringResourcesPath>$(LibrariesProjectRoot)/Common/tests/Resources/Strings.resx</StringResourcesPath>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
diff --git a/src/runtime/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj b/src/runtime/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj
index 61a409ffedc..38f61fb9197 100644
--- a/src/runtime/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj
+++ b/src/runtime/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>$(NetCoreAppCurrent)-windows</TargetFramework>
+ <TargetFramework></TargetFramework>
<TestRuntime>true</TestRuntime>
</PropertyGroup>
<ItemGroup>
diff --git a/src/runtime/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj b/src/runtime/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj
index a9aeef49807..0284070ad05 100644
--- a/src/runtime/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj
+++ b/src/runtime/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj
@@ -4,7 +4,7 @@
<TestRuntime>true</TestRuntime>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<!-- This test project is Windows only as it forces the use of NLS as the Globlaization platform -->
- <TargetFramework>$(NetCoreAppCurrent)-windows</TargetFramework>
+ <TargetFramework></TargetFramework>
<UnicodeUcdVersion>14.0</UnicodeUcdVersion>
</PropertyGroup>
<ItemGroup>
diff --git a/src/runtime/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/runtime/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
index ced12496d65..d67e262836b 100644
--- a/src/runtime/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
+++ b/src/runtime/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj b/src/runtime/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj
index 709f655902d..607c50be625 100644
--- a/src/runtime/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj
+++ b/src/runtime/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj b/src/runtime/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj
index 94999191663..f8506c2adbc 100644
--- a/src/runtime/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj
+++ b/src/runtime/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="System\IO\Compression\ZipFile.Create.cs" />
diff --git a/src/runtime/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj b/src/runtime/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj
index 29c88cb2f9c..b049a0f3caa 100644
--- a/src/runtime/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj
+++ b/src/runtime/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj
@@ -3,7 +3,7 @@
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
diff --git a/src/runtime/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj b/src/runtime/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
index 80007bcfe5f..ee0bf21ccfc 100644
--- a/src/runtime/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
+++ b/src/runtime/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/runtime/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
index 229119e3aa3..2fcad878c05 100644
--- a/src/runtime/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
+++ b/src/runtime/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj
index 494ef1959db..08ddf1c7dd9 100644
--- a/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj
+++ b/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj b/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj
index c42a680fa2f..fe12ddd7911 100644
--- a/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj
+++ b/src/runtime/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>$(NetCoreAppCurrent)-windows</TargetFramework>
+ <TargetFramework></TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="DirectoryObjectSecurityTests.cs" />
diff --git a/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj b/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
index 61225e58e8a..90c69fee153 100644
--- a/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
+++ b/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="System\IO\DriveInfo.cs" />
diff --git a/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj b/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
index 00d1afd3c94..8071e492986 100644
--- a/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
+++ b/src/runtime/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="DriveInfo.Unix.Tests.cs" Condition="'$(TargetPlatformIdentifier)' == 'Unix' or '$(TargetPlatformIdentifier)' == 'Browser'" />
diff --git a/src/runtime/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj b/src/runtime/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
index 469005b661d..7edcd52db0c 100644
--- a/src/runtime/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
+++ b/src/runtime/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj b/src/runtime/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
index 1246c914ab8..a83fbe23499 100644
--- a/src/runtime/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
+++ b/src/runtime/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-FreeBSD</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-FreeBSD</TargetFrameworks>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOSSimulator' or '$(TargetOS)' == 'tvOS'">true</IgnoreForCI>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/runtime/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
index e386671171d..746e218cc24 100644
--- a/src/runtime/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
+++ b/src/runtime/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<WasmXHarnessMonoArgs>--working-dir=/test-dir</WasmXHarnessMonoArgs>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
diff --git a/src/runtime/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/runtime/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
index 2309a8c007a..b16deb25f25 100644
--- a/src/runtime/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
+++ b/src/runtime/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj b/src/runtime/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj
index 0410513c46c..1f4b92f6418 100644
--- a/src/runtime/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj
+++ b/src/runtime/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android</TargetFrameworks>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
</PropertyGroup>
<ItemGroup>
diff --git a/src/runtime/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/runtime/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
index 9be9a376620..56ed27283ac 100644
--- a/src/runtime/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
+++ b/src/runtime/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj b/src/runtime/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
index ef44754372e..4525b0aa830 100644
--- a/src/runtime/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
+++ b/src/runtime/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
diff --git a/src/runtime/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj b/src/runtime/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj
index 3dd3c8a455b..82091dc68d0 100644
--- a/src/runtime/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj
+++ b/src/runtime/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
diff --git a/src/runtime/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj b/src/runtime/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj
index 386250a4320..e0e4eab4e8e 100644
--- a/src/runtime/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj
+++ b/src/runtime/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>$(NetCoreAppCurrent)-windows</TargetFramework>
+ <TargetFramework></TargetFramework>
</PropertyGroup>
<ItemGroup>
<AssembliesBeingTested Include="System.IO.Pipes" />
diff --git a/src/runtime/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/runtime/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
index b0956d6ba7b..77585616ea3 100644
--- a/src/runtime/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
+++ b/src/runtime/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/src/runtime/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
index 8f31d5dd604..2e6ae7616ea 100644
--- a/src/runtime/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
+++ b/src/runtime/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj b/src/runtime/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
index c341d6c3ba6..3173e525799 100644
--- a/src/runtime/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
+++ b/src/runtime/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-Unix;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-Unix;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);SERIAL_PORTS</DefineConstants>
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
diff --git a/src/runtime/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj b/src/runtime/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj
index 9a1592778a7..b71f36bc2f1 100644
--- a/src/runtime/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj
+++ b/src/runtime/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetFrameworkMinimum)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
diff --git a/src/runtime/src/libraries/System.Management/src/System.Management.csproj b/src/runtime/src/libraries/System.Management/src/System.Management.csproj
index 5b66be0b573..1352df29995 100644
--- a/src/runtime/src/libraries/System.Management/src/System.Management.csproj
+++ b/src/runtime/src/libraries/System.Management/src/System.Management.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>$(NoWarn);0618</NoWarn>
<!-- Suppressins to avoid ifdefs:
diff --git a/src/runtime/src/libraries/System.Management/tests/System.Management.Tests.csproj b/src/runtime/src/libraries/System.Management/tests/System.Management.Tests.csproj
index 4c6f19a2478..34e6513228a 100644
--- a/src/runtime/src/libraries/System.Management/tests/System.Management.Tests.csproj
+++ b/src/runtime/src/libraries/System.Management/tests/System.Management.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;net48</TargetFrameworks>
+ <TargetFrameworks>net48</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="MofHelpers\MofCollection.cs" />
diff --git a/src/runtime/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/src/runtime/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj
index 71ca94e7e2c..530f1047308 100644
--- a/src/runtime/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj
+++ b/src/runtime/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>true</IsPackable>
diff --git a/src/runtime/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj b/src/runtime/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj
index 93d7e9a899d..e93ade003d5 100644
--- a/src/runtime/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;net48</TargetFrameworks>
+ <TargetFrameworks>net48</TargetFrameworks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<DefineConstants>$(DefineConstants);WINHTTPHANDLER_TEST</DefineConstants>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/runtime/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
index 739f32dc9b1..5ccc2f520c2 100644
--- a/src/runtime/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
@@ -3,7 +3,7 @@
<NoWarn>$(NoWarn);0436</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
- <TargetFramework>$(NetCoreAppCurrent)-windows</TargetFramework>
+ <TargetFramework></TargetFramework>
<DefineConstants>UNITTEST</DefineConstants>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/runtime/src/libraries/System.Net.Http/src/System.Net.Http.csproj
index 0f1758689cd..ad7a6394930 100644
--- a/src/runtime/src/libraries/System.Net.Http/src/System.Net.Http.csproj
+++ b/src/runtime/src/libraries/System.Net.Http/src/System.Net.Http.csproj
@@ -3,7 +3,7 @@
<WindowsRID>win</WindowsRID>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);HTTP_DLL</DefineConstants>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)</TargetFrameworks>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
diff --git a/src/runtime/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/runtime/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
index b5a0ebaa389..45c62a15a8b 100644
--- a/src/runtime/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
@@ -4,7 +4,7 @@
<DefineConstants>$(DefineConstants);SYSNETHTTP_NO_OPENSSL;HTTP3</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX</TargetFrameworks>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
<!-- the res/xml/network_security_config.xml file comes from the System.Net.TestData package -->
diff --git a/src/runtime/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/runtime/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
index 85139c5391f..f2f2c2e5696 100644
--- a/src/runtime/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
@@ -3,7 +3,7 @@
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android</TargetFrameworks>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
diff --git a/src/runtime/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/runtime/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
index b0e790da1d6..46e75182fae 100644
--- a/src/runtime/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
+++ b/src/runtime/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ForceManagedImplementation>false</ForceManagedImplementation>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
<EnableAOTAnalyzer>true</EnableAOTAnalyzer>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
diff --git a/src/runtime/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj b/src/runtime/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj
index ff51965c789..d5f4d3637ca 100644
--- a/src/runtime/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<StringResourcesPath>../src/Resources/Strings.resx</StringResourcesPath>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX</TargetFrameworks>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
</PropertyGroup>
<ItemGroup>
diff --git a/src/runtime/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj b/src/runtime/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
index 5d2ce4cc280..323c647d2d6 100644
--- a/src/runtime/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
+++ b/src/runtime/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj b/src/runtime/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj
index 4a7b913a457..f81cc0576f9 100644
--- a/src/runtime/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-Android</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-Android</TargetFrameworks>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
diff --git a/src/runtime/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj b/src/runtime/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
index 0fbb5d7c497..b466e0b9d96 100644
--- a/src/runtime/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
diff --git a/src/runtime/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/runtime/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
index 6d7ee08de0b..76e1a178242 100644
--- a/src/runtime/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
+++ b/src/runtime/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj b/src/runtime/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj
index f4588a2b4a1..a21ef6a5d18 100644
--- a/src/runtime/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
<EventSourceSupport Condition="'$(TestNativeAot)' == 'true'">true</EventSourceSupport>
diff --git a/src/runtime/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/runtime/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
index 2edc2e3601c..75c119af62a 100644
--- a/src/runtime/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/runtime/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
index d36ad67504e..8b240730a52 100644
--- a/src/runtime/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
+++ b/src/runtime/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj b/src/runtime/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
index 71b5d783c45..167b0a2c5f5 100644
--- a/src/runtime/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
+++ b/src/runtime/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj b/src/runtime/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
index 0a068b65b72..5ccac35d05f 100644
--- a/src/runtime/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
diff --git a/src/runtime/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/runtime/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
index 84a5864cac9..3567f4a6ea7 100644
--- a/src/runtime/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
+++ b/src/runtime/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ILLinkKeepDepAttributes>false</ILLinkKeepDepAttributes> <!-- See comments in Cookie.cs -->
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
<!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the
System.Net.Internals namespace. -->
<DefineConstants>$(DefineConstants);SYSTEM_NET_PRIMITIVES_DLL</DefineConstants>
diff --git a/src/runtime/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj b/src/runtime/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj
index 4e2e897b0a6..7a48043aad5 100644
--- a/src/runtime/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<EventSourceSupport>true</EventSourceSupport>
</PropertyGroup>
<ItemGroup>
diff --git a/src/runtime/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/runtime/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
index 2fb034467dc..633181e4b58 100644
--- a/src/runtime/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/runtime/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
index 8cc3d0ff90f..098b0d7460a 100644
--- a/src/runtime/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
@@ -3,7 +3,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>169,649</NoWarn>
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj b/src/runtime/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
index 257af8dbb88..6f118e0bf88 100644
--- a/src/runtime/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/runtime/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)</TargetFrameworks>
<EnableAOTAnalyzer>true</EnableAOTAnalyzer>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
diff --git a/src/runtime/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj b/src/runtime/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj
index 62b1be2da62..45b87e1dddb 100644
--- a/src/runtime/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix</TargetFrameworks>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
</PropertyGroup>
<ItemGroup>
diff --git a/src/runtime/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj b/src/runtime/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
index d16970c9a19..6a5034037a3 100644
--- a/src/runtime/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
+++ b/src/runtime/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
<!-- SYSLIB0014: WebRequest, HttpWebRequest, ServicePoint, and WebClient are obsolete. Use HttpClient instead. -->
<NoWarn>$(NoWarn);SYSLIB0014</NoWarn>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Net.Security/src/System.Net.Security.csproj b/src/runtime/src/libraries/System.Net.Security/src/System.Net.Security.csproj
index e030690763e..ad96b0fb669 100644
--- a/src/runtime/src/libraries/System.Net.Security/src/System.Net.Security.csproj
+++ b/src/runtime/src/libraries/System.Net.Security/src/System.Net.Security.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)</TargetFrameworks>
<!-- This is needed so that code for TlsCipherSuite will have no namespace (causes compile errors) when used within T4 template -->
<DefineConstants>$(DefineConstants);PRODUCT</DefineConstants>
<EnableAOTAnalyzer>true</EnableAOTAnalyzer>
diff --git a/src/runtime/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/runtime/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
index 7c3d432f34c..7fd430a9220 100644
--- a/src/runtime/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS</TargetFrameworks>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<!-- the res/xml/network_security_config.xml file comes from the System.Net.TestData package -->
diff --git a/src/runtime/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/src/runtime/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
index 1dd366e72a0..6a184f9d405 100644
--- a/src/runtime/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
@@ -10,7 +10,7 @@
<NoWarn>436</NoWarn>
<!-- Disable: CLSCompliant attribute is not needed -->
<NoWarn>$(NoWarn);3021</NoWarn>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-Android</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-Android</TargetFrameworks>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<!--Remove once this is fixed, https://github.com/dotnet/runtime/issues/71506 -->
diff --git a/src/runtime/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/runtime/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
index 61f9c6fa2d4..2674e098d82 100644
--- a/src/runtime/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
+++ b/src/runtime/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
index 884db1eea54..86517b47af6 100644
--- a/src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
+++ b/src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
<EventSourceSupport Condition="'$(TestNativeAot)' == 'true'">true</EventSourceSupport>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj b/src/runtime/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj
index c0c4ded0d33..b361cc90d32 100644
--- a/src/runtime/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj
+++ b/src/runtime/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj b/src/runtime/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj
index 405e6375a9f..2a5bd1faacb 100644
--- a/src/runtime/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj
+++ b/src/runtime/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<RootNamespace>System.Xml</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj b/src/runtime/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
index ad289dc6319..2485635439b 100644
--- a/src/runtime/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
+++ b/src/runtime/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetFrameworkMinimum)</TargetFrameworks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
</PropertyGroup>
<ItemGroup>
diff --git a/src/runtime/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj b/src/runtime/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
index 66cb937a3d1..12e027437bd 100644
--- a/src/runtime/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
+++ b/src/runtime/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
@@ -4,7 +4,7 @@
<BinPlaceSatelliteAssemblies>true</BinPlaceSatelliteAssemblies>
<TestRuntime>true</TestRuntime>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="MissingManifestResourceExceptionTests.cs" />
diff --git a/src/runtime/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj b/src/runtime/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj
index 869129ba71f..41a41f7bebb 100644
--- a/src/runtime/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj
+++ b/src/runtime/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Nullable>Annotations</Nullable>
<IsPackable>true</IsPackable>
diff --git a/src/runtime/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj b/src/runtime/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj
index 8f08caf9b46..ee8e300954a 100644
--- a/src/runtime/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj
+++ b/src/runtime/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows;net48</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net48</TargetFrameworks>
<EventSourceSupport>true</EventSourceSupport>
</PropertyGroup>
<ItemGroup>
diff --git a/src/runtime/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/runtime/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
index 3e3e2937781..85074f9fba2 100644
--- a/src/runtime/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
+++ b/src/runtime/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
@@ -4,7 +4,7 @@
<TestRuntime>true</TestRuntime>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj b/src/runtime/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj
index 3edd7d47f72..db7a23c27c5 100644
--- a/src/runtime/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj
+++ b/src/runtime/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="CheckArchitectureTests.cs" />
diff --git a/src/runtime/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System.Runtime.InteropServices.Tests.csproj b/src/runtime/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System.Runtime.InteropServices.Tests.csproj
index 34964fb33f2..1a78852a17b 100644
--- a/src/runtime/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System.Runtime.InteropServices.Tests.csproj
+++ b/src/runtime/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System.Runtime.InteropServices.Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<TestRuntime>true</TestRuntime>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Runtime.Intrinsics/tests/System.Runtime.Intrinsics.Tests.csproj b/src/runtime/src/libraries/System.Runtime.Intrinsics/tests/System.Runtime.Intrinsics.Tests.csproj
index 6c0187cf21f..fef12aa096c 100644
--- a/src/runtime/src/libraries/System.Runtime.Intrinsics/tests/System.Runtime.Intrinsics.Tests.csproj
+++ b/src/runtime/src/libraries/System.Runtime.Intrinsics/tests/System.Runtime.Intrinsics.Tests.csproj
@@ -4,7 +4,7 @@
<NoWarn>$(NoWarn),1718,SYSLIB0013</NoWarn>
<TestRuntime>true</TestRuntime>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<!-- Disable nullability public only feature for NullabilityInfoContextTests -->
<Features>$(Features.Replace('nullablePublicOnly', '')</Features>
diff --git a/src/runtime/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj b/src/runtime/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
index 378b38abb93..971c431ca2e 100644
--- a/src/runtime/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
+++ b/src/runtime/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<TestRuntime>true</TestRuntime>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;net48</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;net48</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="BinaryFormatterTestData.cs" />
diff --git a/src/runtime/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj b/src/runtime/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj
index 849edc8cd5c..2deaa7914ef 100644
--- a/src/runtime/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj
+++ b/src/runtime/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj
@@ -3,7 +3,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TestRuntime>true</TestRuntime>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFramework>$(NetCoreAppCurrent)-windows</TargetFramework>
+ <TargetFramework></TargetFramework>
<NoWarn>$(NoWarn),SYSLIB0013</NoWarn>
</PropertyGroup>
<ItemGroup>
diff --git a/src/runtime/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj b/src/runtime/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
index fc6859854dc..260dafbd372 100644
--- a/src/runtime/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
+++ b/src/runtime/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>$(NoWarn),1718,SYSLIB0013</NoWarn>
<TestRuntime>true</TestRuntime>
diff --git a/src/runtime/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/runtime/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
index 35fabc2416c..a461103be90 100644
--- a/src/runtime/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
+++ b/src/runtime/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj b/src/runtime/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj
index 05fd95a165f..f0c167ed082 100644
--- a/src/runtime/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj
+++ b/src/runtime/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>$(NetCoreAppCurrent)-windows</TargetFramework>
+ <TargetFramework></TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="Ace\Ace.Common.Tests.cs" />
diff --git a/src/runtime/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj b/src/runtime/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
index 4bfc1719abf..cc312cffe4e 100644
--- a/src/runtime/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
+++ b/src/runtime/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<DefineConstants>$(DefineConstants);TESTING_CNG_IMPLEMENTATION</DefineConstants>
- <TargetFramework>$(NetCoreAppCurrent)-windows</TargetFramework>
+ <TargetFramework></TargetFramework>
</PropertyGroup>
<ItemGroup>
<RdXmlFile Include="default.rd.xml" />
diff --git a/src/runtime/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj b/src/runtime/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
index 59d139c7749..a8e94e72847 100644
--- a/src/runtime/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
+++ b/src/runtime/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<!-- SYSLIB0021: Derived cryptographic types are obsolete -->
<NoWarn>$(NoWarn);SYSLIB0021</NoWarn>
<!--Remove once this is fixed, https://github.com/dotnet/runtime/issues/71506 -->
diff --git a/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
index be33237e616..426ddb38e27 100644
--- a/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
+++ b/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
<NoWarn>$(NoWarn);CA5384</NoWarn>
diff --git a/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj b/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj
index 8523c0d8296..2045f05a28e 100644
--- a/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj
+++ b/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);net48</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net48</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs"
diff --git a/src/runtime/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/runtime/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
index a284d8edf47..cefeb84c128 100644
--- a/src/runtime/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
+++ b/src/runtime/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
@@ -4,7 +4,7 @@
<DefineConstants>$(DefineConstants);HAVE_THUMBPRINT_OVERLOADS</DefineConstants>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<NoWarn>$(NoWarn);SYSLIB0026;SYSLIB0027;SYSLIB0028</NoWarn>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS</TargetFrameworks>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
diff --git a/src/runtime/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj b/src/runtime/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj
index cf25738f6e7..29d0f0734cb 100644
--- a/src/runtime/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj
+++ b/src/runtime/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);INTERNAL_ASYMMETRIC_IMPLEMENTATIONS</DefineConstants>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)</TargetFrameworks>
<NoWarn>$(NoWarn);CA5350;CA5351;CA5379;CA5384;SYSLIB0026</NoWarn>
<!-- PasswordDeriveBytes.GetBytes is obsolete but DeriveBytes.GetBytes intentionally isn't. -->
<NoWarn>$(NoWarn);CS0809</NoWarn>
diff --git a/src/runtime/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj b/src/runtime/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj
index 50e110c0445..b32809447d3 100644
--- a/src/runtime/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj
+++ b/src/runtime/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>$(NoWarn);SYSLIB0021</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/runtime/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj b/src/runtime/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj
index 73f50b209fb..7205c2e239a 100644
--- a/src/runtime/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj
+++ b/src/runtime/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>$(NetCoreAppCurrent)-windows</TargetFramework>
+ <TargetFramework></TargetFramework>
<!-- SYSLIB0003 is the obsoletion of CAS, but we still have unit tests for it -->
<NoWarn>$(NoWarn);SYSLIB0003</NoWarn>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/runtime/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
index a67d4af63eb..9fef2993b07 100644
--- a/src/runtime/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
+++ b/src/runtime/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
diff --git a/src/runtime/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj b/src/runtime/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj
index e9caf5fa463..43e03119cb3 100644
--- a/src/runtime/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj
+++ b/src/runtime/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFramework>$(NetCoreAppCurrent)-windows</TargetFramework>
+ <TargetFramework></TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="NTAccount.cs" />
diff --git a/src/runtime/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/runtime/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj
index 518c800ae01..2b465d475b0 100644
--- a/src/runtime/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj
+++ b/src/runtime/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>$(NoWarn);CA2249</NoWarn>
<IsPackable>true</IsPackable>
diff --git a/src/runtime/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj b/src/runtime/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj
index 1039fad47f4..99412bc09b8 100644
--- a/src/runtime/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj
+++ b/src/runtime/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="ServiceBaseTests.cs" />
diff --git a/src/runtime/src/libraries/System.Speech/src/System.Speech.csproj b/src/runtime/src/libraries/System.Speech/src/System.Speech.csproj
index 22506f7bf96..9c53e796bd8 100644
--- a/src/runtime/src/libraries/System.Speech/src/System.Speech.csproj
+++ b/src/runtime/src/libraries/System.Speech/src/System.Speech.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- CS0649: uninitialized interop type fields -->
<!-- SA1129: https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3277 -->
diff --git a/src/runtime/src/libraries/System.Speech/tests/System.Speech.Tests.csproj b/src/runtime/src/libraries/System.Speech/tests/System.Speech.Tests.csproj
index 9139d0d2392..d81ff8a7ca1 100644
--- a/src/runtime/src/libraries/System.Speech/tests/System.Speech.Tests.csproj
+++ b/src/runtime/src/libraries/System.Speech/tests/System.Speech.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>$(NetCoreAppCurrent)-windows</TargetFramework>
+ <TargetFramework></TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="SpeechRecognizerTests.cs" />
diff --git a/src/runtime/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/runtime/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
index 8883abba36b..c7ff6be8fec 100644
--- a/src/runtime/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
+++ b/src/runtime/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<IsPackable>true</IsPackable>
diff --git a/src/runtime/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/runtime/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj
index 54c8e0bad5f..c9c91e64692 100644
--- a/src/runtime/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj
+++ b/src/runtime/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>true</IsPackable>
<PackageDescription>Provides support for managing access and audit control lists for synchronization primitives.
diff --git a/src/runtime/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj b/src/runtime/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj
index 3b9e105954d..14949ff735b 100644
--- a/src/runtime/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj
+++ b/src/runtime/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.Constants.cs"
diff --git a/src/runtime/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj b/src/runtime/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj
index ff37cf621bb..43162c45890 100644
--- a/src/runtime/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj
+++ b/src/runtime/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<NoWarn>CA1805;IDE0059;CS1591</NoWarn>
<TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier>
</PropertyGroup>
diff --git a/src/runtime/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj b/src/runtime/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj
index ee9cb23d69e..741c633215b 100644
--- a/src/runtime/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj
+++ b/src/runtime/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>true</IsPackable>
<PackageDescription>Provides miscellaneous Windows-specific types
diff --git a/src/runtime/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj b/src/runtime/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj
index e7b45293318..089fe0ef33f 100644
--- a/src/runtime/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj
+++ b/src/runtime/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>$(NetCoreAppCurrent)-windows</TargetFramework>
+ <TargetFramework></TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="X509Certificate2UITests.cs" />
--
2.36.3
Reference in a new issue Copy permalink