From 9e317253ac78dbc615206274efafa74099e13889 Mon Sep 17 00:00:00 2001 From: Stephen Toub Date: Thu, 17 Jan 2019 15:47:21 -0500 Subject: [PATCH] Move Environment to shared CoreLib Rather than having Environment partially live in corefx and call into an EnvironmentAugments type in CoreLib that in turn calls into an Environment type in CoreLib, we're just moving Environment to live in CoreLib. To start that, this PR moves Environment and its dependencies from their current locations into the shared CoreLib. Those changes will mirror over to coreclr. After that, I'll fix it up to work in CoreLib. And once those changes are built and available back to corefx, I'll update System.Runtime.Extensions to just use the functionality from CoreLib and delete remaining unnecessary code from corefx. --- .../Unix/System.Native/Interop.Access.cs | 0 .../Unix/System.Native/Interop.ChDir.cs | 0 .../Unix/System.Native/Interop.GetEUid.cs | 0 .../Unix/System.Native/Interop.GetHostName.cs | 0 .../Unix/System.Native/Interop.GetPwUid.cs | 0 .../Unix/System.Native/Interop.GetUnixName.cs | 0 .../System.Native/Interop.GetUnixRelease.cs | 0 .../Unix/System.Native/Interop.MountPoints.cs | 0 .../Unix/System.Native/Interop.SysConf.cs | 0 .../Advapi32}/Interop.LookupAccountNameW.cs | 0 .../Interop/Windows/Interop.BOOLEAN.cs | 0 .../Interop/Windows/Interop.Libraries.cs | 2 + .../Interop.ExpandEnvironmentStrings.cs | 0 .../Kernel32}/Interop.GetComputerName.cs | 0 .../Kernel32}/Interop.GetCurrentDirectory.cs | 0 .../Interop.GetCurrentProcess_IntPtr.cs | 0 .../Kernel32/Interop.GetLogicalDrives.cs} | 0 .../Kernel32}/Interop.GetSystemDirectoryW.cs | 0 .../Kernel32}/Interop.GetSystemInfo.cs | 0 .../Kernel32}/Interop.GetVersionExW.cs | 0 .../Interop.IsWow64Process_IntPtr.cs | 0 .../Windows/Kernel32}/Interop.SYSTEM_INFO.cs | 0 .../Kernel32}/Interop.SetCurrentDirectory.cs | 0 .../Secur32}/Interop.GetUserNameExW.cs | 0 .../Shell32}/Interop.SHGetKnownFolderPath.cs | 0 .../System/Environment.SpecialFolder.cs | 0 .../System/Environment.SpecialFolderOption.cs | 0 .../src/CoreLib}/System/Environment.Unix.cs | 0 .../src/CoreLib}/System/Environment.Win32.cs | 0 .../src/CoreLib}/System/Environment.WinRT.cs | 0 .../CoreLib}/System/Environment.Windows.cs | 0 .../src/CoreLib}/System/Environment.cs | 0 .../System/IO/DriveInfoInternal.Unix.cs | 0 .../System/IO/DriveInfoInternal.Windows.cs} | 0 .../System/IO/PersistedFiles.Names.Unix.cs | 0 .../System/IO/PersistedFiles.Unix.cs | 0 .../src/CoreLib}/System/OperatingSystem.cs | 0 .../System/PasteArguments.Unix.cs | 0 .../System/PasteArguments.Windows.cs | 0 .../{ => CoreLib}/System/PasteArguments.cs | 0 .../src/CoreLib}/System/PlatformID.cs | 0 src/Common/tests/Common.Tests.csproj | 14 +-- .../src/CoreFx.Private.TestUtilities.csproj | 16 +-- .../src/Microsoft.IO.Redist.csproj | 10 +- src/System.Console/src/System.Console.csproj | 10 +- ...stem.Diagnostics.PerformanceCounter.csproj | 2 +- .../src/System.Diagnostics.Process.csproj | 16 +-- ...iagnostics.Process.PerformanceTests.csproj | 6 +- .../System.Diagnostics.Process.Tests.csproj | 14 +-- .../src/System.IO.FileSystem.DriveInfo.csproj | 12 +- .../src/System.IO.FileSystem.csproj | 16 +-- .../src/System.IO.MemoryMappedFiles.csproj | 6 +- .../src/System.IO.Pipes.csproj | 6 +- .../src/System.Net.NameResolution.csproj | 2 +- ...System.Net.NameResolution.Pal.Tests.csproj | 2 +- .../src/System.Net.NetworkInformation.csproj | 2 +- .../src/System.Net.Primitives.csproj | 2 +- .../System.Net.Primitives.Pal.Tests.csproj | 2 +- .../src/System.Runtime.Extensions.csproj | 108 ++++++++++-------- ....InteropServices.RuntimeInformation.csproj | 8 +- .../src/System.Security.AccessControl.csproj | 4 +- ...urity.Cryptography.X509Certificates.csproj | 8 +- ...Cryptography.X509Certificates.Tests.csproj | 10 +- .../System.Security.Principal.Windows.csproj | 4 +- 64 files changed, 151 insertions(+), 131 deletions(-) rename src/Common/src/{ => CoreLib}/Interop/Unix/System.Native/Interop.Access.cs (100%) rename src/Common/src/{ => CoreLib}/Interop/Unix/System.Native/Interop.ChDir.cs (100%) rename src/Common/src/{ => CoreLib}/Interop/Unix/System.Native/Interop.GetEUid.cs (100%) rename src/Common/src/{ => CoreLib}/Interop/Unix/System.Native/Interop.GetHostName.cs (100%) rename src/Common/src/{ => CoreLib}/Interop/Unix/System.Native/Interop.GetPwUid.cs (100%) rename src/Common/src/{ => CoreLib}/Interop/Unix/System.Native/Interop.GetUnixName.cs (100%) rename src/Common/src/{ => CoreLib}/Interop/Unix/System.Native/Interop.GetUnixRelease.cs (100%) rename src/Common/src/{ => CoreLib}/Interop/Unix/System.Native/Interop.MountPoints.cs (100%) rename src/Common/src/{ => CoreLib}/Interop/Unix/System.Native/Interop.SysConf.cs (100%) rename src/Common/src/{Interop/Windows/advapi32 => CoreLib/Interop/Windows/Advapi32}/Interop.LookupAccountNameW.cs (100%) rename src/Common/src/{ => CoreLib}/Interop/Windows/Interop.BOOLEAN.cs (100%) rename src/Common/src/{Interop/Windows/kernel32 => CoreLib/Interop/Windows/Kernel32}/Interop.ExpandEnvironmentStrings.cs (100%) rename src/Common/src/{Interop/Windows/kernel32 => CoreLib/Interop/Windows/Kernel32}/Interop.GetComputerName.cs (100%) rename src/Common/src/{Interop/Windows/kernel32 => CoreLib/Interop/Windows/Kernel32}/Interop.GetCurrentDirectory.cs (100%) rename src/Common/src/{Interop/Windows/kernel32 => CoreLib/Interop/Windows/Kernel32}/Interop.GetCurrentProcess_IntPtr.cs (100%) rename src/Common/src/{Interop/Windows/kernel32/Interop.GetLogicalDrive.cs => CoreLib/Interop/Windows/Kernel32/Interop.GetLogicalDrives.cs} (100%) rename src/Common/src/{Interop/Windows/kernel32 => CoreLib/Interop/Windows/Kernel32}/Interop.GetSystemDirectoryW.cs (100%) rename src/Common/src/{Interop/Windows/kernel32 => CoreLib/Interop/Windows/Kernel32}/Interop.GetSystemInfo.cs (100%) rename src/Common/src/{Interop/Windows/kernel32 => CoreLib/Interop/Windows/Kernel32}/Interop.GetVersionExW.cs (100%) rename src/Common/src/{Interop/Windows/kernel32 => CoreLib/Interop/Windows/Kernel32}/Interop.IsWow64Process_IntPtr.cs (100%) rename src/Common/src/{Interop/Windows/kernel32 => CoreLib/Interop/Windows/Kernel32}/Interop.SYSTEM_INFO.cs (100%) rename src/Common/src/{Interop/Windows/kernel32 => CoreLib/Interop/Windows/Kernel32}/Interop.SetCurrentDirectory.cs (100%) rename src/Common/src/{Interop/Windows/secur32 => CoreLib/Interop/Windows/Secur32}/Interop.GetUserNameExW.cs (100%) rename src/Common/src/{Interop/Windows/shell32 => CoreLib/Interop/Windows/Shell32}/Interop.SHGetKnownFolderPath.cs (100%) rename src/{System.Runtime.Extensions/src => Common/src/CoreLib}/System/Environment.SpecialFolder.cs (100%) rename src/{System.Runtime.Extensions/src => Common/src/CoreLib}/System/Environment.SpecialFolderOption.cs (100%) rename src/{System.Runtime.Extensions/src => Common/src/CoreLib}/System/Environment.Unix.cs (100%) rename src/{System.Runtime.Extensions/src => Common/src/CoreLib}/System/Environment.Win32.cs (100%) rename src/{System.Runtime.Extensions/src => Common/src/CoreLib}/System/Environment.WinRT.cs (100%) rename src/{System.Runtime.Extensions/src => Common/src/CoreLib}/System/Environment.Windows.cs (100%) rename src/{System.Runtime.Extensions/src => Common/src/CoreLib}/System/Environment.cs (100%) rename src/Common/src/{ => CoreLib}/System/IO/DriveInfoInternal.Unix.cs (100%) rename src/Common/src/{System/IO/DriveInfoInternal.Win32.cs => CoreLib/System/IO/DriveInfoInternal.Windows.cs} (100%) rename src/Common/src/{ => CoreLib}/System/IO/PersistedFiles.Names.Unix.cs (100%) rename src/Common/src/{ => CoreLib}/System/IO/PersistedFiles.Unix.cs (100%) rename src/{System.Runtime.Extensions/src => Common/src/CoreLib}/System/OperatingSystem.cs (100%) rename src/Common/src/{ => CoreLib}/System/PasteArguments.Unix.cs (100%) rename src/Common/src/{ => CoreLib}/System/PasteArguments.Windows.cs (100%) rename src/Common/src/{ => CoreLib}/System/PasteArguments.cs (100%) rename src/{System.Runtime.Extensions/src => Common/src/CoreLib}/System/PlatformID.cs (100%) diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.Access.cs b/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.Access.cs similarity index 100% rename from src/Common/src/Interop/Unix/System.Native/Interop.Access.cs rename to src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.Access.cs diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.ChDir.cs b/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.ChDir.cs similarity index 100% rename from src/Common/src/Interop/Unix/System.Native/Interop.ChDir.cs rename to src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.ChDir.cs diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.GetEUid.cs b/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.GetEUid.cs similarity index 100% rename from src/Common/src/Interop/Unix/System.Native/Interop.GetEUid.cs rename to src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.GetEUid.cs diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.GetHostName.cs b/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.GetHostName.cs similarity index 100% rename from src/Common/src/Interop/Unix/System.Native/Interop.GetHostName.cs rename to src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.GetHostName.cs diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.GetPwUid.cs b/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.GetPwUid.cs similarity index 100% rename from src/Common/src/Interop/Unix/System.Native/Interop.GetPwUid.cs rename to src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.GetPwUid.cs diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.GetUnixName.cs b/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.GetUnixName.cs similarity index 100% rename from src/Common/src/Interop/Unix/System.Native/Interop.GetUnixName.cs rename to src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.GetUnixName.cs diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.GetUnixRelease.cs b/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.GetUnixRelease.cs similarity index 100% rename from src/Common/src/Interop/Unix/System.Native/Interop.GetUnixRelease.cs rename to src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.GetUnixRelease.cs diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.cs b/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.MountPoints.cs similarity index 100% rename from src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.cs rename to src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.MountPoints.cs diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.SysConf.cs b/src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.SysConf.cs similarity index 100% rename from src/Common/src/Interop/Unix/System.Native/Interop.SysConf.cs rename to src/Common/src/CoreLib/Interop/Unix/System.Native/Interop.SysConf.cs diff --git a/src/Common/src/Interop/Windows/advapi32/Interop.LookupAccountNameW.cs b/src/Common/src/CoreLib/Interop/Windows/Advapi32/Interop.LookupAccountNameW.cs similarity index 100% rename from src/Common/src/Interop/Windows/advapi32/Interop.LookupAccountNameW.cs rename to src/Common/src/CoreLib/Interop/Windows/Advapi32/Interop.LookupAccountNameW.cs diff --git a/src/Common/src/Interop/Windows/Interop.BOOLEAN.cs b/src/Common/src/CoreLib/Interop/Windows/Interop.BOOLEAN.cs similarity index 100% rename from src/Common/src/Interop/Windows/Interop.BOOLEAN.cs rename to src/Common/src/CoreLib/Interop/Windows/Interop.BOOLEAN.cs diff --git a/src/Common/src/CoreLib/Interop/Windows/Interop.Libraries.cs b/src/Common/src/CoreLib/Interop/Windows/Interop.Libraries.cs index 398d18a2a0d2..8cbc8bfb266b 100644 --- a/src/Common/src/CoreLib/Interop/Windows/Interop.Libraries.cs +++ b/src/Common/src/CoreLib/Interop/Windows/Interop.Libraries.cs @@ -14,5 +14,7 @@ internal static partial class Libraries internal const string OleAut32 = "oleaut32.dll"; internal const string User32 = "user32.dll"; internal const string NtDll = "ntdll.dll"; + internal const string Secur32 = "secur32.dll"; + internal const string Shell32 = "shell32.dll"; } } diff --git a/src/Common/src/Interop/Windows/kernel32/Interop.ExpandEnvironmentStrings.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.ExpandEnvironmentStrings.cs similarity index 100% rename from src/Common/src/Interop/Windows/kernel32/Interop.ExpandEnvironmentStrings.cs rename to src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.ExpandEnvironmentStrings.cs diff --git a/src/Common/src/Interop/Windows/kernel32/Interop.GetComputerName.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetComputerName.cs similarity index 100% rename from src/Common/src/Interop/Windows/kernel32/Interop.GetComputerName.cs rename to src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetComputerName.cs diff --git a/src/Common/src/Interop/Windows/kernel32/Interop.GetCurrentDirectory.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetCurrentDirectory.cs similarity index 100% rename from src/Common/src/Interop/Windows/kernel32/Interop.GetCurrentDirectory.cs rename to src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetCurrentDirectory.cs diff --git a/src/Common/src/Interop/Windows/kernel32/Interop.GetCurrentProcess_IntPtr.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetCurrentProcess_IntPtr.cs similarity index 100% rename from src/Common/src/Interop/Windows/kernel32/Interop.GetCurrentProcess_IntPtr.cs rename to src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetCurrentProcess_IntPtr.cs diff --git a/src/Common/src/Interop/Windows/kernel32/Interop.GetLogicalDrive.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetLogicalDrives.cs similarity index 100% rename from src/Common/src/Interop/Windows/kernel32/Interop.GetLogicalDrive.cs rename to src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetLogicalDrives.cs diff --git a/src/Common/src/Interop/Windows/kernel32/Interop.GetSystemDirectoryW.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetSystemDirectoryW.cs similarity index 100% rename from src/Common/src/Interop/Windows/kernel32/Interop.GetSystemDirectoryW.cs rename to src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetSystemDirectoryW.cs diff --git a/src/Common/src/Interop/Windows/kernel32/Interop.GetSystemInfo.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetSystemInfo.cs similarity index 100% rename from src/Common/src/Interop/Windows/kernel32/Interop.GetSystemInfo.cs rename to src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetSystemInfo.cs diff --git a/src/Common/src/Interop/Windows/kernel32/Interop.GetVersionExW.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetVersionExW.cs similarity index 100% rename from src/Common/src/Interop/Windows/kernel32/Interop.GetVersionExW.cs rename to src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetVersionExW.cs diff --git a/src/Common/src/Interop/Windows/kernel32/Interop.IsWow64Process_IntPtr.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.IsWow64Process_IntPtr.cs similarity index 100% rename from src/Common/src/Interop/Windows/kernel32/Interop.IsWow64Process_IntPtr.cs rename to src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.IsWow64Process_IntPtr.cs diff --git a/src/Common/src/Interop/Windows/kernel32/Interop.SYSTEM_INFO.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.SYSTEM_INFO.cs similarity index 100% rename from src/Common/src/Interop/Windows/kernel32/Interop.SYSTEM_INFO.cs rename to src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.SYSTEM_INFO.cs diff --git a/src/Common/src/Interop/Windows/kernel32/Interop.SetCurrentDirectory.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.SetCurrentDirectory.cs similarity index 100% rename from src/Common/src/Interop/Windows/kernel32/Interop.SetCurrentDirectory.cs rename to src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.SetCurrentDirectory.cs diff --git a/src/Common/src/Interop/Windows/secur32/Interop.GetUserNameExW.cs b/src/Common/src/CoreLib/Interop/Windows/Secur32/Interop.GetUserNameExW.cs similarity index 100% rename from src/Common/src/Interop/Windows/secur32/Interop.GetUserNameExW.cs rename to src/Common/src/CoreLib/Interop/Windows/Secur32/Interop.GetUserNameExW.cs diff --git a/src/Common/src/Interop/Windows/shell32/Interop.SHGetKnownFolderPath.cs b/src/Common/src/CoreLib/Interop/Windows/Shell32/Interop.SHGetKnownFolderPath.cs similarity index 100% rename from src/Common/src/Interop/Windows/shell32/Interop.SHGetKnownFolderPath.cs rename to src/Common/src/CoreLib/Interop/Windows/Shell32/Interop.SHGetKnownFolderPath.cs diff --git a/src/System.Runtime.Extensions/src/System/Environment.SpecialFolder.cs b/src/Common/src/CoreLib/System/Environment.SpecialFolder.cs similarity index 100% rename from src/System.Runtime.Extensions/src/System/Environment.SpecialFolder.cs rename to src/Common/src/CoreLib/System/Environment.SpecialFolder.cs diff --git a/src/System.Runtime.Extensions/src/System/Environment.SpecialFolderOption.cs b/src/Common/src/CoreLib/System/Environment.SpecialFolderOption.cs similarity index 100% rename from src/System.Runtime.Extensions/src/System/Environment.SpecialFolderOption.cs rename to src/Common/src/CoreLib/System/Environment.SpecialFolderOption.cs diff --git a/src/System.Runtime.Extensions/src/System/Environment.Unix.cs b/src/Common/src/CoreLib/System/Environment.Unix.cs similarity index 100% rename from src/System.Runtime.Extensions/src/System/Environment.Unix.cs rename to src/Common/src/CoreLib/System/Environment.Unix.cs diff --git a/src/System.Runtime.Extensions/src/System/Environment.Win32.cs b/src/Common/src/CoreLib/System/Environment.Win32.cs similarity index 100% rename from src/System.Runtime.Extensions/src/System/Environment.Win32.cs rename to src/Common/src/CoreLib/System/Environment.Win32.cs diff --git a/src/System.Runtime.Extensions/src/System/Environment.WinRT.cs b/src/Common/src/CoreLib/System/Environment.WinRT.cs similarity index 100% rename from src/System.Runtime.Extensions/src/System/Environment.WinRT.cs rename to src/Common/src/CoreLib/System/Environment.WinRT.cs diff --git a/src/System.Runtime.Extensions/src/System/Environment.Windows.cs b/src/Common/src/CoreLib/System/Environment.Windows.cs similarity index 100% rename from src/System.Runtime.Extensions/src/System/Environment.Windows.cs rename to src/Common/src/CoreLib/System/Environment.Windows.cs diff --git a/src/System.Runtime.Extensions/src/System/Environment.cs b/src/Common/src/CoreLib/System/Environment.cs similarity index 100% rename from src/System.Runtime.Extensions/src/System/Environment.cs rename to src/Common/src/CoreLib/System/Environment.cs diff --git a/src/Common/src/System/IO/DriveInfoInternal.Unix.cs b/src/Common/src/CoreLib/System/IO/DriveInfoInternal.Unix.cs similarity index 100% rename from src/Common/src/System/IO/DriveInfoInternal.Unix.cs rename to src/Common/src/CoreLib/System/IO/DriveInfoInternal.Unix.cs diff --git a/src/Common/src/System/IO/DriveInfoInternal.Win32.cs b/src/Common/src/CoreLib/System/IO/DriveInfoInternal.Windows.cs similarity index 100% rename from src/Common/src/System/IO/DriveInfoInternal.Win32.cs rename to src/Common/src/CoreLib/System/IO/DriveInfoInternal.Windows.cs diff --git a/src/Common/src/System/IO/PersistedFiles.Names.Unix.cs b/src/Common/src/CoreLib/System/IO/PersistedFiles.Names.Unix.cs similarity index 100% rename from src/Common/src/System/IO/PersistedFiles.Names.Unix.cs rename to src/Common/src/CoreLib/System/IO/PersistedFiles.Names.Unix.cs diff --git a/src/Common/src/System/IO/PersistedFiles.Unix.cs b/src/Common/src/CoreLib/System/IO/PersistedFiles.Unix.cs similarity index 100% rename from src/Common/src/System/IO/PersistedFiles.Unix.cs rename to src/Common/src/CoreLib/System/IO/PersistedFiles.Unix.cs diff --git a/src/System.Runtime.Extensions/src/System/OperatingSystem.cs b/src/Common/src/CoreLib/System/OperatingSystem.cs similarity index 100% rename from src/System.Runtime.Extensions/src/System/OperatingSystem.cs rename to src/Common/src/CoreLib/System/OperatingSystem.cs diff --git a/src/Common/src/System/PasteArguments.Unix.cs b/src/Common/src/CoreLib/System/PasteArguments.Unix.cs similarity index 100% rename from src/Common/src/System/PasteArguments.Unix.cs rename to src/Common/src/CoreLib/System/PasteArguments.Unix.cs diff --git a/src/Common/src/System/PasteArguments.Windows.cs b/src/Common/src/CoreLib/System/PasteArguments.Windows.cs similarity index 100% rename from src/Common/src/System/PasteArguments.Windows.cs rename to src/Common/src/CoreLib/System/PasteArguments.Windows.cs diff --git a/src/Common/src/System/PasteArguments.cs b/src/Common/src/CoreLib/System/PasteArguments.cs similarity index 100% rename from src/Common/src/System/PasteArguments.cs rename to src/Common/src/CoreLib/System/PasteArguments.cs diff --git a/src/System.Runtime.Extensions/src/System/PlatformID.cs b/src/Common/src/CoreLib/System/PlatformID.cs similarity index 100% rename from src/System.Runtime.Extensions/src/System/PlatformID.cs rename to src/Common/src/CoreLib/System/PlatformID.cs diff --git a/src/Common/tests/Common.Tests.csproj b/src/Common/tests/Common.Tests.csproj index bc83e72e88dd..d0e7f85cd7eb 100644 --- a/src/Common/tests/Common.Tests.csproj +++ b/src/Common/tests/Common.Tests.csproj @@ -67,8 +67,8 @@ Common\System\Security\IdentityHelper.cs - - Common\System\PasteArguments.cs + + Common\CoreLib\System\PasteArguments.cs @@ -121,8 +121,8 @@ Common\CoreLib\System\IO\Win32Marshal.cs - - Common\System\PasteArguments.Windows.cs + + Common\CoreLib\System\PasteArguments.Windows.cs @@ -136,8 +136,8 @@ Common\Interop\Unix\Interop.Libraries.cs - - Common\System\PasteArguments.Unix.cs + + Common\CoreLib\System\PasteArguments.Unix.cs @@ -152,4 +152,4 @@ RemoteExecutorConsoleApp - \ No newline at end of file + diff --git a/src/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj b/src/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj index 3cc47bdc14be..01c627df1869 100644 --- a/src/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj +++ b/src/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj @@ -27,18 +27,18 @@ - - Common\System\PasteArguments.cs + + Common\CoreLib\System\PasteArguments.cs - + Common\Interop\Windows\kernel32\Interop.GetCurrentProcess_IntPtr.cs - - Common\System\PasteArguments.Windows.cs + + Common\CoreLib\System\PasteArguments.Windows.cs Common\Interop\Windows\NtDll\Interop.RTL_OSVERSIONINFOEX.cs @@ -73,11 +73,11 @@ Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs - - Common\System\PasteArguments.Unix.cs + + Common\CoreLib\System\PasteArguments.Unix.cs - + Common\Interop\Unix\Interop.GetEUid.cs diff --git a/src/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj b/src/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj index 523b98f3765b..f09a51e70107 100644 --- a/src/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj +++ b/src/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj @@ -35,8 +35,8 @@ - - Common\System\IO\DriveInfoInternal.Win32.cs + + Common\System\IO\DriveInfoInternal.Windows.cs Common\System\Memory\FixedBufferExtensions.cs @@ -53,7 +53,7 @@ Common\Interop\Windows\Interop.UNICODE_STRING.cs - + Common\Interop\Windows\Interop.BOOLEAN.cs @@ -128,8 +128,8 @@ Common\Interop\Windows\Interop.DeleteVolumeMountPoint.cs - - Common\Interop\Windows\Interop.GetLogicalDrive.cs + + Common\Interop\Windows\Interop.GetLogicalDrives.cs Common\Interop\Windows\Interop.SetFileInformationByHandle.cs diff --git a/src/System.Console/src/System.Console.csproj b/src/System.Console/src/System.Console.csproj index 72f2a0294ac0..818ae664e4ca 100644 --- a/src/System.Console/src/System.Console.csproj +++ b/src/System.Console/src/System.Console.csproj @@ -172,10 +172,10 @@ Common\Microsoft\Win32\SafeHandles\SafeFileHandleHelper.Unix.cs - + Common\System\IO\PersistedFiles.Unix.cs - + Common\System\IO\PersistedFiles.Names.Unix.cs @@ -226,10 +226,10 @@ Common\Interop\Unix\Interop.Poll.cs - + Common\Interop\Unix\Interop.GetEUid.cs - + Common\Interop\Unix\Interop.GetPwUid.cs @@ -284,4 +284,4 @@ - \ No newline at end of file + diff --git a/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj index 9d1cccb2ab7c..c43c9723d4c7 100644 --- a/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -76,7 +76,7 @@ Common\Interop\Windows\kernel32\Interop.FreeLibrary.cs - + Common\Interop\Windows\kernel32\Interop.GetComputerName.cs diff --git a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj index 88620376e2a6..d6cebb976ce1 100644 --- a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj +++ b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj @@ -37,8 +37,8 @@ - - Common\System\PasteArguments.cs + + Common\CoreLib\System\PasteArguments.cs Common\Interop\Windows\Interop.Errors.cs @@ -194,7 +194,7 @@ Common\Interop\Windows\advapi32\Interop.AdjustTokenPrivileges.cs - + Common\Interop\Windows\kernel32\Interop.GetComputerName.cs @@ -302,10 +302,10 @@ Common\Interop\Unix\Interop.Close.cs - + Common\Interop\Unix\Interop.GetHostName.cs - + Common\Interop\Unix\Interop.SysConf.cs @@ -317,7 +317,7 @@ Common\Interop\Unix\Interop.GetPid.cs - + Common\Interop\Unix\Interop.GetPwUid.cs @@ -350,7 +350,7 @@ Common\Interop\Unix\Interop.WaitPid.cs - + Common\Interop\Unix\System.Native\Interop.Access.cs @@ -450,4 +450,4 @@ - \ No newline at end of file + diff --git a/src/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.PerformanceTests.csproj b/src/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.PerformanceTests.csproj index 4157ee56c6fd..9b0e5c8f5460 100644 --- a/src/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.PerformanceTests.csproj +++ b/src/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.PerformanceTests.csproj @@ -10,8 +10,8 @@ - - Common\System\PasteArguments.cs + + Common\CoreLib\System\PasteArguments.cs Common\System\IO\StringParser.cs @@ -29,4 +29,4 @@ PerfRunner - \ No newline at end of file + 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 07e38b048445..76a120215aec 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;netstandard-Unix-Debug;netstandard-Unix-Release;netstandard-Windows_NT-Debug;netstandard-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release - - Common\System\PasteArguments.cs + + Common\CoreLib\System\PasteArguments.cs Common\System\IO\StringParser.cs @@ -49,14 +49,14 @@ - - Common\System\PasteArguments.Windows.cs + + Common\CoreLib\System\PasteArguments.Windows.cs - - Common\System\PasteArguments.Unix.cs + + Common\CoreLib\System\PasteArguments.Unix.cs - \ No newline at end of file + diff --git a/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj b/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj index 46018ecd92cc..f7f1e37ddd95 100644 --- a/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj +++ b/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj @@ -29,8 +29,8 @@ Common\Interop\Windows\Interop.GetVolumeInformation.cs - - Common\Interop\Windows\Interop.GetLogicalDrive.cs + + Common\Interop\Windows\Interop.GetLogicalDrives.cs Common\Interop\Windows\Interop.GetDiskFreeSpaceEx.cs @@ -62,8 +62,8 @@ Common\CoreLib\System\IO\Win32Marshal.cs - - Common\System\IO\DriveInfoInternal.Win32.cs + + Common\System\IO\DriveInfoInternal.Windows.cs Common\System\IO\PathInternal.Windows.cs @@ -86,7 +86,7 @@ Common\Interop\Unix\Interop.PathConf.cs - + Common\Interop\Unix\Interop.MountPoints.cs @@ -104,4 +104,4 @@ - \ No newline at end of file + diff --git a/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj b/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj index e0a8861997d9..337020677d09 100644 --- a/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj +++ b/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj @@ -68,8 +68,8 @@ Common\System\HResults.cs - - Common\System\IO\DriveInfoInternal.Win32.cs + + Common\System\IO\DriveInfoInternal.Windows.cs Common\CoreLib\System\IO\PathInternal.Windows.cs @@ -122,8 +122,8 @@ Common\CoreLib\Interop\Windows\Interop.SetThreadErrorMode.cs - - Common\Interop\Windows\Interop.GetLogicalDrive.cs + + Common\Interop\Windows\Interop.GetLogicalDrives.cs Common\Interop\Windows\Interop.DeleteVolumeMountPoint.cs @@ -187,7 +187,7 @@ Common\Interop\Windows\Interop.UNICODE_STRING.cs - + Common\Interop\Windows\Interop.BOOLEAN.cs @@ -261,7 +261,7 @@ Common\Interop\Unix\Interop.GetEGid.cs - + Common\Interop\Unix\Interop.GetEUid.cs @@ -276,7 +276,7 @@ Common\Interop\Unix\Interop.Link.cs - + Common\Interop\Unix\Interop.MountPoints.cs @@ -294,7 +294,7 @@ Common\CoreLib\System\IO\PathInternal.Unix.cs - + Common\System\IO\DriveInfoInternal.Unix.cs diff --git a/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj index 14d3d961901e..38d4b38ea4c1 100644 --- a/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj +++ b/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj @@ -80,10 +80,10 @@ Common\Interop\Windows\Interop.GenericOperations.cs - + Common\Interop\Windows\Interop.GetSystemInfo.cs - + Common\Interop\Windows\Interop.SYSTEM_INFO.cs @@ -149,7 +149,7 @@ Common\Interop\Unix\Interop.Permissions.cs - + Common\Interop\Unix\Interop.SysConf.cs diff --git a/src/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/System.IO.Pipes/src/System.IO.Pipes.csproj index a8e36104d2a7..845787cefb25 100644 --- a/src/System.IO.Pipes/src/System.IO.Pipes.csproj +++ b/src/System.IO.Pipes/src/System.IO.Pipes.csproj @@ -64,7 +64,7 @@ Common\CoreLib\Interop\Windows\Interop.FileTypes.cs - + Common\Interop\Windows\Interop.GetCurrentProcess.cs @@ -186,7 +186,7 @@ Common\Interop\Unix\Interop.FLock.cs - + Common\Interop\Unix\Interop.GetHostName.cs @@ -228,7 +228,7 @@ Common\Interop\Unix\Interop.GetPeerID.cs - + Common\Interop\Unix\Interop.GetEUid.cs diff --git a/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj index 67e4fa5456e7..772b5b23b9a3 100644 --- a/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj +++ b/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj @@ -162,7 +162,7 @@ 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 c5013d11a5d9..0c9a3b7dc181 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 @@ -167,7 +167,7 @@ Interop\Unix\System.Native\Interop.Close.cs - + Interop\Unix\System.Native\Interop.GetHostName.cs diff --git a/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj index 852b4858695e..c77c9eefc648 100644 --- a/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj +++ b/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj @@ -176,7 +176,7 @@ Interop\Unix\System.Native\Interop.GetDomainName.cs - + Interop\Unix\System.Native\Interop.GetHostName.cs diff --git a/src/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/System.Net.Primitives/src/System.Net.Primitives.csproj index 18490df709ab..ef986cafb0bc 100644 --- a/src/System.Net.Primitives/src/System.Net.Primitives.csproj +++ b/src/System.Net.Primitives/src/System.Net.Primitives.csproj @@ -164,7 +164,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 51942a23da69..398277621ae5 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 @@ -141,7 +141,7 @@ ProductionCode\Common\Interop\Unix\System.Native\Interop.GetDomainName.cs - + ProductionCode\Common\Interop\Unix\System.Native\Interop.GetHostName.cs diff --git a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj index 997f3b411732..49230890d42b 100644 --- a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj +++ b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj @@ -10,8 +10,8 @@ netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreappaot-Windows_NT-Debug;netcoreappaot-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release - - Common\System\PasteArguments.cs + + Common\CoreLib\System\PasteArguments.cs @@ -21,13 +21,23 @@ - - - + + Common\CoreLib\System\Environment.cs + + + Common\CoreLib\System\Environment.SpecialFolder.cs + + + Common\CoreLib\System\Environment.SpecialFolderOption.cs + - - + + Common\CoreLib\System\OperatingSystem.cs + + + Common\CoreLib\System\PlatformID.cs + @@ -69,23 +79,29 @@ - + + Common\CoreLib\System\Environment.WinRT.cs + - - + + Common\CoreLib\System\Environment.Win32.cs + + Common\Interop\Windows\secur32\Interop.GetUserNameExW.cs - + Common\Interop\Windows\shell32\Interop.SHGetKnownFolderPath.cs - - Common\System\PasteArguments.Windows.cs + + Common\CoreLib\System\PasteArguments.Windows.cs + + + Common\CoreLib\System\Environment.Windows.cs - @@ -97,43 +113,43 @@ Common\Interop\Windows\Interop.Errors.cs - + Common\Interop\Windows\Interop.BOOLEAN.cs - + Common\Interop\Windows\advapi32\Interop.LookupAccountNameW.cs - + Common\Interop\Windows\mincore\Interop.GetComputerNameW.cs - + Common\Interop\Windows\kernel32\Interop.GetCurrentProcess_IntPtr.cs Common\Interop\Windows\kernel32\Interop.GetCurrentProcessId.cs - + Common\Interop\Windows\kernel32\Interop.ExpandEnvironmentStrings.cs Common\Interop\Windows\kernel32\Interop.FormatMessage.cs - + Common\Interop\Windows\kernel32\Interop.GetCurrentDirectory.cs - - Common\Interop\Windows\Interop.GetLogicalDrive.cs + + Common\Interop\Windows\Interop.GetLogicalDrives.cs - + Common\Interop\Windows\kernel32\Interop.GetSystemDirectoryW.cs - + Common\Interop\Windows\kernel32\Interop.GetSystemInfo.cs - + Common\Interop\Windows\kernel32\Interop.GetVersionExW.cs - + Common\Interop\Windows\kernel32\Interop.IsWow64Process_IntPtr.cs @@ -145,14 +161,14 @@ Common\Interop\Windows\kernel32\Interop.QueryPerformanceFrequency.cs - + Common\Interop\Windows\kernel32\Interop.SetCurrentDirectory.cs - + Common\Interop\Windows\kernel32\Interop.SYSTEM_INFO.cs - - Common\System\IO\DriveInfoInternal.Win32.cs + + Common\System\IO\DriveInfoInternal.Windows.cs CoreLib\System\IO\PathHelper.Windows.cs @@ -172,7 +188,9 @@ - + + Common\CoreLib\System\Environment.Unix.cs + @@ -190,10 +208,10 @@ Common\Interop\Unix\System.Native\Interop.GetPid.cs - + Common\Interop\Unix\System.Native\Interop.Access.cs - + Common\Interop\Unix\System.Native\Interop.ChDir.cs @@ -202,47 +220,47 @@ Common\CoreLib\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 - + Common\Interop\Unix\System.Native\Interop.MountPoints.cs Common\CoreLib\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 - - Common\System\PasteArguments.Unix.cs + + Common\CoreLib\System\PasteArguments.Windows.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 e2b0639afdb0..efaa03b1f452 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 @@ -63,4 +63,4 @@ - \ No newline at end of file + diff --git a/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj index 3eff7d55eecb..bcf4c73fc7da 100644 --- a/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj +++ b/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj @@ -89,7 +89,7 @@ Common\Interop\Interop.OpenProcessToken_IntPtrs.cs - + Common\Interop\Interop.GetCurrentProcess_IntPtr.cs @@ -120,4 +120,4 @@ - \ No newline at end of file + 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 e42357be788c..9ebb714b66c6 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 @@ -390,10 +390,10 @@ Common\Interop\Unix\System.Native\Interop.FChMod.cs - + Common\Interop\Unix\Interop.GetEUid.cs - + Common\Interop\Unix\Interop.GetPwUid.cs @@ -432,10 +432,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 b74b308d2bd0..370d12262c28 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 @@ -61,10 +61,10 @@ Common\CoreLib\Interop\Unix\Interop.Errors.cs - + Common\Interop\Unix\Interop.GetEUid.cs - + Common\Interop\Unix\Interop.GetPwUid.cs @@ -76,10 +76,10 @@ Common\CoreLib\Interop\Unix\System.Native\Interop.Stat.cs - + Common\System\IO\PersistedFiles.Unix.cs - + Common\System\IO\PersistedFiles.Names.Unix.cs @@ -133,4 +133,4 @@ - \ No newline at end of file + 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 e0e538da06e2..81a303d09202 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 @@ -44,7 +44,7 @@ Common\Interop\Interop.UNICODE_STRING.cs - + Common\Interop\Interop.GetCurrentProcess.cs @@ -197,4 +197,4 @@ - \ No newline at end of file +