diff --git a/src/Common/tests/Common.Tests.csproj b/src/Common/tests/Common.Tests.csproj index 331487bfa8e8..6704a0565831 100644 --- a/src/Common/tests/Common.Tests.csproj +++ b/src/Common/tests/Common.Tests.csproj @@ -99,14 +99,14 @@ Common\System\Text\SimpleRegex.cs - - Common\CoreLib\System\Text\ValueStringBuilder.cs + + System\Text\ValueStringBuilder.cs Common\System\Security\IdentityHelper.cs - - Common\CoreLib\System\PasteArguments.cs + + System\PasteArguments.cs @@ -139,48 +139,48 @@ - - ProductionCode\Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs - - Common\CoreLib\System\IO\PathInternal.cs + + System\IO\PathInternal.cs - - Common\CoreLib\System\IO\PathInternal.Windows.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 - - Common\CoreLib\System\IO\Win32Marshal.cs + + System\IO\Win32Marshal.cs - - Common\CoreLib\System\PasteArguments.Windows.cs + + System\PasteArguments.Windows.cs - - Common\CoreLib\System\IO\PathInternal.Unix.cs + + System\IO\PathInternal.Unix.cs - + Common\Interop\Unix\Interop.PathConf.cs Common\Interop\Unix\Interop.Libraries.cs - - Common\CoreLib\System\PasteArguments.Unix.cs + + System\PasteArguments.Unix.cs diff --git a/src/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj b/src/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj index 79b4f3d20509..8cc762a38696 100644 --- a/src/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj +++ b/src/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj @@ -32,7 +32,7 @@ - + Common\Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs @@ -47,8 +47,8 @@ Common\Interop\Windows\Interop.Libraries.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs + + Interop\Windows\Kernel32\Interop.CloseHandle.cs Common\Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs @@ -59,8 +59,8 @@ Common\Interop\Windows\Advapi32\Interop.TOKEN_ELEVATION.cs - - Common\CoreLib\Interop\Windows\Interop.BOOL.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/Common/tests/StaticTestGenerator/README.md b/src/Common/tests/StaticTestGenerator/README.md index eaae275ce67a..3c299c7b3c8c 100644 --- a/src/Common/tests/StaticTestGenerator/README.md +++ b/src/Common/tests/StaticTestGenerator/README.md @@ -101,7 +101,7 @@ Xunit.Sdk.ThrowsException: Assert.Throws() Failure Expected: typeof(System.PlatformNotSupportedException) Actual: typeof(System.ArgumentException): Handle is not initialized. at System.ArgIterator..ctor(IntPtr arglist) - at System.ArgIterator..ctor(RuntimeArgumentHandle arglist) in F:\vsagent\80\s\src\System.Private.CoreLib\src\System\ArgIterator.cs:line 39 + at System.ArgIterator..ctor(RuntimeArgumentHandle arglist) in F:\vsagent\80\s\src\System\ArgIterator.cs:line 39 at System.Tests.ArgIteratorTests.<>c.b__6_0() at Xunit.Assert.RecordException(Action testCode) in C:\projects\xunit\src\xunit.assert\Asserts\Record.cs:line 28 diff --git a/src/Directory.Build.props b/src/Directory.Build.props index bfdae1fde638..3182cab6f50a 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -260,6 +260,9 @@ $(LibrariesProjectRoot)Common\src $(LibrariesProjectRoot)Common\tests + + $([MSBuild]::NormalizeDirectory('$(CommonPath)', 'CoreLib')) + $([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src')) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 7c8a0959823f..6a107b0cbaba 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -15,7 +15,7 @@ $(DefineConstants),INTERNAL_NULLABLE_ATTRIBUTES - + diff --git a/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj index 7634ef611603..5ca350f3aa47 100644 --- a/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj +++ b/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj @@ -157,7 +157,7 @@ - + Common\System\Collections\HashHelpers.cs diff --git a/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj b/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj index 7fea2d858a10..b005c4333be9 100644 --- a/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj +++ b/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj @@ -12,21 +12,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj b/src/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj index 1b60e9ee9204..d4a31f48132d 100644 --- a/src/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj +++ b/src/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj @@ -33,38 +33,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj b/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj index d58627431d61..018b31e3230c 100644 --- a/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj +++ b/src/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,8 +21,8 @@ Common\Interop\Unix\Interop.Libraries.cs - - Common\CoreLib\Interop\Unix\Interop.Errors.cs + + Interop\Unix\Interop.Errors.cs diff --git a/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index 3f61c027732c..33a855542d8f 100644 --- a/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -9,11 +9,11 @@ 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 - - Common\CoreLib\Interop\Windows\Advapi32\Interop.RegistryConstants.cs + + Interop\Windows\Advapi32\Interop.RegistryConstants.cs - - Common\CoreLib\Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs + + Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs @@ -33,54 +33,54 @@ Common\Interop\Windows\Interop.Errors.cs - - Common\CoreLib\Interop\Windows\Interop.FormatMessage.cs + + Interop\Windows\Interop.FormatMessage.cs - - Common\CoreLib\Interop\Windows\Interop.RegCloseKey.cs + + Interop\Windows\Interop.RegCloseKey.cs Common\Interop\Windows\Interop.RegConnectRegistry.cs - - Common\CoreLib\Interop\Windows\Interop.RegCreateKeyEx.cs + + Interop\Windows\Interop.RegCreateKeyEx.cs - - Common\CoreLib\Interop\Windows\Interop.RegDeleteKeyEx.cs + + Interop\Windows\Interop.RegDeleteKeyEx.cs - - Common\CoreLib\Interop\Windows\Interop.RegDeleteValue.cs + + Interop\Windows\Interop.RegDeleteValue.cs - - Common\CoreLib\Interop\Windows\Interop.RegEnumKeyEx.cs + + Interop\Windows\Interop.RegEnumKeyEx.cs - - Common\CoreLib\Interop\Windows\Interop.RegEnumValue.cs + + Interop\Windows\Interop.RegEnumValue.cs - - Common\CoreLib\Interop\Windows\Interop.RegFlushKey.cs + + Interop\Windows\Interop.RegFlushKey.cs - - Common\CoreLib\Interop\Windows\Interop.RegOpenKeyEx.cs + + Interop\Windows\Interop.RegOpenKeyEx.cs - - Common\CoreLib\Interop\Windows\Interop.RegQueryInfoKey.cs + + Interop\Windows\Interop.RegQueryInfoKey.cs - - Common\CoreLib\Interop\Windows\Interop.RegQueryValueEx.cs + + Interop\Windows\Interop.RegQueryValueEx.cs - - Common\CoreLib\Interop\Windows\Interop.RegSetValueEx.cs + + Interop\Windows\Interop.RegSetValueEx.cs - - Common\CoreLib\Interop\Windows\Interop.BOOL.cs + + Interop\Windows\Interop.BOOL.cs - - Common\CoreLib\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs + + Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs - - Common\CoreLib\Microsoft\Win32\SafeHandles\SafeRegistryHandle.Windows.cs + + Microsoft\Win32\SafeHandles\SafeRegistryHandle.Windows.cs diff --git a/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj b/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj index c1fdde8ed1e5..27e394236301 100644 --- a/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj +++ b/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj @@ -7,8 +7,8 @@ Common\Interop\Windows\Interop.Libraries.cs - - Common\CoreLib\Interop\Windows\Interop.RegSetValueEx.cs + + Interop\Windows\Interop.RegSetValueEx.cs diff --git a/src/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/src/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj index 70d12f16dcca..d3860625490c 100644 --- a/src/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj +++ b/src/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj @@ -96,8 +96,8 @@ Common\Interop\Windows\User32\Interop.WndProc.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.GetCurrentThreadId.cs + + Interop\Windows\Kernel32\Interop.GetCurrentThreadId.cs Common\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs @@ -123,8 +123,8 @@ Common\Interop\Windows\WtsApi32\Interop.WTSUnRegisterSessionNotification.cs - - Common\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs + + Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs diff --git a/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj b/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj index 00c8eefae43b..1d714cbcf149 100644 --- a/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj +++ b/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj @@ -15,8 +15,8 @@ - - Common\CoreLib\System\Collections\Concurrent\IProducerConsumerCollectionDebugView.cs + + System\Collections\Concurrent\IProducerConsumerCollectionDebugView.cs diff --git a/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj b/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj index f491c91bdf83..d66b0dee94bc 100644 --- a/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj +++ b/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj @@ -5,8 +5,8 @@ netcoreapp-Debug;netcoreapp-Release - - Common\CoreLib\System\Collections\Concurrent\IProducerConsumerCollectionDebugView.cs + + System\Collections\Concurrent\IProducerConsumerCollectionDebugView.cs diff --git a/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj index 8c0f2b8df285..67f2aadfc3b6 100644 --- a/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -84,13 +84,13 @@ - + Common\System\Runtime\Versioning\NonVersionableAttribute.cs - Common\CoreLib\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs + System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs diff --git a/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj b/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj index 4ed7fd64ec92..787a338f160f 100644 --- a/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj +++ b/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj @@ -16,7 +16,7 @@ - + Common\System\Collections\KeyValuePairs.cs diff --git a/src/System.Collections.Specialized/src/System.Collections.Specialized.csproj b/src/System.Collections.Specialized/src/System.Collections.Specialized.csproj index cdc8560be466..b5310c8fb33f 100644 --- a/src/System.Collections.Specialized/src/System.Collections.Specialized.csproj +++ b/src/System.Collections.Specialized/src/System.Collections.Specialized.csproj @@ -15,7 +15,7 @@ - + Common\System\Collections\CompatibleComparer.cs diff --git a/src/System.Collections/src/System.Collections.csproj b/src/System.Collections/src/System.Collections.csproj index 743071569a7a..053025457477 100644 --- a/src/System.Collections/src/System.Collections.csproj +++ b/src/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/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj index ecb178563e41..71c515f5848e 100644 --- a/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj +++ b/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj @@ -239,7 +239,7 @@ - + Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs diff --git a/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj b/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj index 3acb4da8548a..09db66e3c5f9 100644 --- a/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj +++ b/src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj @@ -26,7 +26,7 @@ - + Common\System\Numerics\Hashing\HashHelpers.cs diff --git a/src/System.Console/src/System.Console.csproj b/src/System.Console/src/System.Console.csproj index 786a385a2dd6..1ae2652ba671 100644 --- a/src/System.Console/src/System.Console.csproj +++ b/src/System.Console/src/System.Console.csproj @@ -39,19 +39,19 @@ Common\Interop\Windows\Interop.GetCPInfoEx.cs - - Common\CoreLib\Interop\Windows\Interop.MAX_PATH.cs + + Interop\Windows\Interop.MAX_PATH.cs Common\Interop\Windows\Interop.Libraries.cs - - Common\CoreLib\Interop\Windows\Interop.BOOL.cs + + Interop\Windows\Interop.BOOL.cs Common\Interop\Windows\Interop.Beep.cs - + Common\Interop\Windows\Interop.FormatMessage.cs @@ -69,8 +69,8 @@ Common\Interop\Windows\Interop.FillConsoleOutputCharacter.cs - - Common\CoreLib\Interop\Windows\Interop.FileTypes.cs + + Interop\Windows\Interop.FileTypes.cs Common\Interop\Windows\Interop.GetConsoleScreenBufferInfo.cs @@ -96,14 +96,14 @@ Common\Interop\Windows\Interop.GetKeyState.cs - - Common\CoreLib\Interop\Windows\Interop.GetStdHandle.cs + + Interop\Windows\Interop.GetStdHandle.cs - - Common\CoreLib\Interop\Windows\Interop.HandleTypes.cs + + Interop\Windows\Interop.HandleTypes.cs - - Common\CoreLib\Interop\Windows\Interop.MultiByteToWideChar.cs + + Interop\Windows\Interop.MultiByteToWideChar.cs Common\Interop\Windows\Interop.PeekConsoleInput.cs @@ -144,8 +144,8 @@ Common\Interop\Windows\Interop.SetConsoleWindowInfo.cs - - Common\CoreLib\Interop\Windows\Interop.WideCharToMultiByte.cs + + Interop\Windows\Interop.WideCharToMultiByte.cs Common\Interop\Windows\Interop.WriteFile.cs @@ -159,11 +159,11 @@ Common\System\IO\EncodingHelper.Windows.cs - - Common\CoreLib\System\IO\Win32Marshal.cs + + System\IO\Win32Marshal.cs - - Common\CoreLib\System\Text\ValueStringBuilder.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 - - Common\CoreLib\Interop\Unix\Interop.Errors.cs + + Interop\Unix\Interop.Errors.cs - - Common\CoreLib\Interop\Unix\Interop.IOErrors.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/System.Data.Common/src/System.Data.Common.csproj b/src/System.Data.Common/src/System.Data.Common.csproj index f107776c1d93..8243247aa823 100644 --- a/src/System.Data.Common/src/System.Data.Common.csproj +++ b/src/System.Data.Common/src/System.Data.Common.csproj @@ -301,7 +301,7 @@ - + Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs diff --git a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj index 6a976b2e9ef2..32ecd9d23454 100644 --- a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj +++ b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj @@ -190,8 +190,8 @@ System\Data\SQLTypes\SQLResource.cs - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs @@ -217,22 +217,22 @@ - - Common\CoreLib\Interop\Windows\Kernel32\Interop.FileTypes.cs + + Interop\Windows\Kernel32\Interop.FileTypes.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.GetFileType_SafeHandle.cs + + Interop\Windows\Kernel32\Interop.GetFileType_SafeHandle.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.SetThreadErrorMode.cs + + Interop\Windows\Kernel32\Interop.SetThreadErrorMode.cs - - Common\CoreLib\System\IO\PathInternal.Windows.cs + + System\IO\PathInternal.Windows.cs Common\System\Runtime\InteropServices\SuppressGCTransitionAttribute.internal.cs - + CoreLib\System\Text\ValueStringBuilder.cs @@ -316,8 +316,8 @@ Common\Interop\Windows\Kernel32\Interop.GetProcAddress.cs - - Common\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs + + Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs @@ -361,8 +361,8 @@ Common\System\Net\Security\NetEventSource.Security.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs + + Interop\Windows\Kernel32\Interop.CloseHandle.cs Common\Interop\Windows\SspiCli\GlobalSSPI.cs diff --git a/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj index d87ab1829411..1b14f9232a01 100644 --- a/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +++ b/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj @@ -19,7 +19,7 @@ - + Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs diff --git a/src/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj b/src/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj index a25154eda634..ae1aae59a338 100644 --- a/src/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj +++ b/src/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj @@ -51,11 +51,11 @@ - - Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs + + Interop\Windows\Kernel32\Interop.CloseHandle.cs - - Common\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs + + Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs Common\Interop\Windows\Advapi32\Interop.ClearEventLog.cs diff --git a/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj b/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj index e3647a4d4d09..64d58a79b455 100644 --- a/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj +++ b/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj @@ -40,10 +40,10 @@ Common\Interop\Unix\Interop.Libraries.cs - - Common\CoreLib\Interop\Unix\Interop.Errors.cs + + Interop\Unix\Interop.Errors.cs - + Common\Interop\Unix\Interop.Stat.cs diff --git a/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj index d00812f768c9..631cfef854e6 100644 --- a/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -37,23 +37,23 @@ - - Common\CoreLib\Interop\Windows\Interop.BOOL.cs + + Interop\Windows\Interop.BOOL.cs - - Common\CoreLib\Interop\Windows\Interop.FormatMessage.cs + + Interop\Windows\Interop.FormatMessage.cs - - Common\CoreLib\Interop\Windows\Interop.RegCloseKey.cs + + Interop\Windows\Interop.RegCloseKey.cs - - Common\CoreLib\Interop\Windows\Advapi32\Interop.RegQueryValueEx.cs + + Interop\Windows\Advapi32\Interop.RegQueryValueEx.cs - - Common\CoreLib\Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs + + Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs - - Common\CoreLib\Microsoft\Win32\SafeHandles\SafeRegistryHandle.Windows.cs + + Microsoft\Win32\SafeHandles\SafeRegistryHandle.Windows.cs Common\Interop\Windows\Interop.Errors.cs @@ -91,7 +91,7 @@ Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs - + Common\Interop\Windows\Kernel32\Interop.GetComputerName.cs @@ -139,8 +139,8 @@ Common\Interop\Windows\Kernel32\Interop.ProcessWaitHandle.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs + + Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs Common\Interop\Windows\Kernel32\Interop.UnmapViewOfFile.cs diff --git a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj index 7c6409e525ce..155aba1b4b47 100644 --- a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj +++ b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj @@ -38,8 +38,8 @@ Common\System\Runtime\Serialization\SerializationGuard.cs - - Common\CoreLib\System\PasteArguments.cs + + System\PasteArguments.cs Common\Interop\Windows\Interop.Errors.cs @@ -93,8 +93,8 @@ Common\Interop\Windows\Interop.Libraries.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs + + Interop\Windows\Kernel32\Interop.CloseHandle.cs Common\Interop\Windows\Advapi32\Interop.PERF_INFO.cs @@ -111,8 +111,8 @@ Common\Interop\Windows\Kernel32\Interop.GetThreadTimes.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.GetStdHandle.cs + + Interop\Windows\Kernel32\Interop.GetStdHandle.cs Common\Interop\Windows\Kernel32\Interop.CreateProcess.cs @@ -201,7 +201,7 @@ Common\Interop\Windows\Advapi32\Interop.AdjustTokenPrivileges.cs - + Common\Interop\Windows\Kernel32\Interop.GetComputerName.cs @@ -216,11 +216,11 @@ Common\Interop\Windows\Advapi32\Interop.CreateProcessWithLogon.cs - - Common\CoreLib\Interop\Windows\Interop.BOOL.cs + + Interop\Windows\Interop.BOOL.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs + + Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs Common\Interop\Windows\Advapi32\Interop.LUID.cs @@ -240,8 +240,8 @@ Common\Interop\Windows\Kernel32\Interop.ThreadOptions.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.HandleTypes.cs + + Interop\Windows\Kernel32\Interop.HandleTypes.cs Common\Interop\Windows\Advapi32\Interop.ProcessOptions.cs @@ -249,14 +249,14 @@ Common\Interop\Windows\kernel32\Interop.ProcessOptions.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.MultiByteToWideChar.cs + + Interop\Windows\Kernel32\Interop.MultiByteToWideChar.cs Common\Interop\Interop.UNICODE_STRING.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs + + Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs Common\System\Text\ConsoleEncoding.cs @@ -276,8 +276,8 @@ Common\Interop\Windows\Kernel32\Interop.GetCPInfoEx.cs - - Common\CoreLib\Interop\Windows\Interop.MAX_PATH.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 - - Common\CoreLib\Interop\Unix\Interop.Errors.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/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj b/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj index ab303628b389..1d2e6f810479 100644 --- a/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj +++ b/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj @@ -6,8 +6,8 @@ netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release - - Common\CoreLib\System\PasteArguments.cs + + System\PasteArguments.cs Common\System\IO\StringParser.cs @@ -39,15 +39,15 @@ - - Common\CoreLib\System\PasteArguments.Windows.cs + + System\PasteArguments.Windows.cs - - Common\CoreLib\System\PasteArguments.Unix.cs + + System\PasteArguments.Unix.cs diff --git a/src/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/System.Drawing.Common/src/System.Drawing.Common.csproj index dd66c8089881..6ee205f8bd0b 100644 --- a/src/System.Drawing.Common/src/System.Drawing.Common.csproj +++ b/src/System.Drawing.Common/src/System.Drawing.Common.csproj @@ -219,8 +219,8 @@ - - Common\CoreLib\System\LocalAppContextSwitches.Common.cs + + System\LocalAppContextSwitches.Common.cs Common\Interop\Windows\Interop.Libraries.cs @@ -303,8 +303,8 @@ Common\Interop\Windows\Kernel32\Interop.GetProcAddress.cs - - Common\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs + + Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs Common\Interop\Windows\Gdi32\Interop.BitBlt.cs diff --git a/src/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj index 5e483e049388..4a08b6d9bff8 100644 --- a/src/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj +++ b/src/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj @@ -17,8 +17,8 @@ - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs Common\Microsoft\Win32\SafeHandles\SafeBrotliHandle.cs diff --git a/src/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj b/src/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj index 1401032ef208..15bec7c61e0e 100644 --- a/src/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj +++ b/src/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj @@ -22,8 +22,8 @@ Common\System\IO\TempFile.cs - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs @@ -62,8 +62,8 @@ Common\System\IO\PathInternal.Unix.cs - - Common\CoreLib\Interop\Unix\System.Native\Interop.PathConf.cs + + Interop\Unix\System.Native\Interop.PathConf.cs diff --git a/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj index 332bc6f10765..a886c1ee214e 100644 --- a/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj +++ b/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj @@ -43,8 +43,8 @@ Common\System\IO\Compression\ZipTestHelper.cs - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs - - - + + + @@ -57,26 +57,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -121,17 +121,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj index 5268bd7371b9..f09731a1e7b6 100644 --- a/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj +++ b/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj @@ -32,22 +32,22 @@ Common\Interop\Windows\Interop.GlobalMemoryStatusEx.cs - - Common\CoreLib\Interop\Windows\Interop.SECURITY_ATTRIBUTES.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 - - Common\CoreLib\Interop\Windows\Interop.BOOL.cs + + Interop\Windows\Interop.BOOL.cs - + Common\Interop\Windows\Interop.SecurityOptions.cs @@ -89,8 +89,8 @@ Common\Interop\Windows\Interop.VirtualQuery.cs - - Common\CoreLib\System\IO\Win32Marshal.cs + + System\IO\Win32Marshal.cs @@ -101,14 +101,14 @@ Common\Interop\Unix\Interop.Libraries.cs - - Common\CoreLib\Interop\Unix\Interop.Errors.cs + + Interop\Unix\Interop.Errors.cs Common\Interop\Unix\Interop.Fcntl.cs - - Common\CoreLib\Interop\Unix\Interop.IOErrors.cs + + Interop\Unix\Interop.IOErrors.cs Common\Interop\Unix\Interop.MMap.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/System.IO.Pipelines/src/System.IO.Pipelines.csproj b/src/System.IO.Pipelines/src/System.IO.Pipelines.csproj index 955bc0314acf..3283b1a7a96b 100644 --- a/src/System.IO.Pipelines/src/System.IO.Pipelines.csproj +++ b/src/System.IO.Pipelines/src/System.IO.Pipelines.csproj @@ -4,8 +4,8 @@ enable - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs diff --git a/src/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/System.IO.Pipes/src/System.IO.Pipes.csproj index 1161eedabcd1..966950885fa4 100644 --- a/src/System.IO.Pipes/src/System.IO.Pipes.csproj +++ b/src/System.IO.Pipes/src/System.IO.Pipes.csproj @@ -18,40 +18,40 @@ - - Common\CoreLib\System\IO\StreamHelpers.CopyValidation.cs + + System\IO\StreamHelpers.CopyValidation.cs - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.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\CoreLib\Interop\Windows\Interop.FreeLibrary.cs + + Interop\Windows\Interop.FreeLibrary.cs - - Common\CoreLib\Interop\Windows\Interop.SecurityOptions.cs + + Interop\Windows\Interop.SecurityOptions.cs - - Common\CoreLib\Microsoft\Win32\SafeLibraryHandle.cs + + Microsoft\Win32\SafeLibraryHandle.cs - - Common\CoreLib\Interop\Windows\Interop.BOOL.cs + + Interop\Windows\Interop.BOOL.cs - - Common\CoreLib\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs + + Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs Common\Interop\Windows\Interop.GenericOperations.cs @@ -65,17 +65,17 @@ Common\Interop\Windows\Interop.FileOperations.cs - - Common\CoreLib\Interop\Windows\Interop.FileTypes.cs + + Interop\Windows\Interop.FileTypes.cs - + Common\Interop\Windows\Interop.GetCurrentProcess.cs Common\Interop\Windows\Interop.DuplicateHandle_IntPtr.cs - - Common\CoreLib\Interop\Windows\Interop.GetFileType.cs + + Interop\Windows\Interop.GetFileType.cs Common\Interop\Windows\Interop.CreatePipe_SafePipeHandle.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,8 +128,8 @@ Common\Interop\Windows\Interop.ImpersonateNamedPipeClient.cs - - Common\CoreLib\System\IO\Win32Marshal.cs + + System\IO\Win32Marshal.cs @@ -150,8 +150,8 @@ Common\Interop\Windows\Interop.CreateNamedPipeClient.cs - - Common\CoreLib\Interop\Windows\Interop.LoadLibraryEx.cs + + Interop\Windows\Interop.LoadLibraryEx.cs @@ -167,13 +167,13 @@ Common\Interop\Unix\Interop.Libraries.cs - - Common\CoreLib\Interop\Unix\Interop.Errors.cs + + Interop\Unix\Interop.Errors.cs - - Common\CoreLib\Interop\Unix\Interop.IOErrors.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/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj index ac088e805067..2a465b192a5d 100644 --- a/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj +++ b/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj @@ -31,17 +31,17 @@ - - Common\CoreLib\Interop\Windows\Interop.CancelIoEx.cs + + Interop\Windows\Interop.CancelIoEx.cs - - Common\CoreLib\Interop\Windows\Interop.FreeLibrary.cs + + Interop\Windows\Interop.FreeLibrary.cs - - Common\CoreLib\Interop\Windows\Interop.LoadLibraryEx.cs + + Interop\Windows\Interop.LoadLibraryEx.cs - - Common\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs + + Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs Common\Interop\Windows\Interop.Errors.cs diff --git a/src/System.IO.Ports/src/System.IO.Ports.csproj b/src/System.IO.Ports/src/System.IO.Ports.csproj index f143f7d82558..05c5d7be85b3 100644 --- a/src/System.IO.Ports/src/System.IO.Ports.csproj +++ b/src/System.IO.Ports/src/System.IO.Ports.csproj @@ -77,38 +77,38 @@ Common\Interop\Windows\Kernel32\Interop.WaitCommEvent.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs + + Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_NativeOverlapped.cs + + Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_NativeOverlapped.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_IntPtr.cs + + Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_IntPtr.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_NativeOverlapped.cs + + Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_NativeOverlapped.cs Common\Interop\Windows\Kernel32\Interop.GetOverlappedResult.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.FlushFileBuffers.cs + + Interop\Windows\Kernel32\Interop.FlushFileBuffers.cs Common\Interop\Windows\Kernel32\Interop.GenericOperations.cs - - Common\CoreLib\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs + + Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs - - Common\CoreLib\Interop\Windows\Interop.FileTypes.cs + + Interop\Windows\Interop.FileTypes.cs Common\System\IO\PathInternal.Windows.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.GetFileType_SafeHandle.cs + + Interop\Windows\Kernel32\Interop.GetFileType_SafeHandle.cs Common\Interop\Windows\Interop.Libraries.cs @@ -116,17 +116,17 @@ Common\Interop\Windows\Interop.Errors.cs - - Common\CoreLib\Interop\Windows\Interop.BOOL.cs + + Interop\Windows\Interop.BOOL.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs + + Interop\Windows\Kernel32\Interop.CloseHandle.cs - - Common\CoreLib\System\IO\Win32Marshal.cs + + System\IO\Win32Marshal.cs - - Common\CoreLib\Interop\Windows\Interop.FormatMessage.cs + + Interop\Windows\Interop.FormatMessage.cs @@ -153,16 +153,16 @@ Common\Interop\Unix\Interop.Libraries.cs - + Common\Interop\Unix\Interop.Errors.cs - - Common\CoreLib\Interop\Unix\Interop.IOErrors.cs + + Interop\Unix\Interop.IOErrors.cs - + Interop\Unix\System.Native\Interop.Read.cs - + Interop\Unix\System.Native\Interop.Write.cs @@ -171,8 +171,8 @@ Interop\Unix\System.Native\Interop.Shutdown.cs - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs diff --git a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj index d3a049af02c5..8181d65ee431 100644 --- a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj +++ b/src/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/System.Management/src/System.Management.csproj b/src/System.Management/src/System.Management.csproj index 90ed4d8f475e..1b9bdb71d7c5 100644 --- a/src/System.Management/src/System.Management.csproj +++ b/src/System.Management/src/System.Management.csproj @@ -37,8 +37,8 @@ Common\Interop\Windows\Ole32\Interop.GetHGlobalFromStream.cs - - Common\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs + + Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs diff --git a/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj index c7f02597c97a..aba981d897a5 100644 --- a/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj +++ b/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj @@ -18,8 +18,8 @@ - - Common\CoreLib\System\IO\StreamHelpers.CopyValidation.cs + + System\IO\StreamHelpers.CopyValidation.cs Common\System\Net\Logging\NetEventSource.Common.cs diff --git a/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild b/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild index fadbcd94e92f..7addefcb8cc8 100644 --- a/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild +++ b/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild @@ -7,7 +7,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj index 065f6fa3cd3c..ee0555f63fae 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj +++ b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj @@ -39,8 +39,8 @@ Common\System\StringExtensions.cs - - Common\CoreLib\System\IO\StreamHelpers.CopyValidation.cs + + System\IO\StreamHelpers.CopyValidation.cs Common\System\Net\HttpKnownHeaderNames.cs @@ -81,8 +81,8 @@ Common\System\Threading\Tasks\RendezvousAwaitable.cs - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs ProductionCode\WinHttpAuthHelper.cs diff --git a/src/System.Net.Http/src/System.Net.Http.csproj b/src/System.Net.Http/src/System.Net.Http.csproj index b7b75b950fc9..94e627533e85 100644 --- a/src/System.Net.Http/src/System.Net.Http.csproj +++ b/src/System.Net.Http/src/System.Net.Http.csproj @@ -87,8 +87,8 @@ - - Common\CoreLib\System\IO\StreamHelpers.CopyValidation.cs + + System\IO\StreamHelpers.CopyValidation.cs Common\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs @@ -99,7 +99,7 @@ Common\System\IO\ReadOnlyMemoryStream.cs - + Common\System\Text\StringBuilderCache.cs @@ -360,8 +360,8 @@ Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs + + Interop\Windows\Kernel32\Interop.CloseHandle.cs Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs @@ -478,23 +478,23 @@ Common\System\Net\UriScheme.cs - - Common\CoreLib\Interop\Unix\Interop.Errors.cs + + Interop\Unix\Interop.Errors.cs - - Common\CoreLib\Interop\Unix\Interop.IOErrors.cs + + Interop\Unix\Interop.IOErrors.cs Common\Interop\Unix\Interop.Libraries.cs - - Common\CoreLib\Interop\Unix\System.Native\Interop.Close.cs + + Interop\Unix\System.Native\Interop.Close.cs - - Common\CoreLib\Interop\Unix\System.Native\Interop.Open.cs + + Interop\Unix\System.Native\Interop.Open.cs - - Common\CoreLib\Interop\Unix\System.Native\Interop.OpenFlags.cs + + Interop\Unix\System.Native\Interop.OpenFlags.cs Common\Interop\Unix\System.Native\Interop.Pipe.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,8 +538,8 @@ Common\System\Net\Security\CertificateHelper.Unix.cs - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs diff --git a/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj index 1a256d956c4a..271912ab05c6 100644 --- a/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj +++ b/src/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj @@ -20,11 +20,11 @@ ProductionCode\Common\System\StringExtensions.cs - + ProductionCode\Common\System\Text\StringBuilderCache.cs - - ProductionCode\Common\CoreLib\System\IO\StreamHelpers.CopyValidation.cs + + ProductionCode\System\IO\StreamHelpers.CopyValidation.cs ProductionCode\Common\System\Net\InternalException.cs @@ -86,8 +86,8 @@ ProductionCode\Common\src\System\Net\Mail\WhitespaceReader.cs - - ProductionCode\Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + ProductionCode\System\Threading\Tasks\TaskToApm.cs ProductionCode\System\Net\Http\SocketsHttpHandler\AuthenticationHelper.Digest.cs diff --git a/src/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/System.Net.HttpListener/src/System.Net.HttpListener.csproj index 280c784faf5e..c4ed00d9d1f3 100644 --- a/src/System.Net.HttpListener/src/System.Net.HttpListener.csproj +++ b/src/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,8 +140,8 @@ Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs - - Common\CoreLib\Interop\Windows\Interop.BOOL.cs + + Interop\Windows\Interop.BOOL.cs Common\Interop\Windows\WebSocket\Interop.Structs.cs @@ -188,7 +188,7 @@ Interop\Windows\Kernel32\Interop.SetFileCompletionNotificationModes.cs - + Common\Interop\Windows\mincore\Interop.CancelIoEx.cs @@ -197,8 +197,8 @@ Common\Interop\Windows\mincore\Interop.LoadLibraryEx.cs - - Common\CoreLib\Interop\Windows\mincore\Interop.SECURITY_ATTRIBUTES.cs + + Interop\Windows\mincore\Interop.SECURITY_ATTRIBUTES.cs Common\Interop\Windows\mincore_obsolete\Interop.LocalAlloc.cs @@ -209,8 +209,8 @@ Common\Interop\Windows\mincore_obsolete\Interop.LocalAlloc.Constants.cs - - Common\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs + + Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs @@ -283,8 +283,8 @@ Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs + + Interop\Windows\Kernel32\Interop.CloseHandle.cs Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs @@ -354,8 +354,8 @@ - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs diff --git a/src/System.Net.Mail/src/System.Net.Mail.csproj b/src/System.Net.Mail/src/System.Net.Mail.csproj index 7d9d9f71d2ba..cc8395c2859b 100644 --- a/src/System.Net.Mail/src/System.Net.Mail.csproj +++ b/src/System.Net.Mail/src/System.Net.Mail.csproj @@ -234,8 +234,8 @@ Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs + + Interop\Windows\Kernel32\Interop.CloseHandle.cs Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs diff --git a/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj b/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj index 7defd69e9854..fc5067ff2527 100644 --- a/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj +++ b/src/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj @@ -309,8 +309,8 @@ Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs + + Interop\Windows\Kernel32\Interop.CloseHandle.cs Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs diff --git a/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj index b5de51756e9e..a4b1b2b7f0f0 100644 --- a/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj +++ b/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj @@ -18,8 +18,8 @@ Common\System\Net\InternalException.cs - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs @@ -95,8 +95,8 @@ Interop\Windows\WinSock\Interop.GetAddrInfoExW.cs - - Common\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs + + Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs Interop\Windows\Kernel32\Interop.GetProcAddress.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/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj index 3e34b79740e2..7864e081a004 100644 --- a/src/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj +++ b/src/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/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj b/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj index 7a6818ec136a..e15558349399 100644 --- a/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj +++ b/src/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj @@ -40,8 +40,8 @@ Common\System\Net\InternalException.cs - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs \ No newline at end of file diff --git a/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj index 47a31c884e33..e522cfae9132 100644 --- a/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj +++ b/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj @@ -176,17 +176,17 @@ 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 - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs Common\System\IO\RowConfigReader.cs diff --git a/src/System.Net.Ping/src/System.Net.Ping.csproj b/src/System.Net.Ping/src/System.Net.Ping.csproj index a105795435f4..e27306855962 100644 --- a/src/System.Net.Ping/src/System.Net.Ping.csproj +++ b/src/System.Net.Ping/src/System.Net.Ping.csproj @@ -62,17 +62,17 @@ Common\System\Net\NetworkInformation\UnixCommandLinePing.cs - - Common\CoreLib\Interop\Unix\Interop.Errors.cs + + Interop\Unix\Interop.Errors.cs Common\Interop\Unix\Interop.Libraries.cs - - Common\CoreLib\Interop\Unix\System.Native\Interop.Close.cs + + Interop\Unix\System.Native\Interop.Close.cs - - Common\CoreLib\Interop\Unix\System.Native\Interop.ReadLink.cs + + Interop\Unix\System.Native\Interop.ReadLink.cs Common\Interop\Unix\System.Native\Interop.Socket.cs diff --git a/src/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj b/src/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj index 28c6ac58ce5f..458fc00ff17d 100644 --- a/src/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj +++ b/src/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj @@ -24,8 +24,8 @@ Common\Interop\Unix\Interop.Libraries.cs - - Common\CoreLib\Interop\Unix\System.Native\Interop.ReadLink.cs + + Interop\Unix\System.Native\Interop.ReadLink.cs Common\System\Net\NetworkInformation\UnixCommandLinePing.cs diff --git a/src/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/System.Net.Primitives/src/System.Net.Primitives.csproj index e706da9b8853..eb9b81c59936 100644 --- a/src/System.Net.Primitives/src/System.Net.Primitives.csproj +++ b/src/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,8 +164,8 @@ Common\System\Net\Sockets\SocketErrorPal.Unix.cs - - Common\CoreLib\Interop\Unix\Interop.Errors.cs + + Interop\Unix\Interop.Errors.cs Common\Interop\Unix\Interop.Libraries.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/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj index 55e21851ed76..946cfcf5179a 100644 --- a/src/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj +++ b/src/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,8 +137,8 @@ ProductionCode\Common\Interop\Interop.CheckedAccess.cs - - ProductionCode\Common\CoreLib\Interop\Unix\Interop.Errors.cs + + ProductionCode\Interop\Unix\Interop.Errors.cs ProductionCode\Common\Interop\Unix\Interop.Libraries.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/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj index 1bef2a941e4a..9813d55dd30c 100644 --- a/src/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj +++ b/src/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,8 +140,8 @@ ProductionCode\Common\Interop\Unix\Interop.Libraries.cs - - ProductionCode\Common\CoreLib\Interop\Unix\Interop.Errors.cs + + ProductionCode\Interop\Unix\Interop.Errors.cs ProductionCode\Common\Interop\Unix\System.Native\Interop.SocketAddress.cs diff --git a/src/System.Net.Quic/src/System.Net.Quic.csproj b/src/System.Net.Quic/src/System.Net.Quic.csproj index 676826e5f5d9..79613dd18ed6 100644 --- a/src/System.Net.Quic/src/System.Net.Quic.csproj +++ b/src/System.Net.Quic/src/System.Net.Quic.csproj @@ -18,8 +18,8 @@ - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs diff --git a/src/System.Net.Requests/src/System.Net.Requests.csproj b/src/System.Net.Requests/src/System.Net.Requests.csproj index 60dc9a8c24f9..47b9eb2a956e 100644 --- a/src/System.Net.Requests/src/System.Net.Requests.csproj +++ b/src/System.Net.Requests/src/System.Net.Requests.csproj @@ -84,8 +84,8 @@ Common\System\NotImplemented.cs - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs diff --git a/src/System.Net.Security/src/System.Net.Security.csproj b/src/System.Net.Security/src/System.Net.Security.csproj index 01fa58269d2e..b3387ad42fd2 100644 --- a/src/System.Net.Security/src/System.Net.Security.csproj +++ b/src/System.Net.Security/src/System.Net.Security.csproj @@ -82,8 +82,8 @@ Common\System\NotImplemented.cs - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs Common\System\Net\Security\SSPIHandleCache.cs @@ -180,8 +180,8 @@ Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs + + Interop\Windows\Kernel32\Interop.CloseHandle.cs Common\Interop\Windows\SChannel\Interop.Alerts.cs @@ -263,8 +263,8 @@ Common\Interop\Unix\Interop.Libraries.cs - - Common\CoreLib\Interop\Unix\Interop.Errors.cs + + Interop\Unix\Interop.Errors.cs Common\Interop\Unix\System.Net.Security.Native\Interop.Initialization.cs diff --git a/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj index 483512ead67e..4e1359477699 100644 --- a/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj +++ b/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj @@ -78,8 +78,8 @@ Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - - ProductionCode\Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + ProductionCode\System\Threading\Tasks\TaskToApm.cs diff --git a/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj index 4785f96f7aa8..61528feec156 100644 --- a/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj +++ b/src/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj @@ -67,8 +67,8 @@ Common\Interop\Windows\SChannel\Interop.Alerts.cs - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/System.Net.Sockets/src/System.Net.Sockets.csproj index 587ce63de645..7c00778ca816 100644 --- a/src/System.Net.Sockets/src/System.Net.Sockets.csproj +++ b/src/System.Net.Sockets/src/System.Net.Sockets.csproj @@ -47,8 +47,8 @@ - - Common\CoreLib\System\IO\StreamHelpers.CopyValidation.cs + + System\IO\StreamHelpers.CopyValidation.cs @@ -230,7 +230,7 @@ Interop\Windows\WinSock\WSABuffer.cs - + Common\Interop\Windows\Interop.CancelIoEx.cs @@ -269,11 +269,11 @@ Common\System\Net\Sockets\SocketErrorPal.Unix - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs - - Common\CoreLib\Interop\Unix\Interop.Errors.cs + + Interop\Unix\Interop.Errors.cs Interop\Unix\Interop.Libraries.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/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj index e4faca7b5554..30bc2508dad0 100644 --- a/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj +++ b/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj @@ -104,8 +104,8 @@ Common\System\Buffers\NativeMemoryManager.cs - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs Common\System\Diagnostics\Tracing\TestEventListener.cs diff --git a/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj b/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj index b5f6c0733660..90ec7b6954be 100644 --- a/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj +++ b/src/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/System.Private.Uri/src/System.Private.Uri.csproj b/src/System.Private.Uri/src/System.Private.Uri.csproj index 72e1c041266e..9685c4046303 100644 --- a/src/System.Private.Uri/src/System.Private.Uri.csproj +++ b/src/System.Private.Uri/src/System.Private.Uri.csproj @@ -37,8 +37,8 @@ - - Common\CoreLib\System\Text\ValueStringBuilder.cs + + System\Text\ValueStringBuilder.cs diff --git a/src/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj b/src/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj index aa688d4a55f2..339e73f7e3e9 100644 --- a/src/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj +++ b/src/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj @@ -16,8 +16,8 @@ - - Common\CoreLib\System\Text\ValueStringBuilder.cs + + System\Text\ValueStringBuilder.cs diff --git a/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj b/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj index 0191e3279506..5c5c6259fc0b 100644 --- a/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj +++ b/src/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj @@ -9,7 +9,7 @@ System\Collections\Generic\EnumerableHelpers.cs - + System\Text\StringBuilderCache.cs diff --git a/src/System.Private.Xml/src/System.Private.Xml.csproj b/src/System.Private.Xml/src/System.Private.Xml.csproj index a9f2bf42e156..1c402cd20d6b 100644 --- a/src/System.Private.Xml/src/System.Private.Xml.csproj +++ b/src/System.Private.Xml/src/System.Private.Xml.csproj @@ -8,7 +8,7 @@ netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release - + System\StringBuilderCache.cs @@ -796,8 +796,8 @@ - - Common\CoreLib\System\LocalAppContextSwitches.Common.cs + + System\LocalAppContextSwitches.Common.cs diff --git a/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj index 1f32a4e16c05..ae5d72a5a589 100644 --- a/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -11,8 +11,8 @@ Common\Interop\Windows\Interop.Libraries.cs - - Common\CoreLib\Interop\Windows\kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs + + Interop\Windows\kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs diff --git a/src/System.Resources.Extensions/src/System.Resources.Extensions.csproj b/src/System.Resources.Extensions/src/System.Resources.Extensions.csproj index 14787f0603b2..5f4489cca048 100644 --- a/src/System.Resources.Extensions/src/System.Resources.Extensions.csproj +++ b/src/System.Resources.Extensions/src/System.Resources.Extensions.csproj @@ -9,17 +9,17 @@ - - - - - + + + + + - + System\Numerics\Hashing\HashHelpers.cs diff --git a/src/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj b/src/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj index cee9e53e5ea7..7d530ac6ff80 100644 --- a/src/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj +++ b/src/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj @@ -7,7 +7,7 @@ - + System\Numerics\Hashing\HashHelpers.cs diff --git a/src/System.Resources.Writer/src/System.Resources.Writer.csproj b/src/System.Resources.Writer/src/System.Resources.Writer.csproj index 67ee3c29fd56..bf05d2a8416e 100644 --- a/src/System.Resources.Writer/src/System.Resources.Writer.csproj +++ b/src/System.Resources.Writer/src/System.Resources.Writer.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj index ac6cd80ab2cf..83f5a69f341d 100644 --- a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj +++ b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj @@ -36,27 +36,27 @@ - - Common\CoreLib\System\IO\StreamHelpers.CopyValidation.cs + + System\IO\StreamHelpers.CopyValidation.cs - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs Common\System\HResults.cs - + CoreLib\System\Text\ValueStringBuilder.cs - - Common\CoreLib\Interop\Windows\Interop.BOOL.cs + + Interop\Windows\Interop.BOOL.cs - - Common\CoreLib\System\IO\Win32Marshal.cs + + System\IO\Win32Marshal.cs Common\Interop\Windows\Interop.Libraries.cs @@ -64,46 +64,46 @@ Common\Interop\Windows\Interop.Errors.cs - + Common\Interop\Windows\Interop.BOOLEAN.cs Common\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs - + Common\Interop\Windows\kernel32\Interop.FormatMessage.cs - + Common\Interop\Windows\Kernel32\Interop.GetCurrentDirectory.cs - + Common\Interop\Windows\Interop.GetLogicalDrives.cs - + Common\Interop\Windows\Kernel32\Interop.GetSystemDirectoryW.cs - + Common\Interop\Windows\Kernel32\Interop.QueryPerformanceCounter.cs - + Common\Interop\Windows\Kernel32\Interop.QueryPerformanceFrequency.cs - + Common\Interop\Windows\Kernel32\Interop.SetCurrentDirectory.cs - + CoreLib\System\IO\PathHelper.Windows.cs - + CoreLib\System\IO\PathInternal.cs - + CoreLib\System\IO\PathInternal.Windows.cs - + CoreLib\Interop\Windows\Kernel32\Interop.GetLongPathNameW.cs - + CoreLib\Interop\Windows\Kernel32\Interop.GetFullPathNameW.cs @@ -116,61 +116,61 @@ Common\Interop\Unix\Interop.Libraries.cs - - Common\CoreLib\Interop\Unix\Interop.Errors.cs + + Interop\Unix\Interop.Errors.cs - - Common\CoreLib\Interop\Unix\Interop.IOErrors.cs + + Interop\Unix\Interop.IOErrors.cs Common\Interop\Unix\System.Native\Interop.GetPid.cs - + Common\Interop\Unix\System.Native\Interop.ChDir.cs - - Common\CoreLib\Interop\Unix\System.Native\Interop.Close.cs + + Interop\Unix\System.Native\Interop.Close.cs - - Common\CoreLib\Interop\Unix\System.Native\Interop.GetCwd.cs + + Interop\Unix\System.Native\Interop.GetCwd.cs - + Common\Interop\Unix\System.Native\Interop.GetEUid.cs - + Common\Interop\Unix\System.Native\Interop.GetHostName.cs - + Common\Interop\Unix\System.Native\Interop.GetTimestamp.cs - + Common\Interop\Unix\System.Native\Interop.GetPwUid.cs - + Common\Interop\Unix\System.Native\Interop.GetUnixName.cs - + Common\Interop\Unix\System.Native\Interop.GetUnixRelease.cs - - Common\CoreLib\Interop\Unix\System.Native\Interop.MksTemps.cs + + Interop\Unix\System.Native\Interop.MksTemps.cs - + Common\Interop\Unix\System.Native\Interop.MountPoints.cs - - Common\CoreLib\Interop\Unix\System.Native\Interop.PathConf.cs + + Interop\Unix\System.Native\Interop.PathConf.cs - + Common\Interop\Unix\System.Native\Interop.SysConf.cs - + Common\System\IO\DriveInfoInternal.Unix.cs - + Common\System\IO\PersistedFiles.Unix.cs - + Common\System\IO\PersistedFiles.Unix.cs diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj index aa29c2e24d1d..4792f43d8fd8 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj +++ b/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj @@ -12,7 +12,7 @@ - + Common\Interop\Unix\System.Native\Interop.GetUnixName.cs @@ -47,10 +47,10 @@ Common\Interop\Windows\Kernel32\Interop.GetNativeSystemInfo.cs - + Common\Interop\Windows\Kernel32\Interop.SYSTEM_INFO.cs - + Common\Interop\Windows\Kernel32\Interop.GetSystemInfo.cs diff --git a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj index f7ab49c18f6a..d6d97e5959eb 100644 --- a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj +++ b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj @@ -8,8 +8,8 @@ netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release - - Common\CoreLib\System\HResults.cs + + System\HResults.cs Common\Interop\Interop.Libraries.cs diff --git a/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj b/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj index 807ef1738e45..1533facd8dac 100644 --- a/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj +++ b/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj @@ -23,7 +23,7 @@ System\Globalization\FormatProvider.Number.cs - + CoreLib\System\Text\ValueStringBuilder.cs diff --git a/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj b/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj index f4a4d09c0354..062eb38e2575 100644 --- a/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj +++ b/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj @@ -55,7 +55,7 @@ - + Common\System\Collections\HashHelpers.cs diff --git a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj index 88479df2fa97..ce31f9f13b05 100644 --- a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj +++ b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj @@ -89,13 +89,13 @@ Common\System\Runtime\InteropServices\WindowsRuntime\WindowsRuntimeImportAttribute.cs - + Common\System\WinRTFolderPaths.cs - + Common\Interop\Windows\kernel32\Interop.ResolveLocaleName.cs - + Common\Interop\Windows\kernel32\Interop.FormatMessage.cs @@ -107,8 +107,8 @@ Common\Interop\Windows\Interop.Errors.cs - - Common\CoreLib\System\IO\Win32Marshal.cs + + System\IO\Win32Marshal.cs diff --git a/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj index caafc00c7faf..1079481b856c 100644 --- a/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj +++ b/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj @@ -80,7 +80,7 @@ Common\Interop\Interop.GetSecurityDescriptorLength.cs - + Common\Interop\Interop.CloseHandle.cs @@ -89,7 +89,7 @@ Common\Interop\Interop.OpenProcessToken_IntPtrs.cs - + Common\Interop\Interop.GetCurrentProcess_IntPtr.cs diff --git a/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj b/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj index 45915d896501..d46e3782f67b 100644 --- a/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj +++ b/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj @@ -306,11 +306,11 @@ Common\Interop\Windows\BCrypt\Cng.cs - - Common\CoreLib\Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs + + Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs - - Common\CoreLib\Interop\Windows\BCrypt\Interop.NTSTATUS.cs + + Interop\Windows\BCrypt\Interop.NTSTATUS.cs Common\Interop\Windows\BCrypt\Interop.AsymmetricEncryption.Types.cs @@ -423,7 +423,7 @@ Internal\Cryptography\Windows\ErrorCodeHelper.cs - + Internal\Windows\kernel32\Interop.FormatMessage.cs diff --git a/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj b/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj index 69ce18168544..bcb40e96caf4 100644 --- a/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj +++ b/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj @@ -76,8 +76,8 @@ Interop\Windows\BCrypt\Cng.cs - - Common\CoreLib\Interop\Windows\BCrypt\Interop.NTSTATUS.cs + + Interop\Windows\BCrypt\Interop.NTSTATUS.cs Interop\Windows\BCrypt\Interop.AsymmetricEncryption.Types.cs @@ -175,7 +175,7 @@ Internal\Windows\NCrypt\Interop.UiPolicy.cs - + Internal\Windows\kernel32\Interop.FormatMessage.cs diff --git a/src/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj b/src/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj index 8c825c86cb84..95261cad5df1 100644 --- a/src/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj +++ b/src/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj @@ -139,7 +139,7 @@ Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs - + Common\Interop\Windows\kernel32\Interop.FormatMessage.cs diff --git a/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj b/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj index 12083ff8d249..d414a4162bca 100644 --- a/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj +++ b/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj @@ -28,8 +28,8 @@ - - Common\CoreLib\Interop\Windows\BCrypt\Interop.NTSTATUS.cs + + Interop\Windows\BCrypt\Interop.NTSTATUS.cs Microsoft\Win32\SafeHandles\SafeBCryptHandle.cs @@ -49,7 +49,7 @@ Internal\Cryptography\Windows\CryptoThrowHelper.cs - + Internal\Windows\kernel32\Interop.FormatMessage.cs diff --git a/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj index d517d40085ed..f04c21fce64f 100644 --- a/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -350,7 +350,7 @@ Common\Interop\Windows\Crypt32\Interop.MsgEncodingType.cs - + Common\Interop\Windows\kernel32\Interop.FormatMessage.cs diff --git a/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj b/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj index d99826543288..7d1f7ab49758 100644 --- a/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj +++ b/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj @@ -39,8 +39,8 @@ Common\System\Security\Cryptography\Oids.cs - - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + + System\Threading\Tasks\TaskToApm.cs diff --git a/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj b/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj index 7aed1754d9e6..5eea76bc184b 100644 --- a/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj +++ b/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj @@ -28,7 +28,7 @@ Internal\Cryptography\Windows\CryptoThrowHelper.cs - + Internal\Windows\kernel32\Interop.FormatMessage.cs diff --git a/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj b/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj index e1ae3bef2077..b7e1982a9b89 100644 --- a/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj +++ b/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj @@ -267,7 +267,7 @@ Common\Internal\Cryptography\Windows\CryptoThrowHelper.cs - + Common\Internal\Windows\kernel32\Interop.FormatMessage.cs @@ -285,8 +285,8 @@ Common\Interop\Windows\BCrypt\Interop.Blobs.cs - - Common\CoreLib\Interop\Windows\BCrypt\Interop.NTSTATUS.cs + + Interop\Windows\BCrypt\Interop.NTSTATUS.cs Common\Microsoft\Win32\SafeHandles\SafeBCryptHandle.cs @@ -337,11 +337,11 @@ Common\Interop\Unix\Interop.Libraries.cs - - Common\CoreLib\Interop\Unix\Interop.Errors.cs + + Interop\Unix\Interop.Errors.cs - - Common\CoreLib\Interop\Unix\System.Native\Interop.Permissions.cs + + Interop\Unix\System.Native\Interop.Permissions.cs Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs @@ -394,20 +394,20 @@ Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509StoreCtx.cs - + Common\Interop\Unix\Interop.Close.cs Common\Interop\Unix\System.Native\Interop.FChMod.cs - + Common\Interop\Unix\Interop.GetEUid.cs - + Common\Interop\Unix\Interop.GetPwUid.cs - - Common\CoreLib\Interop\Unix\System.Native\Interop.Stat.cs + + Interop\Unix\System.Native\Interop.Stat.cs Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Crypto.cs @@ -445,10 +445,10 @@ Common\System\Collections\Generic\ReferenceEqualityComparer.cs - + Common\System\IO\PersistedFiles.Unix.cs - + Common\System\IO\PersistedFiles.Names.Unix.cs diff --git a/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj index 1a1fff82d707..32669f39f55b 100644 --- a/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj +++ b/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj @@ -68,28 +68,28 @@ Common\Interop\Unix\Interop.Libraries.cs - - Common\CoreLib\Interop\Unix\Interop.Errors.cs + + Interop\Unix\Interop.Errors.cs - + Common\Interop\Unix\Interop.GetEUid.cs - + Common\Interop\Unix\Interop.GetPwUid.cs Common\Interop\Unix\System.Native\Interop.FChMod.cs - - Common\CoreLib\Interop\Unix\System.Native\Interop.Permissions.cs + + Interop\Unix\System.Native\Interop.Permissions.cs - - Common\CoreLib\Interop\Unix\System.Native\Interop.Stat.cs + + Interop\Unix\System.Native\Interop.Stat.cs - + Common\System\IO\PersistedFiles.Unix.cs - + Common\System\IO\PersistedFiles.Names.Unix.cs diff --git a/src/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/System.Security.Permissions/src/System.Security.Permissions.csproj index 66ad5075c174..c1da6a11b8e7 100644 --- a/src/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -180,14 +180,14 @@ - - Common\CoreLib\System\Security\IStackWalk.cs + + System\Security\IStackWalk.cs - - Common\CoreLib\System\Security\PermissionSet.cs + + System\Security\PermissionSet.cs - - Common\CoreLib\System\Security\Permissions\PermissionState.cs + + System\Security\Permissions\PermissionState.cs diff --git a/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj index 029ca9c5eb4d..4f9ea07b4a41 100644 --- a/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj +++ b/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj @@ -45,7 +45,7 @@ Common\Interop\Interop.SECURITY_LOGON_SESSION_DATA.cs - + Common\Interop\Interop.GetCurrentProcess.cs @@ -66,7 +66,7 @@ Common\Interop\Interop.DuplicateHandle.cs - + Common\Interop\Interop.CloseHandle.cs diff --git a/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj index af80a27d864b..cb5766c8fc15 100644 --- a/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -7,8 +7,8 @@ net461-Windows_NT-Debug;net461-Windows_NT-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-Windows_NT-Debug;netstandard2.0-Windows_NT-Release - - Common\CoreLib\System\Text\ValueStringBuilder.cs + + System\Text\ValueStringBuilder.cs Common\Interop\Windows\Interop.Libraries.cs diff --git a/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj index 156986efee99..de037b16cfce 100644 --- a/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj +++ b/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj @@ -33,17 +33,17 @@ Common\Interop\Windows\Interop.Libraries.cs - - Common\CoreLib\Interop\Windows\Interop.BOOL.cs + + Interop\Windows\Interop.BOOL.cs Common\Interop\Windows\Interop.GetCPInfoEx.cs - - Common\CoreLib\Interop\Windows\Interop.MAX_PATH.cs + + Interop\Windows\Interop.MAX_PATH.cs - - Common\CoreLib\Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs + + Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs diff --git a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj index 9d1cf95e278b..d795c463a476 100644 --- a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj +++ b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj @@ -27,10 +27,10 @@ - + System\Text\UnicodeDebug.cs - + System\Text\UnicodeUtility.cs diff --git a/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj b/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj index 4c29d0684230..11526d9f5e40 100644 --- a/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj +++ b/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj @@ -45,10 +45,10 @@ - + System\Text\UnicodeDebug.cs - + System\Text\UnicodeUtility.cs diff --git a/src/System.Text.Json/src/System.Text.Json.csproj b/src/System.Text.Json/src/System.Text.Json.csproj index 1d3e953b5128..72f632b33761 100644 --- a/src/System.Text.Json/src/System.Text.Json.csproj +++ b/src/System.Text.Json/src/System.Text.Json.csproj @@ -165,7 +165,7 @@ - + Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs diff --git a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj index 81e113877600..63df87b828da 100644 --- a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj +++ b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj @@ -46,10 +46,10 @@ Common\System\NotImplemented.cs - + Common\System\Collections\Generic\ValueListBuilder.cs - + Common\System\Text\ValueStringBuilder.cs diff --git a/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj index 44aa39c63825..252657132d1e 100644 --- a/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj +++ b/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj @@ -7,19 +7,19 @@ true - + - - - - - - - - - + + + + + + + + + diff --git a/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj b/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj index 3974171d2b43..61627c75b254 100644 --- a/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj +++ b/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj @@ -3,8 +3,8 @@ netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release - - + + diff --git a/src/System.Windows.Extensions/src/System.Windows.Extensions.csproj b/src/System.Windows.Extensions/src/System.Windows.Extensions.csproj index 796e36db5de1..31d5f9a4d74d 100644 --- a/src/System.Windows.Extensions/src/System.Windows.Extensions.csproj +++ b/src/System.Windows.Extensions/src/System.Windows.Extensions.csproj @@ -59,7 +59,7 @@ - + CoreLib\System\Text\ValueStringBuilder.cs