diff --git a/Directory.Build.props b/Directory.Build.props
index 43f9b20cd145fc..c9024609663cbd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -31,6 +31,7 @@
$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'docs'))
$([MSBuild]::NormalizeDirectory('$(DocsDir)', 'installer', 'manpages'))
+ $([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))
diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
index c07fc5dee78c3a..960a617f839bec 100644
--- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -125,9 +125,6 @@
$(MSBuildThisFileDirectory)Common
$(MSBuildThisFileDirectory)src
-
- $(MSBuildThisFileDirectory)shared
- $(RepoRoot)src\libraries\System.Private.CoreLib\src
@@ -292,11 +289,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -391,7 +388,7 @@
-
+
@@ -416,7 +413,7 @@
-
+
true
@@ -449,7 +446,7 @@
- $(SharedBclSourcesRoot)\CodeAnalysis.ruleset
+ $(CoreLibSharedDir)CodeAnalysis.ruleset
diff --git a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets b/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets
index b467e3f18ab54e..33d863469cb4ea 100644
--- a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets
+++ b/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets
@@ -125,7 +125,7 @@
<_runtimeDirectory>$(CoreCLROverridePath)
<_crossgenPath>$(CoreCLROverridePath)/crossgen$(ApplicationFileExtension)
- <_coreLibDirectory>$(CoreCLROverridePath)
+ <_CoreLibSharedDirectory>$(CoreCLROverridePath)
<_jitPath>$(CoreClrOverridePath)/$(_crossHostArch)/$(LibraryFilePrefix)clrjit$(LibraryFileExtension)
diff --git a/src/libraries/Common/tests/Common.Tests.csproj b/src/libraries/Common/tests/Common.Tests.csproj
index 6704a056583163..6bbc7094561d54 100644
--- a/src/libraries/Common/tests/Common.Tests.csproj
+++ b/src/libraries/Common/tests/Common.Tests.csproj
@@ -99,13 +99,13 @@
Common\System\Text\SimpleRegex.cs
-
+
System\Text\ValueStringBuilder.cs
Common\System\Security\IdentityHelper.cs
-
+
System\PasteArguments.cs
@@ -139,47 +139,47 @@
-
+
System\Threading\Tasks\TaskToApm.cs
-
+
System\IO\PathInternal.cs
-
+
System\IO\PathInternal.Windows.cs
Common\Interop\Windows\Interop.Libraries.cs
-
+
Common\Interop\Windows\kernel32\Interop.FormatMessage.cs
Common\Interop\Windows\Interop.Errors.cs
-
+
System\IO\Win32Marshal.cs
-
+
System\PasteArguments.Windows.cs
-
+
System\IO\PathInternal.Unix.cs
-
+
Common\Interop\Unix\Interop.PathConf.cs
Common\Interop\Unix\Interop.Libraries.cs
-
+
System\PasteArguments.Unix.cs
diff --git a/src/libraries/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj b/src/libraries/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj
index 8cc762a386967a..1906572e23c71c 100644
--- a/src/libraries/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj
+++ b/src/libraries/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj
@@ -32,7 +32,7 @@
-
+
Common\Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs
@@ -47,7 +47,7 @@
Common\Interop\Windows\Interop.Libraries.cs
-
+
Interop\Windows\Kernel32\Interop.CloseHandle.cs
@@ -59,7 +59,7 @@
Common\Interop\Windows\Advapi32\Interop.TOKEN_ELEVATION.cs
-
+
Interop\Windows\Interop.BOOL.cs
@@ -68,7 +68,7 @@
Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs
-
+
Common\Interop\Unix\Interop.GetEUid.cs
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 3182cab6f50a7f..1ae2eb0fdb748b 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -260,9 +260,6 @@
$(LibrariesProjectRoot)Common\src
$(LibrariesProjectRoot)Common\tests
-
- $([MSBuild]::NormalizeDirectory('$(CommonPath)', 'CoreLib'))
- $([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))
@@ -368,7 +365,7 @@
false
- $(MSBuildThisFileDirectory)Common\src\CoreLib\CodeAnalysis.ruleset
+ $(CoreLibSharedDir)CodeAnalysis.ruleset
false
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 6a107b0cbaba23..26eb539d668a35 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -15,7 +15,7 @@
$(DefineConstants),INTERNAL_NULLABLE_ATTRIBUTES
-
+
diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
index 5ca350f3aa47ce..b957f56951a119 100644
--- a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
+++ b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
@@ -157,7 +157,7 @@
-
+
Common\System\Collections\HashHelpers.cs
diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj
index b005c4333be9fb..6a6dfc43ab6e8f 100644
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj
@@ -12,21 +12,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj b/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
index d4a31f48132d0c..239aa916d0e397 100644
--- a/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
+++ b/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
@@ -33,38 +33,38 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj b/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj
index 018b31e3230cbc..66e986ce15c09f 100644
--- a/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj
+++ b/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj
@@ -11,7 +11,7 @@
Common\Interop\Windows\Interop.Libraries.cs
-
+
Common\Interop\Windows\Interop.FormatMessage.cs
@@ -21,7 +21,7 @@
Common\Interop\Unix\Interop.Libraries.cs
-
+
Interop\Unix\Interop.Errors.cs
diff --git a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
index 33a855542d8f3f..834961b325ca1c 100644
--- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
+++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
@@ -9,10 +9,10 @@
net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Unix-Debug;netstandard2.0-Unix-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release
-
+
Interop\Windows\Advapi32\Interop.RegistryConstants.cs
-
+
Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs
@@ -33,53 +33,53 @@
Common\Interop\Windows\Interop.Errors.cs
-
+
Interop\Windows\Interop.FormatMessage.cs
-
+
Interop\Windows\Interop.RegCloseKey.cs
Common\Interop\Windows\Interop.RegConnectRegistry.cs
-
+
Interop\Windows\Interop.RegCreateKeyEx.cs
-
+
Interop\Windows\Interop.RegDeleteKeyEx.cs
-
+
Interop\Windows\Interop.RegDeleteValue.cs
-
+
Interop\Windows\Interop.RegEnumKeyEx.cs
-
+
Interop\Windows\Interop.RegEnumValue.cs
-
+
Interop\Windows\Interop.RegFlushKey.cs
-
+
Interop\Windows\Interop.RegOpenKeyEx.cs
-
+
Interop\Windows\Interop.RegQueryInfoKey.cs
-
+
Interop\Windows\Interop.RegQueryValueEx.cs
-
+
Interop\Windows\Interop.RegSetValueEx.cs
-
+
Interop\Windows\Interop.BOOL.cs
-
+
Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs
-
+
Microsoft\Win32\SafeHandles\SafeRegistryHandle.Windows.cs
diff --git a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
index 27e3942363014d..92bcc85234481d 100644
--- a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
+++ b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
@@ -7,7 +7,7 @@
Common\Interop\Windows\Interop.Libraries.cs
-
+
Interop\Windows\Interop.RegSetValueEx.cs
diff --git a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
index d3860625490cec..558f46e5f74cc3 100644
--- a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
+++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
@@ -96,7 +96,7 @@
Common\Interop\Windows\User32\Interop.WndProc.cs
-
+
Interop\Windows\Kernel32\Interop.GetCurrentThreadId.cs
@@ -123,7 +123,7 @@
Common\Interop\Windows\WtsApi32\Interop.WTSUnRegisterSessionNotification.cs
-
+
Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs
diff --git a/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj b/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj
index 1d714cbcf149e3..32cb2f862f7ca8 100644
--- a/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj
+++ b/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj
@@ -15,7 +15,7 @@
-
+
System\Collections\Concurrent\IProducerConsumerCollectionDebugView.cs
diff --git a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj
index d66b0dee94bceb..bce9ffb525bc70 100644
--- a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj
+++ b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj
@@ -5,7 +5,7 @@
netcoreapp-Debug;netcoreapp-Release
-
+
System\Collections\Concurrent\IProducerConsumerCollectionDebugView.cs
diff --git a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj
index 67f2aadfc3b63d..8e6d17f595ad84 100644
--- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj
+++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj
@@ -84,7 +84,7 @@
-
+
Common\System\Runtime\Versioning\NonVersionableAttribute.cs
diff --git a/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj b/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj
index 787a338f160f42..1c44bee0f02a7a 100644
--- a/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj
+++ b/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj
@@ -16,7 +16,7 @@
-
+
Common\System\Collections\KeyValuePairs.cs
diff --git a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj
index b5310c8fb33f09..84ecdd0cf438a8 100644
--- a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj
+++ b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj
@@ -15,7 +15,7 @@
-
+
Common\System\Collections\CompatibleComparer.cs
diff --git a/src/libraries/System.Collections/src/System.Collections.csproj b/src/libraries/System.Collections/src/System.Collections.csproj
index 05302545747737..5395b26e5c56e9 100644
--- a/src/libraries/System.Collections/src/System.Collections.csproj
+++ b/src/libraries/System.Collections/src/System.Collections.csproj
@@ -15,10 +15,10 @@
-
+
Common\System\Collections\Generic\ICollectionDebugView.cs
-
+
Common\System\Collections\Generic\IDictionaryDebugView.cs
@@ -35,7 +35,7 @@
-
+
Common\System\Collections\HashHelpers.cs
diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
index 71c515f5848ee3..8236ec4848350e 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
+++ b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
@@ -239,7 +239,7 @@
-
+
Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs
diff --git a/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj b/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj
index 09db66e3c5f922..ae7539da9cd5e1 100644
--- a/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj
+++ b/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj
@@ -26,7 +26,7 @@
-
+
Common\System\Numerics\Hashing\HashHelpers.cs
diff --git a/src/libraries/System.Console/src/System.Console.csproj b/src/libraries/System.Console/src/System.Console.csproj
index 1ae2652ba67188..688c17765783c7 100644
--- a/src/libraries/System.Console/src/System.Console.csproj
+++ b/src/libraries/System.Console/src/System.Console.csproj
@@ -39,19 +39,19 @@
Common\Interop\Windows\Interop.GetCPInfoEx.cs
-
+
Interop\Windows\Interop.MAX_PATH.cs
Common\Interop\Windows\Interop.Libraries.cs
-
+
Interop\Windows\Interop.BOOL.cs
Common\Interop\Windows\Interop.Beep.cs
-
+
Common\Interop\Windows\Interop.FormatMessage.cs
@@ -69,7 +69,7 @@
Common\Interop\Windows\Interop.FillConsoleOutputCharacter.cs
-
+
Interop\Windows\Interop.FileTypes.cs
@@ -96,13 +96,13 @@
Common\Interop\Windows\Interop.GetKeyState.cs
-
+
Interop\Windows\Interop.GetStdHandle.cs
-
+
Interop\Windows\Interop.HandleTypes.cs
-
+
Interop\Windows\Interop.MultiByteToWideChar.cs
@@ -144,7 +144,7 @@
Common\Interop\Windows\Interop.SetConsoleWindowInfo.cs
-
+
Interop\Windows\Interop.WideCharToMultiByte.cs
@@ -159,10 +159,10 @@
Common\System\IO\EncodingHelper.Windows.cs
-
+
System\IO\Win32Marshal.cs
-
+
System\Text\ValueStringBuilder.cs
@@ -175,13 +175,13 @@
Common\Microsoft\Win32\SafeHandles\SafeFileHandleHelper.Unix.cs
-
+
Common\System\IO\PersistedFiles.Unix.cs
-
+
Common\System\IO\PersistedFiles.Names.Unix.cs
-
+
Common\System\Text\StringBuilderCache.cs
@@ -193,13 +193,13 @@
Common\Interop\Unix\Interop.Libraries.cs
-
+
Interop\Unix\Interop.Errors.cs
-
+
Interop\Unix\Interop.IOErrors.cs
-
+
Common\Interop\Unix\Interop.Close.cs
@@ -208,7 +208,7 @@
Common\Interop\Unix\Interop.FileDescriptors.cs
-
+
Common\Interop\Unix\Interop.FLock.cs
@@ -217,22 +217,22 @@
Common\Interop\Unix\Interop.IsATty.cs
-
+
Common\Interop\Unix\Interop.LSeek.cs
-
+
Common\Interop\Unix\Interop.Open.cs
-
+
Common\Interop\Unix\Interop.OpenFlags.cs
Common\Interop\Unix\Interop.Poll.cs
-
+
Common\Interop\Unix\Interop.GetEUid.cs
-
+
Common\Interop\Unix\Interop.GetPwUid.cs
@@ -250,13 +250,13 @@
Common\Interop\Unix\Interop.SNPrintF.cs
-
+
Common\Interop\Unix\Interop.Stat.cs
-
+
Common\Interop\Unix\Interop.Read.cs
-
+
Common\Interop\Unix\Interop.Write.cs
diff --git a/src/libraries/System.Data.Common/src/System.Data.Common.csproj b/src/libraries/System.Data.Common/src/System.Data.Common.csproj
index 8243247aa82338..0894c7c9c0f2b4 100644
--- a/src/libraries/System.Data.Common/src/System.Data.Common.csproj
+++ b/src/libraries/System.Data.Common/src/System.Data.Common.csproj
@@ -301,7 +301,7 @@
-
+
Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs
diff --git a/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj
index 32ecd9d23454eb..ec7ca08da6768f 100644
--- a/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj
+++ b/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj
@@ -190,7 +190,7 @@
System\Data\SQLTypes\SQLResource.cs
-
+
System\Threading\Tasks\TaskToApm.cs
@@ -217,22 +217,22 @@
-
+
Interop\Windows\Kernel32\Interop.FileTypes.cs
-
+
Interop\Windows\Kernel32\Interop.GetFileType_SafeHandle.cs
-
+
Interop\Windows\Kernel32\Interop.SetThreadErrorMode.cs
-
+
System\IO\PathInternal.Windows.cs
Common\System\Runtime\InteropServices\SuppressGCTransitionAttribute.internal.cs
-
+
CoreLib\System\Text\ValueStringBuilder.cs
@@ -316,7 +316,7 @@
Common\Interop\Windows\Kernel32\Interop.GetProcAddress.cs
-
+
Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs
@@ -361,7 +361,7 @@
Common\System\Net\Security\NetEventSource.Security.cs
-
+
Interop\Windows\Kernel32\Interop.CloseHandle.cs
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
index 1b14f9232a0124..94022a3174f471 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
@@ -19,7 +19,7 @@
-
+
Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs
diff --git a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
index ae1aae59a338ca..511bf3d81290d8 100644
--- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
+++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
@@ -51,10 +51,10 @@
-
+
Interop\Windows\Kernel32\Interop.CloseHandle.cs
-
+
Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
index 64d58a79b45509..a6292055c8dfb8 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
@@ -40,10 +40,10 @@
Common\Interop\Unix\Interop.Libraries.cs
-
+
Interop\Unix\Interop.Errors.cs
-
+
Common\Interop\Unix\Interop.Stat.cs
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
index 631cfef854e666..6c8bbc36253dbd 100644
--- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
@@ -37,22 +37,22 @@
-
+
Interop\Windows\Interop.BOOL.cs
-
+
Interop\Windows\Interop.FormatMessage.cs
-
+
Interop\Windows\Interop.RegCloseKey.cs
-
+
Interop\Windows\Advapi32\Interop.RegQueryValueEx.cs
-
+
Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs
-
+
Microsoft\Win32\SafeHandles\SafeRegistryHandle.Windows.cs
@@ -91,7 +91,7 @@
Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs
-
+
Common\Interop\Windows\Kernel32\Interop.GetComputerName.cs
@@ -139,7 +139,7 @@
Common\Interop\Windows\Kernel32\Interop.ProcessWaitHandle.cs
-
+
Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs
diff --git a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
index 155aba1b4b4747..d8eb75d8c52568 100644
--- a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
+++ b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
@@ -38,7 +38,7 @@
Common\System\Runtime\Serialization\SerializationGuard.cs
-
+
System\PasteArguments.cs
@@ -93,7 +93,7 @@
Common\Interop\Windows\Interop.Libraries.cs
-
+
Interop\Windows\Kernel32\Interop.CloseHandle.cs
@@ -111,7 +111,7 @@
Common\Interop\Windows\Kernel32\Interop.GetThreadTimes.cs
-
+
Interop\Windows\Kernel32\Interop.GetStdHandle.cs
@@ -201,7 +201,7 @@
Common\Interop\Windows\Advapi32\Interop.AdjustTokenPrivileges.cs
-
+
Common\Interop\Windows\Kernel32\Interop.GetComputerName.cs
@@ -216,10 +216,10 @@
Common\Interop\Windows\Advapi32\Interop.CreateProcessWithLogon.cs
-
+
Interop\Windows\Interop.BOOL.cs
-
+
Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs
@@ -240,7 +240,7 @@
Common\Interop\Windows\Kernel32\Interop.ThreadOptions.cs
-
+
Interop\Windows\Kernel32\Interop.HandleTypes.cs
@@ -249,13 +249,13 @@
Common\Interop\Windows\kernel32\Interop.ProcessOptions.cs
-
+
Interop\Windows\Kernel32\Interop.MultiByteToWideChar.cs
Common\Interop\Interop.UNICODE_STRING.cs
-
+
Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs
@@ -276,7 +276,7 @@
Common\Interop\Windows\Kernel32\Interop.GetCPInfoEx.cs
-
+
Interop\Windows\Interop.MAX_PATH.cs
@@ -296,7 +296,7 @@
-
+
Common\System\Text\ValueStringBuilder.cs
@@ -305,16 +305,16 @@
Common\Interop\Unix\Interop.Libraries.cs
-
+
Interop\Unix\Interop.Errors.cs
-
+
Common\Interop\Unix\Interop.Close.cs
-
+
Common\Interop\Unix\Interop.GetHostName.cs
-
+
Common\Interop\Unix\Interop.SysConf.cs
@@ -332,7 +332,7 @@
Common\Interop\Unix\Interop.GetPid.cs
-
+
Common\Interop\Unix\Interop.GetPwUid.cs
@@ -350,7 +350,7 @@
Common\Interop\Unix\Interop.Kill.cs
-
+
Common\Interop\Unix\Interop.ReadLink.cs
@@ -359,7 +359,7 @@
Common\Interop\Unix\Interop.ResourceLimits.cs
-
+
Common\Interop\Unix\Interop.PathConf.cs
@@ -371,7 +371,7 @@
Common\Interop\Unix\Interop.WaitPid.cs
-
+
Common\Interop\Unix\System.Native\Interop.Access.cs
@@ -428,7 +428,7 @@
Common\Interop\FreeBSD\Interop.Process.cs
-
+
Common\Unix\System.Native\Interop.Stat.cs
diff --git a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
index 1d2e6f81047968..22a2ef15cb8487 100644
--- a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
@@ -6,7 +6,7 @@
netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release
-
+
System\PasteArguments.cs
@@ -39,14 +39,14 @@
-
+
System\PasteArguments.Windows.cs
-
+
System\PasteArguments.Unix.cs
diff --git a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
index 6ee205f8bd0b77..d26ecd8a003b46 100644
--- a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
+++ b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
@@ -219,7 +219,7 @@
-
+
System\LocalAppContextSwitches.Common.cs
@@ -303,7 +303,7 @@
Common\Interop\Windows\Kernel32\Interop.GetProcAddress.cs
-
+
Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs
diff --git a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
index 4a08b6d9bff805..645108b18b09eb 100644
--- a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
+++ b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
@@ -17,7 +17,7 @@
-
+
System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj b/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj
index 15bec7c61e0e8c..6d3825bbd9b1ed 100644
--- a/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj
+++ b/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj
@@ -22,7 +22,7 @@
Common\System\IO\TempFile.cs
-
+
System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj b/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
index c462284452af95..be8ae3e149f017 100644
--- a/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
+++ b/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
@@ -36,10 +36,10 @@
-
+
System\IO\StreamHelpers.CopyValidation.cs
-
+
System\Threading\Tasks\TaskToApm.cs
@@ -62,7 +62,7 @@
Common\System\IO\PathInternal.Unix.cs
-
+
Interop\Unix\System.Native\Interop.PathConf.cs
diff --git a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
index a886c1ee214ecf..16f2445b4c22f0 100644
--- a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
+++ b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
@@ -43,7 +43,7 @@
Common\System\IO\Compression\ZipTestHelper.cs
-
+
System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
index b566050a3c1238..9b721ef283a6f5 100644
--- a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
@@ -28,22 +28,22 @@
Common\Interop\Windows\Interop.GetVolumeInformation.cs
-
+
Common\Interop\Windows\Interop.GetLogicalDrives.cs
Common\Interop\Windows\Interop.GetDiskFreeSpaceEx.cs
-
+
Interop\Windows\Interop.MAX_PATH.cs
Common\Interop\Windows\Interop.SetVolumeLabel.cs
-
+
Interop\Windows\Interop.SetThreadErrorMode.cs
-
+
Common\Interop\Windows\Interop.SecurityOptions.cs
@@ -52,16 +52,16 @@
Common\Interop\Windows\Interop.Errors.cs
-
+
Common\Interop\Windows\Interop.FormatMessage.cs
-
+
Common\System\IO\DisableMediaInsertionPrompt.cs
-
+
System\IO\Win32Marshal.cs
-
+
Common\System\IO\DriveInfoInternal.Windows.cs
@@ -73,19 +73,19 @@
Common\Interop\Unix\Interop.Libraries.cs
-
+
Interop\Unix\Interop.Errors.cs
-
+
Interop\Unix\Interop.IOErrors.cs
Common\System\IO\PathInternal.Unix.cs
-
+
Common\Interop\Unix\Interop.PathConf.cs
-
+
Common\Interop\Unix\Interop.MountPoints.cs
diff --git a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
index bd193a4c05d3f3..5c9e2d9d617c87 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
+++ b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
@@ -29,10 +29,10 @@
Common\Interop\Windows\Interop.Libraries.cs
-
+
Interop\Windows\Interop.BOOL.cs
-
+
Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs
@@ -44,7 +44,7 @@
Component
-
+
Common\Interop\Windows\Interop.CloseHandle.cs
@@ -58,19 +58,19 @@
Common\Interop\Unix\Interop.Libraries.cs
-
+
Common\Interop\Unix\libc\Interop.Read.cs
-
+
Interop\Unix\Interop.Errors.cs
-
+
Interop\Unix\Interop.IOErrors.cs
Common\System\IO\PathInternal.Unix.cs
-
+
Common\Interop\Unix\Interop.PathConf.cs
@@ -82,7 +82,7 @@
Common\Interop\Unix\Interop.Poll.cs
-
+
Common\Interop\Unix\Interop.Stat.cs
@@ -109,7 +109,7 @@
Common\Interop\Unix\Interop.Stat.Span.cs
-
+
Common\Interop\Unix\Interop.Stat.cs
diff --git a/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj b/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj
index 30fc368b047264..59aafb66e85513 100644
--- a/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj
+++ b/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj
@@ -15,9 +15,9 @@
-
-
-
+
+
+
@@ -57,26 +57,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -121,17 +121,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
index f09731a1e7b6ca..49ede566dcb21d 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
+++ b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
@@ -32,22 +32,22 @@
Common\Interop\Windows\Interop.GlobalMemoryStatusEx.cs
-
+
Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs
Common\Interop\Windows\Interop.Libraries.cs
-
+
Common\Interop\Windows\Interop.CloseHandle.cs
Common\Interop\Windows\Interop.Errors.cs
-
+
Common\Interop\Windows\Interop.FormatMessage.cs
-
+
Common\Interop\Windows\Interop.FileAttributes.cs
@@ -59,10 +59,10 @@
Common\Interop\Windows\Interop.GenericOperations.cs
-
+
Common\Interop\Windows\Interop.GetSystemInfo.cs
-
+
Common\Interop\Windows\Interop.SYSTEM_INFO.cs
@@ -77,10 +77,10 @@
Common\Interop\Windows\Interop.PipeOptions.cs
-
+
Interop\Windows\Interop.BOOL.cs
-
+
Common\Interop\Windows\Interop.SecurityOptions.cs
@@ -89,7 +89,7 @@
Common\Interop\Windows\Interop.VirtualQuery.cs
-
+
System\IO\Win32Marshal.cs
@@ -101,13 +101,13 @@
Common\Interop\Unix\Interop.Libraries.cs
-
+
Interop\Unix\Interop.Errors.cs
Common\Interop\Unix\Interop.Fcntl.cs
-
+
Interop\Unix\Interop.IOErrors.cs
@@ -119,23 +119,23 @@
Common\Interop\Unix\Interop.MSync.cs
-
+
Common\Interop\Unix\Interop.Open.cs
-
+
Common\Interop\Unix\Interop.OpenFlags.cs
-
+
Common\Interop\Unix\Interop.Permissions.cs
-
+
Common\Interop\Unix\Interop.SysConf.cs
-
+
Common\Interop\Unix\Interop.FTruncate.cs
@@ -144,7 +144,7 @@
Common\Interop\Unix\Interop.ShmOpen.cs
-
+
Common\Interop\Unix\Interop.Unlink.cs
diff --git a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj
index 3283b1a7a96b3d..57da081644d224 100644
--- a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj
+++ b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj
@@ -4,7 +4,7 @@
enable
-
+
System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
index 966950885fa402..245694bf98c92a 100644
--- a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
+++ b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
@@ -18,10 +18,10 @@
-
+
System\IO\StreamHelpers.CopyValidation.cs
-
+
System\Threading\Tasks\TaskToApm.cs
@@ -29,28 +29,28 @@
Common\Interop\Windows\Interop.Libraries.cs
-
+
Common\Interop\Windows\Interop.CloseHandle.cs
Common\Interop\Windows\Interop.Errors.cs
-
+
Common\Interop\Windows\Interop.FormatMessage.cs
-
+
Interop\Windows\Interop.FreeLibrary.cs
-
+
Interop\Windows\Interop.SecurityOptions.cs
-
+
Microsoft\Win32\SafeLibraryHandle.cs
-
+
Interop\Windows\Interop.BOOL.cs
-
+
Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs
@@ -65,16 +65,16 @@
Common\Interop\Windows\Interop.FileOperations.cs
-
+
Interop\Windows\Interop.FileTypes.cs
-
+
Common\Interop\Windows\Interop.GetCurrentProcess.cs
Common\Interop\Windows\Interop.DuplicateHandle_IntPtr.cs
-
+
Interop\Windows\Interop.GetFileType.cs
@@ -95,22 +95,22 @@
Common\Interop\Windows\Interop.SetNamedPipeHandleState.cs
-
+
Common\Interop\Windows\Interop.CancelIoEx.cs
-
+
Common\Interop\Windows\Interop.FlushFileBuffers.cs
-
+
Common\Interop\Windows\Interop.ReadFile_IntPtr.cs
-
+
Common\Interop\Windows\Interop.ReadFile_NativeOverlapped.cs
-
+
Common\Interop\Windows\Interop.WriteFile_IntPtr.cs
-
+
Common\Interop\Windows\Interop.WriteFile_NativeOverlapped.cs
@@ -128,7 +128,7 @@
Common\Interop\Windows\Interop.ImpersonateNamedPipeClient.cs
-
+
System\IO\Win32Marshal.cs
@@ -150,7 +150,7 @@
Common\Interop\Windows\Interop.CreateNamedPipeClient.cs
-
+
Interop\Windows\Interop.LoadLibraryEx.cs
@@ -167,13 +167,13 @@
Common\Interop\Unix\Interop.Libraries.cs
-
+
Interop\Unix\Interop.Errors.cs
-
+
Interop\Unix\Interop.IOErrors.cs
-
+
Common\Interop\Unix\Interop.Close.cs
@@ -182,10 +182,10 @@
Common\Interop\Unix\Interop.Fcntl.cs
-
+
Common\Interop\Unix\Interop.FLock.cs
-
+
Common\Interop\Unix\Interop.GetHostName.cs
@@ -194,13 +194,13 @@
Common\Interop\Unix\Interop.MkDir.cs
-
+
Common\Interop\Unix\Interop.Open.cs
-
+
Common\Interop\Unix\Interop.OpenFlags.cs
-
+
Common\Interop\Unix\Interop.Permissions.cs
@@ -212,13 +212,13 @@
Common\Interop\Unix\Interop.Read.Pipe.cs
-
+
Common\Interop\Unix\Interop.Unlink.cs
Common\Interop\Unix\Interop.Write.Pipe.cs
-
+
Common\Interop\Unix\Interop.Stat.cs
@@ -227,7 +227,7 @@
Common\Interop\Unix\Interop.GetPeerID.cs
-
+
Common\Interop\Unix\Interop.GetEUid.cs
diff --git a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
index 2a465b192a5da8..8f8327ec47ca61 100644
--- a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
+++ b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
@@ -31,16 +31,16 @@
-
+
Interop\Windows\Interop.CancelIoEx.cs
-
+
Interop\Windows\Interop.FreeLibrary.cs
-
+
Interop\Windows\Interop.LoadLibraryEx.cs
-
+
Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs
diff --git a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
index bb26fadaabd424..1ceebde070b502 100644
--- a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
+++ b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
@@ -77,37 +77,37 @@
Common\Interop\Windows\Kernel32\Interop.WaitCommEvent.cs
-
+
Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs
-
+
Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_NativeOverlapped.cs
-
+
Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_IntPtr.cs
-
+
Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_NativeOverlapped.cs
Common\Interop\Windows\Kernel32\Interop.GetOverlappedResult.cs
-
+
Interop\Windows\Kernel32\Interop.FlushFileBuffers.cs
Common\Interop\Windows\Kernel32\Interop.GenericOperations.cs
-
+
Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs
-
+
Interop\Windows\Interop.FileTypes.cs
Common\System\IO\PathInternal.Windows.cs
-
+
Interop\Windows\Kernel32\Interop.GetFileType_SafeHandle.cs
@@ -116,16 +116,16 @@
Common\Interop\Windows\Interop.Errors.cs
-
+
Interop\Windows\Interop.BOOL.cs
-
+
Interop\Windows\Kernel32\Interop.CloseHandle.cs
-
+
System\IO\Win32Marshal.cs
-
+
Interop\Windows\Interop.FormatMessage.cs
@@ -156,16 +156,16 @@
Common\Interop\Unix\Interop.Libraries.cs
-
+
Common\Interop\Unix\Interop.Errors.cs
-
+
Interop\Unix\Interop.IOErrors.cs
-
+
Interop\Unix\System.Native\Interop.Read.cs
-
+
Interop\Unix\System.Native\Interop.Write.cs
@@ -174,7 +174,7 @@
Interop\Unix\System.Native\Interop.Shutdown.cs
-
+
System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj
index 8181d65ee4317c..3c63be254b3f34 100644
--- a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj
+++ b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj
@@ -16,7 +16,7 @@
Common\System\Collections\Generic\ArrayBuilder.cs
-
+
Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs
diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj
index 1b9bdb71d7c587..a79aaaf197bf7b 100644
--- a/src/libraries/System.Management/src/System.Management.csproj
+++ b/src/libraries/System.Management/src/System.Management.csproj
@@ -37,7 +37,7 @@
Common\Interop\Windows\Ole32\Interop.GetHGlobalFromStream.cs
-
+
Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj
index aba981d897a562..ec65b6afab8560 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj
+++ b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj
@@ -18,7 +18,7 @@
-
+
System\IO\StreamHelpers.CopyValidation.cs
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild
index 7addefcb8cc81f..5cd59a951e58ff 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild
+++ b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild
@@ -7,7 +7,7 @@
-
+
@@ -26,7 +26,7 @@
-
+
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
index ee0555f63fae4f..eb9f9f5a74b2fb 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
@@ -39,7 +39,7 @@
Common\System\StringExtensions.cs
-
+
System\IO\StreamHelpers.CopyValidation.cs
@@ -81,7 +81,7 @@
Common\System\Threading\Tasks\RendezvousAwaitable.cs
-
+
System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/libraries/System.Net.Http/src/System.Net.Http.csproj
index 94e627533e856e..315af73085e319 100644
--- a/src/libraries/System.Net.Http/src/System.Net.Http.csproj
+++ b/src/libraries/System.Net.Http/src/System.Net.Http.csproj
@@ -87,7 +87,7 @@
-
+
System\IO\StreamHelpers.CopyValidation.cs
@@ -99,7 +99,7 @@
Common\System\IO\ReadOnlyMemoryStream.cs
-
+
Common\System\Text\StringBuilderCache.cs
@@ -360,7 +360,7 @@
Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs
-
+
Interop\Windows\Kernel32\Interop.CloseHandle.cs
@@ -478,22 +478,22 @@
Common\System\Net\UriScheme.cs
-
+
Interop\Unix\Interop.Errors.cs
-
+
Interop\Unix\Interop.IOErrors.cs
Common\Interop\Unix\Interop.Libraries.cs
-
+
Interop\Unix\System.Native\Interop.Close.cs
-
+
Interop\Unix\System.Native\Interop.Open.cs
-
+
Interop\Unix\System.Native\Interop.OpenFlags.cs
@@ -502,10 +502,10 @@
Common\Interop\Unix\libc\Interop.Poll.cs
-
+
Common\Interop\Unix\libc\Interop.Read.cs
-
+
Common\Interop\Unix\libc\Interop.Write.cs
@@ -538,7 +538,7 @@
Common\System\Net\Security\CertificateHelper.Unix.cs
-
+
System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
index 271912ab05c62d..f4195d904bbc05 100644
--- a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
@@ -20,10 +20,10 @@
ProductionCode\Common\System\StringExtensions.cs
-
+
ProductionCode\Common\System\Text\StringBuilderCache.cs
-
+
ProductionCode\System\IO\StreamHelpers.CopyValidation.cs
@@ -86,7 +86,7 @@
ProductionCode\Common\src\System\Net\Mail\WhitespaceReader.cs
-
+
ProductionCode\System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
index c4ed00d9d1f3ea..f51da042454c4a 100644
--- a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
+++ b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
@@ -100,7 +100,7 @@
Common\System\Net\WebSockets\WebSocketValidate.cs
-
+
Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs
@@ -140,7 +140,7 @@
Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs
-
+
Interop\Windows\Interop.BOOL.cs
@@ -188,7 +188,7 @@
Interop\Windows\Kernel32\Interop.SetFileCompletionNotificationModes.cs
-
+
Common\Interop\Windows\mincore\Interop.CancelIoEx.cs
@@ -197,7 +197,7 @@
Common\Interop\Windows\mincore\Interop.LoadLibraryEx.cs
-
+
Interop\Windows\mincore\Interop.SECURITY_ATTRIBUTES.cs
@@ -209,7 +209,7 @@
Common\Interop\Windows\mincore_obsolete\Interop.LocalAlloc.Constants.cs
-
+
Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs
@@ -283,7 +283,7 @@
Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs
-
+
Interop\Windows\Kernel32\Interop.CloseHandle.cs
@@ -354,7 +354,7 @@
-
+
System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
index cc8395c2859bc2..2406531da857c5 100644
--- a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
+++ b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
@@ -234,7 +234,7 @@
Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs
-
+
Interop\Windows\Kernel32\Interop.CloseHandle.cs
diff --git a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
index fc5067ff25274c..deb3335de9b32c 100644
--- a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
@@ -309,7 +309,7 @@
Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs
-
+
Interop\Windows\Kernel32\Interop.CloseHandle.cs
diff --git a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
index a4b1b2b7f0f015..dd10d10364013c 100644
--- a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
+++ b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
@@ -18,7 +18,7 @@
Common\System\Net\InternalException.cs
-
+
System\Threading\Tasks\TaskToApm.cs
@@ -95,7 +95,7 @@
Interop\Windows\WinSock\Interop.GetAddrInfoExW.cs
-
+
Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs
@@ -128,16 +128,16 @@
Common\System\Net\Internals\Interop.CheckedAccess.cs
-
+
Interop\CoreLib\Unix\Interop.Errors.cs
Interop\Unix\Interop.Libraries.cs
-
+
Interop\Unix\System.Native\Interop.Close.cs
-
+
Interop\Unix\System.Native\Interop.GetHostName.cs
diff --git a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
index 7864e081a004ba..ffc05865ac055f 100644
--- a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
+++ b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
@@ -101,7 +101,7 @@
Interop\Windows\WinSock\Interop.GetAddrInfoExW.cs
-
+
Common\CoreLi\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs
@@ -136,16 +136,16 @@
System\Net\SocketProtocolSupportPal.Unix.cs
-
+
Interop\CoreLib\Unix\Interop.Errors.cs
Interop\Unix\Interop.Libraries.cs
-
+
Interop\Unix\System.Native\Interop.Close.cs
-
+
Interop\Unix\System.Native\Interop.GetHostName.cs
diff --git a/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj
index e1555834939926..67f743f0d1f661 100644
--- a/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj
+++ b/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj
@@ -40,7 +40,7 @@
Common\System\Net\InternalException.cs
-
+
System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
index e522cfae91325a..ad459ccdbd9fa1 100644
--- a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
+++ b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
@@ -176,16 +176,16 @@
Interop\Unix\System.Native\Interop.GetDomainName.cs
-
+
Interop\Unix\System.Native\Interop.GetHostName.cs
Interop\Unix\System.Native\Interop.MapTcpState.cs
-
+
Interop\CoreLib\Unix\Interop.Errors.cs
-
+
System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
index e273068559622e..aaf8c19c11b488 100644
--- a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
+++ b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
@@ -62,16 +62,16 @@
Common\System\Net\NetworkInformation\UnixCommandLinePing.cs
-
+
Interop\Unix\Interop.Errors.cs
Common\Interop\Unix\Interop.Libraries.cs
-
+
Interop\Unix\System.Native\Interop.Close.cs
-
+
Interop\Unix\System.Native\Interop.ReadLink.cs
diff --git a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
index 458fc00ff17dff..101c589b573353 100644
--- a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
@@ -24,7 +24,7 @@
Common\Interop\Unix\Interop.Libraries.cs
-
+
Interop\Unix\System.Native\Interop.ReadLink.cs
diff --git a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
index eb9b81c59936cd..7597e435aa030f 100644
--- a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
+++ b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
@@ -88,10 +88,10 @@
Common\System\Marvin.cs
-
+
Common\System\Text\StringBuilderCache.cs
-
+
Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs
@@ -164,7 +164,7 @@
Common\System\Net\Sockets\SocketErrorPal.Unix.cs
-
+
Interop\Unix\Interop.Errors.cs
@@ -173,7 +173,7 @@
Common\Interop\Unix\System.Native\Interop.GetDomainName.cs
-
+
Common\Interop\Unix\System.Native\Interop.GetHostName.cs
diff --git a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
index 946cfcf5179a2d..83b261460b1bfc 100644
--- a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
+++ b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
@@ -44,7 +44,7 @@
ProductionCode\Common\System\Marvin.cs
-
+
ProductionCode\Common\System\Text\StringBuilderCache.cs
@@ -137,7 +137,7 @@
ProductionCode\Common\Interop\Interop.CheckedAccess.cs
-
+
ProductionCode\Interop\Unix\Interop.Errors.cs
@@ -146,7 +146,7 @@
ProductionCode\Common\Interop\Unix\System.Native\Interop.GetDomainName.cs
-
+
ProductionCode\Common\Interop\Unix\System.Native\Interop.GetHostName.cs
diff --git a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
index 9813d55dd30ca3..871d0fc6177742 100644
--- a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
+++ b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
@@ -59,7 +59,7 @@
ProductionCode\System\Net\IPAddressParser.cs
-
+
Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs
@@ -90,7 +90,7 @@
Common\System\Marvin.cs
-
+
Common\System\Text\StringBuilderCache.cs
@@ -140,7 +140,7 @@
ProductionCode\Common\Interop\Unix\Interop.Libraries.cs
-
+
ProductionCode\Interop\Unix\Interop.Errors.cs
diff --git a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
index 79613dd18ed677..f2374169bff6ca 100644
--- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -18,7 +18,7 @@
-
+
System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
index 47b9eb2a956e9e..4d90b238b01e5f 100644
--- a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
+++ b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
@@ -84,7 +84,7 @@
Common\System\NotImplemented.cs
-
+
System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.Net.Security/src/System.Net.Security.csproj b/src/libraries/System.Net.Security/src/System.Net.Security.csproj
index b3387ad42fd23e..c1cc749417fa42 100644
--- a/src/libraries/System.Net.Security/src/System.Net.Security.csproj
+++ b/src/libraries/System.Net.Security/src/System.Net.Security.csproj
@@ -82,7 +82,7 @@
Common\System\NotImplemented.cs
-
+
System\Threading\Tasks\TaskToApm.cs
@@ -180,7 +180,7 @@
Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs
-
+
Interop\Windows\Kernel32\Interop.CloseHandle.cs
@@ -263,7 +263,7 @@
Common\Interop\Unix\Interop.Libraries.cs
-
+
Interop\Unix\Interop.Errors.cs
diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
index 4e135947769995..24320c6ecf78b1 100644
--- a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
+++ b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
@@ -78,7 +78,7 @@
Common\System\Threading\Tasks\TaskTimeoutExtensions.cs
-
+
ProductionCode\System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
index 61528feec15654..cb7d3241a5abcf 100644
--- a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
@@ -67,7 +67,7 @@
Common\Interop\Windows\SChannel\Interop.Alerts.cs
-
+
System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
index 7c00778ca816f5..38d4d1381e0b33 100644
--- a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
+++ b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
@@ -47,7 +47,7 @@
-
+
System\IO\StreamHelpers.CopyValidation.cs
@@ -230,7 +230,7 @@
Interop\Windows\WinSock\WSABuffer.cs
-
+
Common\Interop\Windows\Interop.CancelIoEx.cs
@@ -269,10 +269,10 @@
Common\System\Net\Sockets\SocketErrorPal.Unix
-
+
System\Threading\Tasks\TaskToApm.cs
-
+
Interop\Unix\Interop.Errors.cs
@@ -284,7 +284,7 @@
Interop\Unix\System.Native\Interop.Bind.cs
-
+
Interop\Unix\System.Native\Interop.Close.cs
@@ -374,7 +374,7 @@
Interop\Unix\System.Native\Interop.Pipe.cs
-
+
Interop\Unix\System.Native\Interop.Write.cs
diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
index 30bc2508dad009..36c75e99cf5fb0 100644
--- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
+++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
@@ -104,7 +104,7 @@
Common\System\Buffers\NativeMemoryManager.cs
-
+
System\Threading\Tasks\TaskToApm.cs
diff --git a/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj b/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj
index 90ec7b6954be89..8ec2ddc974d6fc 100644
--- a/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj
+++ b/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj
@@ -5,7 +5,7 @@
true
-
+
True
True
ConstantHelper.tt
@@ -33,12 +33,12 @@
-
+
ConstantHelper.tt
TextTemplatingFileGenerator
ConstantHelper.cs
-
+
GenerationConfig.ttinclude
diff --git a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj
index 9685c4046303ca..0566f8c5495a58 100644
--- a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj
+++ b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj
@@ -37,7 +37,7 @@
-
+