Fix casing of files to get closer to ./build.sh -allConfiguration working on linux...

* Rename directories to use CamelCasing

* Fix CsProj files to match file names and their casing

* fix couple of Compile items which were not in csproj file

Commit migrated from https://github.com/dotnet/corefx/commit/8c5260061b11323dfd97fbab614d54402405513f

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.AdjustTokenPrivileges.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.AdjustTokenPrivileges.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.AdjustTokenPrivileges.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.AdjustTokenPrivileges.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.AllocateLocallyUniqueId.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.AllocateLocallyUniqueId.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.AllocateLocallyUniqueId.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.AllocateLocallyUniqueId.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ChangeServiceConfig2.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ChangeServiceConfig2.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ChangeServiceConfig2.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ChangeServiceConfig2.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CheckTokenMembership.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CheckTokenMembership.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CheckTokenMembership.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CheckTokenMembership.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ClaimSecurityAttributes.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ClaimSecurityAttributes.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ClaimSecurityAttributes.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ClaimSecurityAttributes.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ClearEventLog.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ClearEventLog.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ClearEventLog.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ClearEventLog.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CloseEventLog.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CloseEventLog.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CloseEventLog.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CloseEventLog.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CloseServiceHandle.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CloseServiceHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CloseServiceHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CloseServiceHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ControlService.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ControlService.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ControlService.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ControlService.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ConvertSdToStringSd.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ConvertSdToStringSd.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ConvertSdToStringSd.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ConvertSdToStringSd.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ConvertStringSdToSd.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ConvertStringSdToSd.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ConvertStringSdToSd.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ConvertStringSdToSd.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ConvertStringSidToSid.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ConvertStringSidToSid.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ConvertStringSidToSid.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ConvertStringSidToSid.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CreateProcessWithLogon.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CreateProcessWithLogon.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CreateProcessWithLogon.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CreateProcessWithLogon.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CreateService.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CreateService.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CreateService.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CreateService.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CreateWellKnownSid.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CreateWellKnownSid.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CreateWellKnownSid.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CreateWellKnownSid.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptAcquireContext.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptAcquireContext.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptAcquireContext.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptAcquireContext.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptCreateHash.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptCreateHash.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptCreateHash.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptCreateHash.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptDecrypt.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptDecrypt.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptDecrypt.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptDecrypt.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptDeriveKey.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptDeriveKey.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptDeriveKey.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptDeriveKey.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptDestroyHash.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptDestroyHash.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptDestroyHash.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptDestroyHash.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptDestroyKey.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptDestroyKey.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptDestroyKey.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptDestroyKey.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptEncrypt.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptEncrypt.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptEncrypt.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptEncrypt.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptExportKey.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptExportKey.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptExportKey.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptExportKey.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptGenKey.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptGenKey.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptGenKey.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptGenKey.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptGetDefaultProvider.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptGetDefaultProvider.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptGetDefaultProvider.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptGetDefaultProvider.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptGetHashParam.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptGetHashParam.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptGetHashParam.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptGetHashParam.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptGetKeyParam.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptGetKeyParam.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptGetKeyParam.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptGetKeyParam.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptGetProvParam.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptGetProvParam.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptGetProvParam.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptGetProvParam.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptGetUserKey.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptGetUserKey.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptGetUserKey.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptGetUserKey.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptHashData.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptHashData.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptHashData.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptHashData.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptImportKey.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptImportKey.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptImportKey.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptImportKey.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptReleaseContext.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptReleaseContext.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptReleaseContext.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptReleaseContext.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptSetKeyParam.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptSetKeyParam.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptSetKeyParam.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptSetKeyParam.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptSignHash.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptSignHash.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.CryptSignHash.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CryptSignHash.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.DeleteService.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.DeleteService.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.DeleteService.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.DeleteService.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.DeregisterEventSource.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.DeregisterEventSource.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.DeregisterEventSource.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.DeregisterEventSource.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.DuplicateTokenEx.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.DuplicateTokenEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.DuplicateTokenEx.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.DuplicateTokenEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.DuplicateTokenEx_SafeTokenHandle.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.DuplicateTokenEx_SafeTokenHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.DuplicateTokenEx_SafeTokenHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.DuplicateTokenEx_SafeTokenHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ENUM_SERVICE_STATUS.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ENUM_SERVICE_STATUS.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ENUM_SERVICE_STATUS.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ENUM_SERVICE_STATUS.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ENUM_SERVICE_STATUS_PROCESS.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ENUM_SERVICE_STATUS_PROCESS.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ENUM_SERVICE_STATUS_PROCESS.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ENUM_SERVICE_STATUS_PROCESS.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.EnumDependentServices.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.EnumDependentServices.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.EnumDependentServices.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.EnumDependentServices.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.EnumServicesStatusEx.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.EnumServicesStatusEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.EnumServicesStatusEx.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.EnumServicesStatusEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetNumberOfEventLogRecords.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetNumberOfEventLogRecords.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetNumberOfEventLogRecords.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetNumberOfEventLogRecords.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetOldestEventLogRecord.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetOldestEventLogRecord.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetOldestEventLogRecord.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetOldestEventLogRecord.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetSecurityDescriptorLength.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetSecurityDescriptorLength.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetSecurityDescriptorLength.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetSecurityDescriptorLength.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetSecurityInfoByHandle.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetSecurityInfoByHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetSecurityInfoByHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetSecurityInfoByHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetSecurityInfoByName.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetSecurityInfoByName.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetSecurityInfoByName.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetSecurityInfoByName.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetServiceDisplayName.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetServiceDisplayName.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetServiceDisplayName.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetServiceDisplayName.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetServiceKeyName.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetServiceKeyName.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetServiceKeyName.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetServiceKeyName.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetTokenInformation.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetTokenInformation.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetTokenInformation.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetTokenInformation.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetTokenInformation_void.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetTokenInformation_void.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetTokenInformation_void.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetTokenInformation_void.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetWindowsAccountDomainSid.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetWindowsAccountDomainSid.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.GetWindowsAccountDomainSid.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.GetWindowsAccountDomainSid.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ImpersonateLoggedOnUser.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ImpersonateLoggedOnUser.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ImpersonateLoggedOnUser.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ImpersonateLoggedOnUser.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ImpersonateNamedPipeClient.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ImpersonateNamedPipeClient.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ImpersonateNamedPipeClient.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ImpersonateNamedPipeClient.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.IsEqualDomainSid.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.IsEqualDomainSid.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.IsEqualDomainSid.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.IsEqualDomainSid.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.IsWellKnownSid.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.IsWellKnownSid.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.IsWellKnownSid.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.IsWellKnownSid.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.LUID.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LUID.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.LUID.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LUID.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.LUID_AND_ATTRIBUTES.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LUID_AND_ATTRIBUTES.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.LUID_AND_ATTRIBUTES.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LUID_AND_ATTRIBUTES.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.LookupAccountSid.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LookupAccountSid.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.LookupAccountSid.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LookupAccountSid.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.LookupPrivilegeValue.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LookupPrivilegeValue.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.LookupPrivilegeValue.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LookupPrivilegeValue.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.LsaClose.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LsaClose.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.LsaClose.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LsaClose.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.LsaFreeMemory.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LsaFreeMemory.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.LsaFreeMemory.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LsaFreeMemory.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.LsaLookupNames2.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LsaLookupNames2.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.LsaLookupNames2.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LsaLookupNames2.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.LsaLookupSids.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LsaLookupSids.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.LsaLookupSids.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LsaLookupSids.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.LsaNtStatusToWinError.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LsaNtStatusToWinError.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.LsaNtStatusToWinError.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LsaNtStatusToWinError.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.LsaOpenPolicy.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LsaOpenPolicy.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.LsaOpenPolicy.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.LsaOpenPolicy.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.NotifyChangeEventLog.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.NotifyChangeEventLog.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.NotifyChangeEventLog.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.NotifyChangeEventLog.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenEventLog.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenEventLog.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenEventLog.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenEventLog.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenProcessToken.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenProcessToken.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenProcessToken.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenProcessToken.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenProcessToken_IntPtr.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenProcessToken_IntPtr.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenProcessToken_IntPtr.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenProcessToken_IntPtr.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenProcessToken_SafeAccessTokenHandle.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenProcessToken_SafeAccessTokenHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenProcessToken_SafeAccessTokenHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenProcessToken_SafeAccessTokenHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenSCManager.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenSCManager.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenSCManager.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenSCManager.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenService.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenService.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenService.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenService.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenThreadToken.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenThreadToken.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenThreadToken.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenThreadToken.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenThreadToken_SafeTokenHandle.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenThreadToken_SafeTokenHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.OpenThreadToken_SafeTokenHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.OpenThreadToken_SafeTokenHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.PERF_INFO.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.PERF_INFO.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.PERF_INFO.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.PERF_INFO.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ProcessOptions.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ProcessOptions.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ProcessOptions.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ProcessOptions.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.QUERY_SERVICE_CONFIG.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.QUERY_SERVICE_CONFIG.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.QUERY_SERVICE_CONFIG.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.QUERY_SERVICE_CONFIG.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.QueryServiceConfig.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.QueryServiceConfig.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.QueryServiceConfig.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.QueryServiceConfig.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.QueryServiceStatus.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.QueryServiceStatus.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.QueryServiceStatus.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.QueryServiceStatus.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ReadEventLog.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ReadEventLog.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ReadEventLog.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ReadEventLog.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.RegConnectRegistry.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.RegConnectRegistry.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.RegConnectRegistry.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.RegConnectRegistry.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.RegisterEventSource.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.RegisterEventSource.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.RegisterEventSource.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.RegisterEventSource.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.RegisterServiceCtrlHandlerEx.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.RegisterServiceCtrlHandlerEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.RegisterServiceCtrlHandlerEx.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.RegisterServiceCtrlHandlerEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ReportEvent.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ReportEvent.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ReportEvent.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ReportEvent.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.RevertToSelf.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.RevertToSelf.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.RevertToSelf.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.RevertToSelf.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.SERVICE_DELAYED_AUTOSTART_INFO.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SERVICE_DELAYED_AUTOSTART_INFO.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.SERVICE_DELAYED_AUTOSTART_INFO.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SERVICE_DELAYED_AUTOSTART_INFO.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.SERVICE_DESCRIPTION.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SERVICE_DESCRIPTION.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.SERVICE_DESCRIPTION.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SERVICE_DESCRIPTION.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.SERVICE_STATUS.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SERVICE_STATUS.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.SERVICE_STATUS.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SERVICE_STATUS.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.SERVICE_TABLE_ENTRY.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SERVICE_TABLE_ENTRY.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.SERVICE_TABLE_ENTRY.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SERVICE_TABLE_ENTRY.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.SecurityImpersonationLevel.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SecurityImpersonationLevel.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.SecurityImpersonationLevel.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SecurityImpersonationLevel.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.ServiceProcessOptions.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ServiceProcessOptions.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.ServiceProcessOptions.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ServiceProcessOptions.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.SetSecurityInfoByHandle.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SetSecurityInfoByHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.SetSecurityInfoByHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SetSecurityInfoByHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.SetSecurityInfoByName.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SetSecurityInfoByName.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.SetSecurityInfoByName.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SetSecurityInfoByName.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.SetServiceStatus.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SetServiceStatus.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.SetServiceStatus.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SetServiceStatus.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.SetThreadToken.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SetThreadToken.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.SetThreadToken.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.SetThreadToken.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.StartService.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.StartService.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.StartService.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.StartService.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.StartServiceCtrlDispatcher.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.StartServiceCtrlDispatcher.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.StartServiceCtrlDispatcher.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.StartServiceCtrlDispatcher.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.TOKEN_ELEVATION.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.TOKEN_ELEVATION.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.TOKEN_ELEVATION.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.TOKEN_ELEVATION.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.TOKEN_INFORMATION_CLASS.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.TOKEN_INFORMATION_CLASS.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.TOKEN_INFORMATION_CLASS.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.TOKEN_INFORMATION_CLASS.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.TOKEN_PRIVILEGE.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.TOKEN_PRIVILEGE.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.TOKEN_PRIVILEGE.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.TOKEN_PRIVILEGE.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/Interop.WTSSESSION_NOTIFICATION.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.WTSSESSION_NOTIFICATION.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/Interop.WTSSESSION_NOTIFICATION.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/Interop.WTSSESSION_NOTIFICATION.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/SafeHashHandle.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/SafeHashHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/SafeHashHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/SafeHashHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/SafeKeyHandle.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/SafeKeyHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/SafeKeyHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/SafeKeyHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/advapi32/SafeProvHandle.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/SafeProvHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/advapi32/SafeProvHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Advapi32/SafeProvHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.Beep.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Beep.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.Beep.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Beep.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.COMMPROP.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.COMMPROP.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.COMMPROP.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.COMMPROP.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.COMMTIMEOUTS.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.COMMTIMEOUTS.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.COMMTIMEOUTS.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.COMMTIMEOUTS.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.COMSTAT.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.COMSTAT.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.COMSTAT.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.COMSTAT.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.COPYFILE2_EXTENDED_PARAMETERS.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.COPYFILE2_EXTENDED_PARAMETERS.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.COPYFILE2_EXTENDED_PARAMETERS.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.COPYFILE2_EXTENDED_PARAMETERS.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CREATEFILE2_EXTENDED_PARAMETERS.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CREATEFILE2_EXTENDED_PARAMETERS.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CREATEFILE2_EXTENDED_PARAMETERS.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CREATEFILE2_EXTENDED_PARAMETERS.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CTL_CODE.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CTL_CODE.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CTL_CODE.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CTL_CODE.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CheckTokenMembershipEx.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CheckTokenMembershipEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CheckTokenMembershipEx.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CheckTokenMembershipEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.ClearCommBreak.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ClearCommBreak.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.ClearCommBreak.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ClearCommBreak.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.ClearCommError.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ClearCommError.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.ClearCommError.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ClearCommError.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CompareStringOrdinal.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CompareStringOrdinal.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CompareStringOrdinal.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CompareStringOrdinal.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.ConnectNamedPipe.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ConnectNamedPipe.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.ConnectNamedPipe.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ConnectNamedPipe.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.ConsoleCursorInfo.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ConsoleCursorInfo.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.ConsoleCursorInfo.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ConsoleCursorInfo.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.ConsoleScreenBufferInfo.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ConsoleScreenBufferInfo.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.ConsoleScreenBufferInfo.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ConsoleScreenBufferInfo.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.Constants.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Constants.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.Constants.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Constants.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CopyFile.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CopyFile.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CopyFile.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CopyFile.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CopyFileEx.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CopyFileEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CopyFileEx.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CopyFileEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateDirectory.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateDirectory.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateDirectory.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateDirectory.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateFile.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateFile.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateFile.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateFile.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateFile2.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateFile2.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateFile2.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateFile2.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateFileMapping.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateFileMapping.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateFileMapping.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateFileMapping.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateFileMappingFromApp.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateFileMappingFromApp.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateFileMappingFromApp.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateFileMappingFromApp.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateNamedPipe.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateNamedPipe.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateNamedPipe.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateNamedPipe.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateNamedPipeClient.Uap.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateNamedPipeClient.Uap.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateNamedPipeClient.Uap.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateNamedPipeClient.Uap.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateNamedPipeClient.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateNamedPipeClient.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateNamedPipeClient.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateNamedPipeClient.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreatePipe_SafeFileHandle.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreatePipe_SafeFileHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreatePipe_SafeFileHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreatePipe_SafeFileHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreatePipe_SafePipeHandle.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreatePipe_SafePipeHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreatePipe_SafePipeHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreatePipe_SafePipeHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateProcess.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateProcess.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.CreateProcess.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateProcess.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.DCB.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DCB.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.DCB.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DCB.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.DeleteFile.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DeleteFile.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.DeleteFile.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DeleteFile.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.DeleteVolumeMountPoint.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DeleteVolumeMountPoint.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.DeleteVolumeMountPoint.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DeleteVolumeMountPoint.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.DeviceIoControl.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DeviceIoControl.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.DeviceIoControl.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DeviceIoControl.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.DisconnectNamedPipe.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DisconnectNamedPipe.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.DisconnectNamedPipe.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DisconnectNamedPipe.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.DuplicateHandle.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DuplicateHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.DuplicateHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DuplicateHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.DuplicateHandle_IntPtr.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DuplicateHandle_IntPtr.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.DuplicateHandle_IntPtr.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DuplicateHandle_IntPtr.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.DuplicateHandle_SafeProcessHandle.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DuplicateHandle_SafeProcessHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.DuplicateHandle_SafeProcessHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.DuplicateHandle_SafeProcessHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.EncryptDecrypt.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.EncryptDecrypt.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.EncryptDecrypt.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.EncryptDecrypt.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.EnumProcessModules.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.EnumProcessModules.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.EnumProcessModules.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.EnumProcessModules.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.EnumProcesses.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.EnumProcesses.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.EnumProcesses.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.EnumProcesses.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.EscapeCommFunction.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.EscapeCommFunction.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.EscapeCommFunction.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.EscapeCommFunction.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.FILE_INFO_BY_HANDLE_CLASS.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FILE_INFO_BY_HANDLE_CLASS.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.FILE_INFO_BY_HANDLE_CLASS.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FILE_INFO_BY_HANDLE_CLASS.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.FILE_TIME.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FILE_TIME.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.FILE_TIME.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FILE_TIME.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.FileOperations.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FileOperations.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.FileOperations.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FileOperations.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.FileShareMode.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FileShareMode.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.FileShareMode.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FileShareMode.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.FillConsoleOutputAttribute.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FillConsoleOutputAttribute.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.FillConsoleOutputAttribute.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FillConsoleOutputAttribute.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.FillConsoleOutputCharacter.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FillConsoleOutputCharacter.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.FillConsoleOutputCharacter.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FillConsoleOutputCharacter.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.FindNextFile.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FindNextFile.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.FindNextFile.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FindNextFile.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.FlushViewOfFile.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FlushViewOfFile.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.FlushViewOfFile.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FlushViewOfFile.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.FormatMessage_SafeLibraryHandle.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FormatMessage_SafeLibraryHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.FormatMessage_SafeLibraryHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FormatMessage_SafeLibraryHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.FreeLibrary.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FreeLibrary.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.FreeLibrary.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.FreeLibrary.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GET_FILEEX_INFO_LEVELS.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GET_FILEEX_INFO_LEVELS.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GET_FILEEX_INFO_LEVELS.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GET_FILEEX_INFO_LEVELS.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GenericOperations.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GenericOperations.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GenericOperations.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GenericOperations.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCPInfoEx.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCPInfoEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCPInfoEx.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCPInfoEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCommModemStatus.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCommModemStatus.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCommModemStatus.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCommModemStatus.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCommProperties.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCommProperties.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCommProperties.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCommProperties.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCommState.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCommState.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCommState.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCommState.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetConsoleCP.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetConsoleCP.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetConsoleCP.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetConsoleCP.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetConsoleMode.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetConsoleMode.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetConsoleMode.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetConsoleMode.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetConsoleOutputCP.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetConsoleOutputCP.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetConsoleOutputCP.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetConsoleOutputCP.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetConsoleScreenBufferInfo.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetConsoleScreenBufferInfo.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetConsoleScreenBufferInfo.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetConsoleScreenBufferInfo.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetConsoleTitle.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetConsoleTitle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetConsoleTitle.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetConsoleTitle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCurrentProcessId.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCurrentProcessId.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCurrentProcessId.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCurrentProcessId.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCurrentProcess_SafeProcessHandle.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCurrentProcess_SafeProcessHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCurrentProcess_SafeProcessHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCurrentProcess_SafeProcessHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCurrentThread.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCurrentThread.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCurrentThread.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCurrentThread.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCurrentThreadId.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCurrentThreadId.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetCurrentThreadId.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetCurrentThreadId.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetDiskFreeSpaceEx.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetDiskFreeSpaceEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetDiskFreeSpaceEx.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetDiskFreeSpaceEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetDriveType.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetDriveType.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetDriveType.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetDriveType.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetExitCodeProcess.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetExitCodeProcess.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetExitCodeProcess.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetExitCodeProcess.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetFileAttributesEx.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetFileAttributesEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetFileAttributesEx.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetFileAttributesEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetFileInformationByHandleEx.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetFileInformationByHandleEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetFileInformationByHandleEx.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetFileInformationByHandleEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetFileType_IntPtr.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetFileType_IntPtr.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetFileType_IntPtr.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetFileType_IntPtr.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetLargestConsoleWindowSize.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetLargestConsoleWindowSize.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetLargestConsoleWindowSize.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetLargestConsoleWindowSize.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetModuleBaseName.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetModuleBaseName.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetModuleBaseName.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetModuleBaseName.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetModuleFileNameEx.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetModuleFileNameEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetModuleFileNameEx.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetModuleFileNameEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetModuleHandle.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetModuleHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetModuleHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetModuleHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetModuleInformation.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetModuleInformation.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetModuleInformation.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetModuleInformation.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetNamedPipeHandleState.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetNamedPipeHandleState.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetNamedPipeHandleState.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetNamedPipeHandleState.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetNamedPipeInfo.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetNamedPipeInfo.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetNamedPipeInfo.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetNamedPipeInfo.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetNativeSystemInfo.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetNativeSystemInfo.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetNativeSystemInfo.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetNativeSystemInfo.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetOverlappedResult.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetOverlappedResult.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetOverlappedResult.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetOverlappedResult.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetPriorityClass.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetPriorityClass.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetPriorityClass.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetPriorityClass.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetProcAddress.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetProcAddress.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetProcAddress.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetProcAddress.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetProcessAffinityMask.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetProcessAffinityMask.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetProcessAffinityMask.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetProcessAffinityMask.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetProcessId.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetProcessId.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetProcessId.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetProcessId.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetProcessPriorityBoost.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetProcessPriorityBoost.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetProcessPriorityBoost.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetProcessPriorityBoost.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetProcessTimes.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetProcessTimes.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetProcessTimes.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetProcessTimes.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetProcessWorkingSetSizeEx.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetProcessWorkingSetSizeEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetProcessWorkingSetSizeEx.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetProcessWorkingSetSizeEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetStdHandle.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetStdHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetStdHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetStdHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetThreadPriority.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetThreadPriority.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetThreadPriority.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetThreadPriority.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetThreadPriorityBoost.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetThreadPriorityBoost.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetThreadPriorityBoost.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetThreadPriorityBoost.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetThreadTimes.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetThreadTimes.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetThreadTimes.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetThreadTimes.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetVolumeInformation.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetVolumeInformation.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GetVolumeInformation.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetVolumeInformation.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GlobalLock.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GlobalLock.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GlobalLock.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GlobalLock.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.GlobalMemoryStatusEx.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GlobalMemoryStatusEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.GlobalMemoryStatusEx.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GlobalMemoryStatusEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.HandleOptions.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.HandleOptions.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.HandleOptions.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.HandleOptions.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.HandleTypes.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.HandleTypes.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.HandleTypes.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.HandleTypes.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.Heap.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Heap.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.Heap.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Heap.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.IoControlCodeAccess.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.IoControlCodeAccess.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.IoControlCodeAccess.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.IoControlCodeAccess.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.IoControlTransferType.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.IoControlTransferType.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.IoControlTransferType.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.IoControlTransferType.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.IsWow64Process_SafeProcessHandle.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.IsWow64Process_SafeProcessHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.IsWow64Process_SafeProcessHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.IsWow64Process_SafeProcessHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.LoadLibrary.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.LoadLibrary.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.LoadLibrary.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.LoadLibrary.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.LoadLibraryEx.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.LoadLibraryEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.LoadLibraryEx.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.LoadLibraryEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.LocalAlloc.Constants.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.LocalAlloc.Constants.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.LocalAlloc.Constants.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.LocalAlloc.Constants.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.LocalAlloc.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.LocalAlloc.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.LocalAlloc.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.LocalAlloc.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.LocalFree.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.LocalFree.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.LocalFree.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.LocalFree.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.MEMORY_BASIC_INFO.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.MEMORY_BASIC_INFO.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.MEMORY_BASIC_INFO.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.MEMORY_BASIC_INFO.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.MapViewOfFile.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.MapViewOfFile.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.MapViewOfFile.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.MapViewOfFile.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.MapViewOfFileFromApp.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.MapViewOfFileFromApp.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.MapViewOfFileFromApp.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.MapViewOfFileFromApp.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.MaxLengths.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.MaxLengths.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.MaxLengths.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.MaxLengths.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.MemOptions.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.MemOptions.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.MemOptions.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.MemOptions.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.MoveFileEx.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.MoveFileEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.MoveFileEx.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.MoveFileEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.OpenFileMapping.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.OpenFileMapping.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.OpenFileMapping.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.OpenFileMapping.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.OpenProcess.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.OpenProcess.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.OpenProcess.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.OpenProcess.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.OpenThread.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.OpenThread.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.OpenThread.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.OpenThread.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.PeekConsoleInput.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.PeekConsoleInput.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.PeekConsoleInput.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.PeekConsoleInput.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.PerformanceCounterOptions.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.PerformanceCounterOptions.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.PerformanceCounterOptions.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.PerformanceCounterOptions.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.PipeOptions.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.PipeOptions.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.PipeOptions.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.PipeOptions.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.ProcessWaitHandle.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ProcessWaitHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.ProcessWaitHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ProcessWaitHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.PurgeComm.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.PurgeComm.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.PurgeComm.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.PurgeComm.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.QueryPerformanceCounter.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.QueryPerformanceCounter.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.QueryPerformanceCounter.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.QueryPerformanceCounter.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.QueryPerformanceFrequency.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.QueryPerformanceFrequency.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.QueryPerformanceFrequency.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.QueryPerformanceFrequency.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.ReadConsole.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ReadConsole.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.ReadConsole.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ReadConsole.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.ReadConsoleInput.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ReadConsoleInput.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.ReadConsoleInput.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ReadConsoleInput.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.ReadConsoleOutput.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ReadConsoleOutput.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.ReadConsoleOutput.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ReadConsoleOutput.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.ReadDirectoryChangesW.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ReadDirectoryChangesW.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.ReadDirectoryChangesW.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ReadDirectoryChangesW.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.ReadFile_IntPtr.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ReadFile_IntPtr.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.ReadFile_IntPtr.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ReadFile_IntPtr.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.RemoveDirectory.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.RemoveDirectory.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.RemoveDirectory.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.RemoveDirectory.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.ReplaceFile.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ReplaceFile.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.ReplaceFile.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ReplaceFile.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetCommBreak.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetCommBreak.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetCommBreak.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetCommBreak.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetCommMask.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetCommMask.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetCommMask.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetCommMask.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetCommState.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetCommState.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetCommState.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetCommState.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetCommTimeouts.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetCommTimeouts.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetCommTimeouts.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetCommTimeouts.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleCP.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleCP.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleCP.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleCP.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleCtrlHandler.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleCtrlHandler.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleCtrlHandler.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleCtrlHandler.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleCursorPosition.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleCursorPosition.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleCursorPosition.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleCursorPosition.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleOutputCP.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleOutputCP.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleOutputCP.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleOutputCP.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleScreenBufferSize.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleScreenBufferSize.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleScreenBufferSize.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleScreenBufferSize.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleTextAttribute.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleTextAttribute.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleTextAttribute.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleTextAttribute.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleTitle.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleTitle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleTitle.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleTitle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleWindowInfo.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleWindowInfo.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetConsoleWindowInfo.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetConsoleWindowInfo.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetFileAttributes.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetFileAttributes.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetFileAttributes.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetFileAttributes.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetFileCompletionNotificationModes.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetFileCompletionNotificationModes.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetFileCompletionNotificationModes.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetFileCompletionNotificationModes.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetFileInformationByHandle.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetFileInformationByHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetFileInformationByHandle.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetFileInformationByHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetNamedPipeHandleState.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetNamedPipeHandleState.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetNamedPipeHandleState.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetNamedPipeHandleState.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetPriorityClass.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetPriorityClass.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetPriorityClass.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetPriorityClass.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetProcessAffinityMask.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetProcessAffinityMask.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetProcessAffinityMask.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetProcessAffinityMask.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetProcessPriorityBoost.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetProcessPriorityBoost.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetProcessPriorityBoost.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetProcessPriorityBoost.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetProcessWorkingSetSizeEx.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetProcessWorkingSetSizeEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetProcessWorkingSetSizeEx.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetProcessWorkingSetSizeEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetThreadAffinityMask.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetThreadAffinityMask.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetThreadAffinityMask.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetThreadAffinityMask.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetThreadIdealProcessor.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetThreadIdealProcessor.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetThreadIdealProcessor.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetThreadIdealProcessor.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetThreadPriority.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetThreadPriority.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetThreadPriority.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetThreadPriority.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetThreadPriorityBoost.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetThreadPriorityBoost.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetThreadPriorityBoost.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetThreadPriorityBoost.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetVolumeLabel.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetVolumeLabel.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetVolumeLabel.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetVolumeLabel.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetupComm.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetupComm.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.SetupComm.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SetupComm.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.TerminateProcess.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.TerminateProcess.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.TerminateProcess.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.TerminateProcess.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.ThreadOptions.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ThreadOptions.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.ThreadOptions.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.ThreadOptions.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.UnmapViewOfFile.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.UnmapViewOfFile.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.UnmapViewOfFile.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.UnmapViewOfFile.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.VerLanguageName.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.VerLanguageName.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.VerLanguageName.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.VerLanguageName.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.VirtualAlloc.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.VirtualAlloc.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.VirtualAlloc.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.VirtualAlloc.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.VirtualQuery.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.VirtualQuery.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.VirtualQuery.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.VirtualQuery.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.WIN32_FILE_ATTRIBUTE_DATA.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WIN32_FILE_ATTRIBUTE_DATA.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.WIN32_FILE_ATTRIBUTE_DATA.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WIN32_FILE_ATTRIBUTE_DATA.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.WIN32_FIND_DATA.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WIN32_FIND_DATA.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.WIN32_FIND_DATA.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WIN32_FIND_DATA.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.WaitCommEvent.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WaitCommEvent.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.WaitCommEvent.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WaitCommEvent.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.WaitForSingleObject.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WaitForSingleObject.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.WaitForSingleObject.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WaitForSingleObject.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.WaitNamedPipe.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WaitNamedPipe.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.WaitNamedPipe.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WaitNamedPipe.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.WriteConsole.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WriteConsole.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.WriteConsole.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WriteConsole.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.WriteConsoleOutput.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WriteConsoleOutput.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.WriteConsoleOutput.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WriteConsoleOutput.cs

diff --git a/src/libraries/Common/src/Interop/Windows/kernel32/Interop.WriteFile_IntPtr.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WriteFile_IntPtr.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/kernel32/Interop.WriteFile_IntPtr.cs
rename to src/libraries/Common/src/Interop/Windows/Kernel32/Interop.WriteFile_IntPtr.cs

diff --git a/src/libraries/Common/src/Interop/Windows/mincore/Interop.GetCommPorts.cs b/src/libraries/Common/src/Interop/Windows/Mincore/Interop.GetCommPorts.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/mincore/Interop.GetCommPorts.cs
rename to src/libraries/Common/src/Interop/Windows/Mincore/Interop.GetCommPorts.cs

diff --git a/src/libraries/Common/src/Interop/Windows/mincore/Interop.GetRestrictedErrorInfo.cs b/src/libraries/Common/src/Interop/Windows/Mincore/Interop.GetRestrictedErrorInfo.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/mincore/Interop.GetRestrictedErrorInfo.cs
rename to src/libraries/Common/src/Interop/Windows/Mincore/Interop.GetRestrictedErrorInfo.cs

diff --git a/src/libraries/Common/src/Interop/Windows/mincore/Interop.OpenCommPort.cs b/src/libraries/Common/src/Interop/Windows/Mincore/Interop.OpenCommPort.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/mincore/Interop.OpenCommPort.cs
rename to src/libraries/Common/src/Interop/Windows/Mincore/Interop.OpenCommPort.cs

diff --git a/src/libraries/Common/src/Interop/Windows/mincore/Interop.OpenFileMappingFromApp.cs b/src/libraries/Common/src/Interop/Windows/Mincore/Interop.OpenFileMappingFromApp.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/mincore/Interop.OpenFileMappingFromApp.cs
rename to src/libraries/Common/src/Interop/Windows/Mincore/Interop.OpenFileMappingFromApp.cs

diff --git a/src/libraries/Common/src/Interop/Windows/mincore/Interop.RoGetActivationFactory.cs b/src/libraries/Common/src/Interop/Windows/Mincore/Interop.RoGetActivationFactory.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/mincore/Interop.RoGetActivationFactory.cs
rename to src/libraries/Common/src/Interop/Windows/Mincore/Interop.RoGetActivationFactory.cs

diff --git a/src/libraries/Common/src/Interop/Windows/mincore/Interop.RoGetBufferMarshaler.cs b/src/libraries/Common/src/Interop/Windows/Mincore/Interop.RoGetBufferMarshaler.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/mincore/Interop.RoGetBufferMarshaler.cs
rename to src/libraries/Common/src/Interop/Windows/Mincore/Interop.RoGetBufferMarshaler.cs

diff --git a/src/libraries/Common/src/Interop/Windows/mincore/Interop.VirtualAllocFromApp.cs b/src/libraries/Common/src/Interop/Windows/Mincore/Interop.VirtualAllocFromApp.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/mincore/Interop.VirtualAllocFromApp.cs
rename to src/libraries/Common/src/Interop/Windows/Mincore/Interop.VirtualAllocFromApp.cs

diff --git a/src/libraries/Common/src/Interop/Windows/perfcounter/Interop.FormatFromRawValue.cs b/src/libraries/Common/src/Interop/Windows/PerfCounter/Interop.FormatFromRawValue.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/perfcounter/Interop.FormatFromRawValue.cs
rename to src/libraries/Common/src/Interop/Windows/PerfCounter/Interop.FormatFromRawValue.cs

diff --git a/src/libraries/Common/src/Interop/Windows/perfcounter/Interop.PerformanceData.cs b/src/libraries/Common/src/Interop/Windows/PerfCounter/Interop.PerformanceData.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/perfcounter/Interop.PerformanceData.cs
rename to src/libraries/Common/src/Interop/Windows/PerfCounter/Interop.PerformanceData.cs

diff --git a/src/libraries/Common/src/Interop/Windows/shell32/Interop.ShellExecuteExW.cs b/src/libraries/Common/src/Interop/Windows/Shell32/Interop.ShellExecuteExW.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/shell32/Interop.ShellExecuteExW.cs
rename to src/libraries/Common/src/Interop/Windows/Shell32/Interop.ShellExecuteExW.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/GlobalSSPI.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/GlobalSSPI.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/GlobalSSPI.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/GlobalSSPI.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.AuthenticationPackageNames.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.AuthenticationPackageNames.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.AuthenticationPackageNames.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.AuthenticationPackageNames.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.KerbLogonSubmitType.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.KerbLogonSubmitType.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.KerbLogonSubmitType.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.KerbLogonSubmitType.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.KerbS4uLogin.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.KerbS4uLogin.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.KerbS4uLogin.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.KerbS4uLogin.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.LSAStructs.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LSAStructs.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.LSAStructs.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LSAStructs.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaConnectUntrusted.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaConnectUntrusted.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaConnectUntrusted.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaConnectUntrusted.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaDeregisterLogonProcess.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaDeregisterLogonProcess.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaDeregisterLogonProcess.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaDeregisterLogonProcess.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaFreeReturnBuffer.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaFreeReturnBuffer.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaFreeReturnBuffer.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaFreeReturnBuffer.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaGetLogonSessionData.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaGetLogonSessionData.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaGetLogonSessionData.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaGetLogonSessionData.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaLogonUser.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaLogonUser.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaLogonUser.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaLogonUser.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaLookupAuthenticationPackage.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaLookupAuthenticationPackage.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaLookupAuthenticationPackage.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaLookupAuthenticationPackage.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaString.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaString.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaString.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaString.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaUnicodeString.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaUnicodeString.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.LsaUnicodeString.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.LsaUnicodeString.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.QuotaLimits.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.QuotaLimits.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.QuotaLimits.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.QuotaLimits.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.SECURITY_LOGON_SESSION_DATA.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.SECURITY_LOGON_SESSION_DATA.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.SECURITY_LOGON_SESSION_DATA.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.SECURITY_LOGON_SESSION_DATA.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.SSPI.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.SSPI.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.SSPI.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.SSPI.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.SecurityLogonType.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.SecurityLogonType.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.SecurityLogonType.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.SecurityLogonType.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.TOKENS.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.TOKENS.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.TOKENS.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.TOKENS.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.TokenSource.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.TokenSource.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.TokenSource.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.TokenSource.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.UNICODE_STRING.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.UNICODE_STRING.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.UNICODE_STRING.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.UNICODE_STRING.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/Interop.Winnt.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/Interop.Winnt.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/Interop.Winnt.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/Interop.Winnt.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/NegotiationInfoClass.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/NegotiationInfoClass.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/NegotiationInfoClass.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/NegotiationInfoClass.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/SSPIAuthType.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/SSPIAuthType.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/SSPIAuthType.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/SSPIAuthType.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/SSPIInterface.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/SSPIInterface.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/SSPIInterface.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/SSPIInterface.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/SSPISecureChannelType.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/SSPISecureChannelType.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/SSPISecureChannelType.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/SSPISecureChannelType.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/SSPIWrapper.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/SSPIWrapper.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/SSPIWrapper.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/SSPIWrapper.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/SafeDeleteContext.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/SafeDeleteContext.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/SafeDeleteContext.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/SafeDeleteContext.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/SecPkgContext_Bindings.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/SecPkgContext_Bindings.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/SecPkgContext_Bindings.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/SecPkgContext_Bindings.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/SecPkgContext_NegotiationInfoW.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/SecPkgContext_NegotiationInfoW.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/SecPkgContext_NegotiationInfoW.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/SecPkgContext_NegotiationInfoW.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/SecPkgContext_Sizes.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/SecPkgContext_Sizes.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/SecPkgContext_Sizes.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/SecPkgContext_Sizes.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/SecPkgContext_StreamSizes.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/SecPkgContext_StreamSizes.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/SecPkgContext_StreamSizes.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/SecPkgContext_StreamSizes.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/SecurityPackageInfo.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/SecurityPackageInfo.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/SecurityPackageInfo.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/SecurityPackageInfo.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/SecurityPackageInfoClass.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/SecurityPackageInfoClass.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/SecurityPackageInfoClass.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/SecurityPackageInfoClass.cs

diff --git a/src/libraries/Common/src/Interop/Windows/sspicli/SecuritySafeHandles.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/SecuritySafeHandles.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/sspicli/SecuritySafeHandles.cs
rename to src/libraries/Common/src/Interop/Windows/SspiCli/SecuritySafeHandles.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.Constants.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.Constants.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.Constants.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.Constants.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.CreateWindowEx.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.CreateWindowEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.CreateWindowEx.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.CreateWindowEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.DefWindowProc.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.DefWindowProc.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.DefWindowProc.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.DefWindowProc.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.DestroyWindow.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.DestroyWindow.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.DestroyWindow.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.DestroyWindow.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.DispatchMessage.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.DispatchMessage.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.DispatchMessage.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.DispatchMessage.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.EnumWindows.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.EnumWindows.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.EnumWindows.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.EnumWindows.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.FindWindow.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.FindWindow.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.FindWindow.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.FindWindow.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.GetClassInfo.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.GetClassInfo.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.GetClassInfo.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.GetClassInfo.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.GetKeyState.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.GetKeyState.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.GetKeyState.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.GetKeyState.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.GetProcessWindowStation.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.GetProcessWindowStation.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.GetProcessWindowStation.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.GetProcessWindowStation.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.GetSysColor.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.GetSysColor.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.GetSysColor.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.GetSysColor.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.GetUserObjectInformation.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.GetUserObjectInformation.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.GetUserObjectInformation.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.GetUserObjectInformation.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.GetWindow.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.GetWindow.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.GetWindow.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.GetWindow.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.GetWindowLong.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.GetWindowLong.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.GetWindowLong.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.GetWindowLong.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.GetWindowTextLengthW.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.GetWindowTextLengthW.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.GetWindowTextLengthW.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.GetWindowTextLengthW.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.GetWindowTextW.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.GetWindowTextW.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.GetWindowTextW.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.GetWindowTextW.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.GetWindowThreadProcessId.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.GetWindowThreadProcessId.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.GetWindowThreadProcessId.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.GetWindowThreadProcessId.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.IsWindow.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.IsWindow.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.IsWindow.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.IsWindow.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.IsWindowVisible.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.IsWindowVisible.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.IsWindowVisible.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.IsWindowVisible.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.KillTimer.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.KillTimer.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.KillTimer.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.KillTimer.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.MSG.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.MSG.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.MSG.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.MSG.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.MessageBeep.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.MessageBeep.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.MessageBeep.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.MessageBeep.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.MsgWaitForMultipleObjectsEx.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.MsgWaitForMultipleObjectsEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.MsgWaitForMultipleObjectsEx.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.MsgWaitForMultipleObjectsEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.PeekMessage.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.PeekMessage.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.PeekMessage.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.PeekMessage.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.PostMessage.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.PostMessage.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.PostMessage.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.PostMessage.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.RegisterClass.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.RegisterClass.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.RegisterClass.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.RegisterClass.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.RegisterWindowMessage.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.RegisterWindowMessage.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.RegisterWindowMessage.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.RegisterWindowMessage.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.SendMessage.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.SendMessage.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.SendMessage.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.SendMessage.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.SendMessageTimeout.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.SendMessageTimeout.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.SendMessageTimeout.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.SendMessageTimeout.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.SetClassLong.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.SetClassLong.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.SetClassLong.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.SetClassLong.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.SetClassLongPtr.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.SetClassLongPtr.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.SetClassLongPtr.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.SetClassLongPtr.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.SetTimer.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.SetTimer.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.SetTimer.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.SetTimer.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.SetWindowLong.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.SetWindowLong.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.SetWindowLong.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.SetWindowLong.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.SetWindowLongPtr.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.SetWindowLongPtr.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.SetWindowLongPtr.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.SetWindowLongPtr.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.TranslateMessage.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.TranslateMessage.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.TranslateMessage.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.TranslateMessage.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.USEROBJECTFLAGS.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.USEROBJECTFLAGS.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.USEROBJECTFLAGS.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.USEROBJECTFLAGS.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.UnregisterClass.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.UnregisterClass.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.UnregisterClass.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.UnregisterClass.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.WNDCLASS.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.WNDCLASS.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.WNDCLASS.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.WNDCLASS.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.WaitForInputIdle.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.WaitForInputIdle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.WaitForInputIdle.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.WaitForInputIdle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.Win32SystemColors.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.Win32SystemColors.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.Win32SystemColors.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.Win32SystemColors.cs

diff --git a/src/libraries/Common/src/Interop/Windows/user32/Interop.WndProc.cs b/src/libraries/Common/src/Interop/Windows/User32/Interop.WndProc.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/user32/Interop.WndProc.cs
rename to src/libraries/Common/src/Interop/Windows/User32/Interop.WndProc.cs

diff --git a/src/libraries/Common/src/Interop/Windows/version/Interop.FileVersionInfo.cs b/src/libraries/Common/src/Interop/Windows/Version/Interop.FileVersionInfo.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/version/Interop.FileVersionInfo.cs
rename to src/libraries/Common/src/Interop/Windows/Version/Interop.FileVersionInfo.cs

diff --git a/src/libraries/Common/src/Interop/Windows/version/Interop.FileVersionInfoType.cs b/src/libraries/Common/src/Interop/Windows/Version/Interop.FileVersionInfoType.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/version/Interop.FileVersionInfoType.cs
rename to src/libraries/Common/src/Interop/Windows/Version/Interop.FileVersionInfoType.cs

diff --git a/src/libraries/Common/src/Interop/Windows/version/Interop.GetFileVersionInfoEx.cs b/src/libraries/Common/src/Interop/Windows/Version/Interop.GetFileVersionInfoEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/version/Interop.GetFileVersionInfoEx.cs
rename to src/libraries/Common/src/Interop/Windows/Version/Interop.GetFileVersionInfoEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/version/Interop.GetFileVersionInfoSizeEx.cs b/src/libraries/Common/src/Interop/Windows/Version/Interop.GetFileVersionInfoSizeEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/version/Interop.GetFileVersionInfoSizeEx.cs
rename to src/libraries/Common/src/Interop/Windows/Version/Interop.GetFileVersionInfoSizeEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/version/Interop.VSFixedFileInfo.cs b/src/libraries/Common/src/Interop/Windows/Version/Interop.VSFixedFileInfo.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/version/Interop.VSFixedFileInfo.cs
rename to src/libraries/Common/src/Interop/Windows/Version/Interop.VSFixedFileInfo.cs

diff --git a/src/libraries/Common/src/Interop/Windows/version/Interop.VerQueryValue.cs b/src/libraries/Common/src/Interop/Windows/Version/Interop.VerQueryValue.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/version/Interop.VerQueryValue.cs
rename to src/libraries/Common/src/Interop/Windows/Version/Interop.VerQueryValue.cs

diff --git a/src/libraries/Common/src/Interop/Windows/winhttp/Interop.SafeWinHttpHandle.cs b/src/libraries/Common/src/Interop/Windows/WinHttp/Interop.SafeWinHttpHandle.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/winhttp/Interop.SafeWinHttpHandle.cs
rename to src/libraries/Common/src/Interop/Windows/WinHttp/Interop.SafeWinHttpHandle.cs

diff --git a/src/libraries/Common/src/Interop/Windows/winhttp/Interop.winhttp.cs b/src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/winhttp/Interop.winhttp.cs
rename to src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp.cs

diff --git a/src/libraries/Common/src/Interop/Windows/winhttp/Interop.winhttp_types.cs b/src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp_types.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/winhttp/Interop.winhttp_types.cs
rename to src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp_types.cs

diff --git a/src/libraries/Common/src/Interop/Windows/wininet/Interop.wininet_errors.cs b/src/libraries/Common/src/Interop/Windows/WinInet/Interop.wininet_errors.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/wininet/Interop.wininet_errors.cs
rename to src/libraries/Common/src/Interop/Windows/WinInet/Interop.wininet_errors.cs

diff --git a/src/libraries/Common/src/Interop/Windows/winmm/Interop.MMCKINFO.cs b/src/libraries/Common/src/Interop/Windows/WinMm/Interop.MMCKINFO.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/winmm/Interop.MMCKINFO.cs
rename to src/libraries/Common/src/Interop/Windows/WinMm/Interop.MMCKINFO.cs

diff --git a/src/libraries/Common/src/Interop/Windows/winmm/Interop.PlaySound.cs b/src/libraries/Common/src/Interop/Windows/WinMm/Interop.PlaySound.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/winmm/Interop.PlaySound.cs
rename to src/libraries/Common/src/Interop/Windows/WinMm/Interop.PlaySound.cs

diff --git a/src/libraries/Common/src/Interop/Windows/winmm/Interop.mmioAscend.cs b/src/libraries/Common/src/Interop/Windows/WinMm/Interop.mmioAscend.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/winmm/Interop.mmioAscend.cs
rename to src/libraries/Common/src/Interop/Windows/WinMm/Interop.mmioAscend.cs

diff --git a/src/libraries/Common/src/Interop/Windows/winmm/Interop.mmioClose.cs b/src/libraries/Common/src/Interop/Windows/WinMm/Interop.mmioClose.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/winmm/Interop.mmioClose.cs
rename to src/libraries/Common/src/Interop/Windows/WinMm/Interop.mmioClose.cs

diff --git a/src/libraries/Common/src/Interop/Windows/winmm/Interop.mmioDescend.cs b/src/libraries/Common/src/Interop/Windows/WinMm/Interop.mmioDescend.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/winmm/Interop.mmioDescend.cs
rename to src/libraries/Common/src/Interop/Windows/WinMm/Interop.mmioDescend.cs

diff --git a/src/libraries/Common/src/Interop/Windows/winmm/Interop.mmioOpen.cs b/src/libraries/Common/src/Interop/Windows/WinMm/Interop.mmioOpen.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/winmm/Interop.mmioOpen.cs
rename to src/libraries/Common/src/Interop/Windows/WinMm/Interop.mmioOpen.cs

diff --git a/src/libraries/Common/src/Interop/Windows/winmm/Interop.mmioRead.cs b/src/libraries/Common/src/Interop/Windows/WinMm/Interop.mmioRead.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/winmm/Interop.mmioRead.cs
rename to src/libraries/Common/src/Interop/Windows/WinMm/Interop.mmioRead.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/AddressInfo.cs b/src/libraries/Common/src/Interop/Windows/WinSock/AddressInfo.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/AddressInfo.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/AddressInfo.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/AddressInfoEx.cs b/src/libraries/Common/src/Interop/Windows/WinSock/AddressInfoEx.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/AddressInfoEx.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/AddressInfoEx.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/AddressInfoHints.cs b/src/libraries/Common/src/Interop/Windows/WinSock/AddressInfoHints.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/AddressInfoHints.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/AddressInfoHints.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.ErrorCodes.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.ErrorCodes.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.ErrorCodes.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.ErrorCodes.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.GetAddrInfoExW.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.GetAddrInfoExW.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.GetAddrInfoExW.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.GetAddrInfoExW.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.GetAddrInfoW.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.GetAddrInfoW.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.GetAddrInfoW.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.GetAddrInfoW.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.GetNameInfoW.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.GetNameInfoW.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.GetNameInfoW.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.GetNameInfoW.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.SocketConstructorFlags.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.SocketConstructorFlags.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.SocketConstructorFlags.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.SocketConstructorFlags.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.TransmitFile.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.TransmitFile.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.TransmitFile.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.TransmitFile.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSAConnect.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSAConnect.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSAConnect.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSAConnect.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSAEventSelect.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSAEventSelect.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSAEventSelect.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSAEventSelect.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSAGetOverlappedResult.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSAGetOverlappedResult.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSAGetOverlappedResult.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSAGetOverlappedResult.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSAIoctl.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSAIoctl.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSAIoctl.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSAIoctl.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSARecv.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSARecv.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSARecv.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSARecv.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSARecvFrom.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSARecvFrom.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSARecvFrom.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSARecvFrom.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSASend.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASend.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSASend.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASend.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSASendTo.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASendTo.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSASendTo.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASendTo.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSASocketW.SafeCloseSocket.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASocketW.SafeCloseSocket.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSASocketW.SafeCloseSocket.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASocketW.SafeCloseSocket.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSASocketW.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASocketW.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSASocketW.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASocketW.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSAStartup.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSAStartup.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.WSAStartup.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSAStartup.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.WinsockAsync.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.WinsockAsync.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.WinsockAsync.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.WinsockAsync.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.WinsockBSD.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.WinsockBSD.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.WinsockBSD.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.WinsockBSD.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.accept.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.accept.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.accept.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.accept.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.bind.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.bind.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.bind.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.bind.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.closesocket.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.closesocket.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.closesocket.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.closesocket.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.freeaddrinfo.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.freeaddrinfo.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.freeaddrinfo.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.freeaddrinfo.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.gethostname.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.gethostname.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.gethostname.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.gethostname.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.getpeername.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.getpeername.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.getpeername.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.getpeername.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.getsockname.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.getsockname.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.getsockname.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.getsockname.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.getsockopt.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.getsockopt.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.getsockopt.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.getsockopt.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.ioctlsocket.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.ioctlsocket.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.ioctlsocket.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.ioctlsocket.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.listen.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.listen.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.listen.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.listen.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.recv.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.recv.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.recv.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.recv.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.recvfrom.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.recvfrom.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.recvfrom.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.recvfrom.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.select.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.select.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.select.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.select.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.send.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.send.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.send.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.send.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.sendto.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.sendto.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.sendto.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.sendto.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.setsockopt.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.setsockopt.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.setsockopt.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.setsockopt.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/Interop.shutdown.cs b/src/libraries/Common/src/Interop/Windows/WinSock/Interop.shutdown.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/Interop.shutdown.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/Interop.shutdown.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/SafeFreeAddrInfo.cs b/src/libraries/Common/src/Interop/Windows/WinSock/SafeFreeAddrInfo.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/SafeFreeAddrInfo.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/SafeFreeAddrInfo.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/SafeNativeOverlapped.cs b/src/libraries/Common/src/Interop/Windows/WinSock/SafeNativeOverlapped.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/SafeNativeOverlapped.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/SafeNativeOverlapped.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/WSABuffer.cs b/src/libraries/Common/src/Interop/Windows/WinSock/WSABuffer.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/WSABuffer.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/WSABuffer.cs

diff --git a/src/libraries/Common/src/Interop/Windows/Winsock/hostent.cs b/src/libraries/Common/src/Interop/Windows/WinSock/hostent.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/Winsock/hostent.cs
rename to src/libraries/Common/src/Interop/Windows/WinSock/hostent.cs

diff --git a/src/libraries/Common/src/Interop/Windows/wtsapi32/Interop.Constants.cs b/src/libraries/Common/src/Interop/Windows/WtsApi32/Interop.Constants.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/wtsapi32/Interop.Constants.cs
rename to src/libraries/Common/src/Interop/Windows/WtsApi32/Interop.Constants.cs

diff --git a/src/libraries/Common/src/Interop/Windows/wtsapi32/Interop.WTSRegisterSessionNotification.cs b/src/libraries/Common/src/Interop/Windows/WtsApi32/Interop.WTSRegisterSessionNotification.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/wtsapi32/Interop.WTSRegisterSessionNotification.cs
rename to src/libraries/Common/src/Interop/Windows/WtsApi32/Interop.WTSRegisterSessionNotification.cs

diff --git a/src/libraries/Common/src/Interop/Windows/wtsapi32/Interop.WTSUnRegisterSessionNotification.cs b/src/libraries/Common/src/Interop/Windows/WtsApi32/Interop.WTSUnRegisterSessionNotification.cs
similarity index 100%
rename from src/libraries/Common/src/Interop/Windows/wtsapi32/Interop.WTSUnRegisterSessionNotification.cs
rename to src/libraries/Common/src/Interop/Windows/WtsApi32/Interop.WTSUnRegisterSessionNotification.cs

diff --git a/src/libraries/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj b/src/libraries/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj
index 01c627d..8d454e1 100644 (file)
--- a/src/libraries/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj
+++ b/src/libraries/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj
@@ -34,8 +34,8 @@
     <Compile Include="System\TheoryExtensions.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.GetCurrentProcess_IntPtr.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetCurrentProcess_IntPtr.cs</Link>
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\System\PasteArguments.Windows.cs">
       <Link>Common\CoreLib\System\PasteArguments.Windows.cs</Link>
@@ -46,8 +46,8 @@
     <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlGetVersion.cs">
       <Link>Common\Interop\Windows\NtDll\Interop.RtlGetVersion.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.OpenProcessToken_SafeAccessTokenHandle.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.OpenProcessToken_SafeAccessTokenHandle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.OpenProcessToken_SafeAccessTokenHandle.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.OpenProcessToken_SafeAccessTokenHandle.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
@@ -55,14 +55,14 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
       <Link>Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.TOKEN_INFORMATION_CLASS.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.TOKEN_INFORMATION_CLASS.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.GetTokenInformation_void.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.GetTokenInformation_void.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.GetTokenInformation_void.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.GetTokenInformation_void.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.TOKEN_ELEVATION.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.TOKEN_ELEVATION.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.TOKEN_ELEVATION.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.TOKEN_ELEVATION.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Interop.BOOL.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.BOOL.cs</Link>

diff --git a/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj b/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
index f09a51e..feecce9 100644 (file)
--- a/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
+++ b/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Microsoft.IO.Redist</AssemblyName>
@@ -47,7 +46,7 @@
     <Compile Include="$(CommonPath)\System\IO\PathInternal.CaseSensitivity.cs">
       <Link>Common\System\IO\PathInternal.CaseSensitivity.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateFile.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreateFile.cs">
       <Link>Common\Interop\Windows\Interop.CreateFile.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.UNICODE_STRING.cs">
@@ -89,77 +88,77 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.LongFileTime.cs">
       <Link>Common\Interop\Windows\Interop.LongFileTime.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.WIN32_FIND_DATA.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.WIN32_FIND_DATA.cs">
       <Link>Common\Interop\Windows\Interop.WIN32_FIND_DATA.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FILE_TIME.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FILE_TIME.cs">
       <Link>Common\Interop\Windows\Interop.FILE_TIME.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GET_FILEEX_INFO_LEVELS.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GET_FILEEX_INFO_LEVELS.cs">
       <Link>Common\Interop\Windows\Interop.GET_FILEEX_INFO_LEVELS.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FileOperations.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FileOperations.cs">
       <Link>Common\Interop\Windows\Interop.FileOperations.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ReplaceFile.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ReplaceFile.cs">
       <Link>Common\Interop\Windows\Interop.ReplaceFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CopyFile.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CopyFile.cs">
       <Link>Common\Interop\Windows\Interop.CopyFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.MoveFileEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.MoveFileEx.cs">
       <Link>Common\Interop\Windows\Interop.MoveFileEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.DeleteFile.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.DeleteFile.cs">
       <Link>Common\Interop\Windows\Interop.DeleteFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetFileAttributesEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetFileAttributesEx.cs">
       <Link>Common\Interop\Windows\Interop.GetFileAttributesEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateDirectory.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreateDirectory.cs">
       <Link>Common\Interop\Windows\Interop.CreateDirectory.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.WIN32_FILE_ATTRIBUTE_DATA.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.WIN32_FILE_ATTRIBUTE_DATA.cs">
       <Link>Common\Interop\Windows\Interop.WIN32_FILE_ATTRIBUTE_DATA.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FindNextFile.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FindNextFile.cs">
       <Link>Common\Interop\Windows\Interop.FindNextFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.DeleteVolumeMountPoint.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.DeleteVolumeMountPoint.cs">
       <Link>Common\Interop\Windows\Interop.DeleteVolumeMountPoint.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.GetLogicalDrives.cs">
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.GetLogicalDrives.cs">
       <Link>Common\Interop\Windows\Interop.GetLogicalDrives.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetFileInformationByHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetFileInformationByHandle.cs">
       <Link>Common\Interop\Windows\Interop.SetFileInformationByHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.RemoveDirectory.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.RemoveDirectory.cs">
       <Link>Common\Interop\Windows\Interop.RemoveDirectory.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetFileAttributes.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetFileAttributes.cs">
       <Link>Common\Interop\Windows\Interop.SetFileAttributes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FILE_INFO_BY_HANDLE_CLASS.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FILE_INFO_BY_HANDLE_CLASS.cs">
       <Link>Common\Interop\Windows\Interop.FILE_INFO_BY_HANDLE_CLASS.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.MaxLengths.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.MaxLengths.cs">
       <Link>Common\Interop\Windows\Interop.MaxLengths.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FileAttributes.cs">
       <Link>Common\Interop\Windows\Interop.FileAttributes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CopyFileEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CopyFileEx.cs">
       <Link>Common\Interop\Windows\Interop.CopyFileEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GenericOperations.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GenericOperations.cs">
       <Link>Common\Interop\Windows\Interop.GenericOperations.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.EncryptDecrypt.cs"> 
-      <Link>Common\Interop\Windows\Interop.EncryptDecrypt.cs</Link> 
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.EncryptDecrypt.cs">
+      <Link>Common\Interop\Windows\Interop.EncryptDecrypt.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetVolumeInformation.cs"> 
-      <Link>Common\Interop\Windows\Interop.GetVolumeInformation.cs</Link> 
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetVolumeInformation.cs">
+      <Link>Common\Interop\Windows\Interop.GetVolumeInformation.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FindFirstFileEx.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.FindFirstFileEx.cs</Link>

diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft.VisualBasic.Core.Tests.csproj b/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft.VisualBasic.Core.Tests.csproj
index 4508ecd..d157699 100644 (file)
--- a/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft.VisualBasic.Core.Tests.csproj
+++ b/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft.VisualBasic.Core.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}</ProjectGuid>
     <Configurations>netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release</Configurations>
@@ -9,20 +9,20 @@
     <Compile Include="CompilerServices\DoubleTypeTests.cs" />
     <Compile Include="CompilerServices\DecimalTypeTests.cs" />
     <Compile Include="CompilerServices\VersionedTests.cs" />
-    <Compile Include="Microsoft/VisualBasic/ComClassAttributeTests.cs" />
-    <Compile Include="Microsoft/VisualBasic/HideModuleNameAttributeTests.cs" />
-    <Compile Include="Microsoft/VisualBasic/MyGroupCollectionAttributeTests.cs" />
-    <Compile Include="Microsoft/VisualBasic/VBFixedArrayAttributeTests.cs" />
-    <Compile Include="Microsoft/VisualBasic/VBFixedStringAttributeTests.cs" />
-    <Compile Include="Microsoft/VisualBasic/ApplicationServices/StartupEventArgsTests.cs" />
-    <Compile Include="Microsoft/VisualBasic/ApplicationServices/StartupNextInstanceEventArgsTests.cs" />
-    <Compile Include="Microsoft/VisualBasic/ApplicationServices/UnhandledExceptionEventArgsTests.cs" />
-    <Compile Include="Microsoft/VisualBasic/CompilerServices/DesignerGeneratedAttributeTests.cs" />
-    <Compile Include="Microsoft/VisualBasic/CompilerServices/OptionCompareAttributeTests.cs" />
-    <Compile Include="Microsoft/VisualBasic/CompilerServices/OptionTextAttributeTests.cs" />
-    <Compile Include="Microsoft/VisualBasic/CompilerServices/StandardModuleAttributeTests.cs" />
-    <Compile Include="Microsoft/VisualBasic/CompilerServices/StructUtilsTests.cs" />
-    <Compile Include="Microsoft/VisualBasic/Devices/NetworkAvailableEventArgsTests.cs" />
+    <Compile Include="Microsoft\VisualBasic\ComClassAttributeTests.cs" />
+    <Compile Include="Microsoft\VisualBasic\HideModuleNameAttributeTests.cs" />
+    <Compile Include="Microsoft\VisualBasic\MyGroupCollectionAttributeTests.cs" />
+    <Compile Include="Microsoft\VisualBasic\VBFixedArrayAttributeTests.cs" />
+    <Compile Include="Microsoft\VisualBasic\VBFixedStringAttributeTests.cs" />
+    <Compile Include="Microsoft\VisualBasic\ApplicationServices\StartupEventArgsTests.cs" />
+    <Compile Include="Microsoft\VisualBasic\ApplicationServices\StartupNextInstanceEventArgsTests.cs" />
+    <Compile Include="Microsoft\VisualBasic\ApplicationServices\UnhandledExceptionEventArgsTests.cs" />
+    <Compile Include="Microsoft\VisualBasic\CompilerServices\DesignerGeneratedAttributeTests.cs" />
+    <Compile Include="Microsoft\VisualBasic\CompilerServices\OptionCompareAttributeTests.cs" />
+    <Compile Include="Microsoft\VisualBasic\CompilerServices\OptionTextAttributeTests.cs" />
+    <Compile Include="Microsoft\VisualBasic\CompilerServices\StandardModuleAttributeTests.cs" />
+    <Compile Include="Microsoft\VisualBasic\CompilerServices\StructUtilsTests.cs" />
+    <Compile Include="Microsoft\VisualBasic\Devices\NetworkAvailableEventArgsTests.cs" />
     <Compile Include="ConversionsTests.cs" />
     <Compile Include="OperatorsTests.cs" />
     <Compile Include="OperatorsTests.Comparison.cs" />
@@ -36,4 +36,4 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\$(AssemblyName).rd.xml" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
index 76b7d00..4a21a06 100644 (file)
--- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
+++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
@@ -46,7 +46,7 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Advapi32\Interop.RegCloseKey.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.RegCloseKey.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.RegConnectRegistry.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.RegConnectRegistry.cs">
       <Link>Common\Interop\Windows\Interop.RegConnectRegistry.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Advapi32\Interop.RegCreateKeyEx.cs">
@@ -112,4 +112,4 @@
     <Reference Include="System.Security.AccessControl" />
     <Reference Include="System.Security.Principal.Windows" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
index fa72627..eaa9500 100644 (file)
--- a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
+++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
@@ -13,116 +13,116 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Errors.cs">
       <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.Constants.cs">
-      <Link>Common\Interop\Windows\user32\Interop.Constants.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.Constants.cs">
+      <Link>Common\Interop\Windows\User32\Interop.Constants.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.CreateWindowEx.cs">
-      <Link>Common\Interop\Windows\user32\Interop.CreateWindowEx.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.CreateWindowEx.cs">
+      <Link>Common\Interop\Windows\User32\Interop.CreateWindowEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.DefWindowProc.cs">
-      <Link>Common\Interop\Windows\user32\Interop.DefWindowProc.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.DefWindowProc.cs">
+      <Link>Common\Interop\Windows\User32\Interop.DefWindowProc.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.DestroyWindow.cs">
-      <Link>Common\Interop\Windows\user32\Interop.DestroyWindow.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.DestroyWindow.cs">
+      <Link>Common\Interop\Windows\User32\Interop.DestroyWindow.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.DispatchMessage.cs">
-      <Link>Common\Interop\Windows\user32\Interop.DispatchMessage.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.DispatchMessage.cs">
+      <Link>Common\Interop\Windows\User32\Interop.DispatchMessage.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetClassInfo.cs">
-      <Link>Common\Interop\Windows\user32\Interop.GetClassInfo.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.GetClassInfo.cs">
+      <Link>Common\Interop\Windows\User32\Interop.GetClassInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetProcessWindowStation.cs">
-      <Link>Common\Interop\Windows\user32\Interop.GetProcessWindowStation.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.GetProcessWindowStation.cs">
+      <Link>Common\Interop\Windows\User32\Interop.GetProcessWindowStation.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetUserObjectInformation.cs">
-      <Link>Common\Interop\Windows\user32\Interop.GetUserObjectInformation.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.GetUserObjectInformation.cs">
+      <Link>Common\Interop\Windows\User32\Interop.GetUserObjectInformation.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetWindowThreadProcessId.cs">
-      <Link>Common\Interop\Windows\user32\Interop.GetWindowThreadProcessId.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.GetWindowThreadProcessId.cs">
+      <Link>Common\Interop\Windows\User32\Interop.GetWindowThreadProcessId.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.IsWindow.cs">
-      <Link>Common\Interop\Windows\user32\Interop.IsWindow.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.IsWindow.cs">
+      <Link>Common\Interop\Windows\User32\Interop.IsWindow.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.KillTimer.cs">
-      <Link>Common\Interop\Windows\user32\Interop.KillTimer.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.KillTimer.cs">
+      <Link>Common\Interop\Windows\User32\Interop.KillTimer.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.MSG.cs">
-      <Link>Common\Interop\Windows\user32\Interop.MSG.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.MSG.cs">
+      <Link>Common\Interop\Windows\User32\Interop.MSG.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.MsgWaitForMultipleObjectsEx.cs">
-      <Link>Common\Interop\Windows\user32\Interop.MsgWaitForMultipleObjectsEx.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.MsgWaitForMultipleObjectsEx.cs">
+      <Link>Common\Interop\Windows\User32\Interop.MsgWaitForMultipleObjectsEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.PeekMessage.cs">
-      <Link>Common\Interop\Windows\user32\Interop.PeekMessage.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.PeekMessage.cs">
+      <Link>Common\Interop\Windows\User32\Interop.PeekMessage.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.PostMessage.cs">
-      <Link>Common\Interop\Windows\user32\Interop.PostMessage.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.PostMessage.cs">
+      <Link>Common\Interop\Windows\User32\Interop.PostMessage.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.RegisterClass.cs">
-      <Link>Common\Interop\Windows\user32\Interop.RegisterClass.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.RegisterClass.cs">
+      <Link>Common\Interop\Windows\User32\Interop.RegisterClass.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.RegisterWindowMessage.cs">
-      <Link>Common\Interop\Windows\user32\Interop.RegisterWindowMessage.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.RegisterWindowMessage.cs">
+      <Link>Common\Interop\Windows\User32\Interop.RegisterWindowMessage.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.SendMessage.cs">
-      <Link>Common\Interop\Windows\user32\Interop.SendMessage.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.SendMessage.cs">
+      <Link>Common\Interop\Windows\User32\Interop.SendMessage.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.SetClassLong.cs">
-      <Link>Common\Interop\Windows\user32\Interop.SetClassLong.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.SetClassLong.cs">
+      <Link>Common\Interop\Windows\User32\Interop.SetClassLong.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.SetClassLongPtr.cs">
-      <Link>Common\Interop\Windows\user32\Interop.SetClassLongPtr.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.SetClassLongPtr.cs">
+      <Link>Common\Interop\Windows\User32\Interop.SetClassLongPtr.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.SetTimer.cs">
-      <Link>Common\Interop\Windows\user32\Interop.SetTimer.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.SetTimer.cs">
+      <Link>Common\Interop\Windows\User32\Interop.SetTimer.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.SetWindowLong.cs">
-      <Link>Common\Interop\Windows\user32\Interop.SetWindowLong.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.SetWindowLong.cs">
+      <Link>Common\Interop\Windows\User32\Interop.SetWindowLong.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.SetWindowLongPtr.cs">
-      <Link>Common\Interop\Windows\user32\Interop.SetWindowLongPtr.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.SetWindowLongPtr.cs">
+      <Link>Common\Interop\Windows\User32\Interop.SetWindowLongPtr.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.TranslateMessage.cs">
-      <Link>Common\Interop\Windows\user32\Interop.TranslateMessage.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.TranslateMessage.cs">
+      <Link>Common\Interop\Windows\User32\Interop.TranslateMessage.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.UnregisterClass.cs">
-      <Link>Common\Interop\Windows\user32\Interop.UnregisterClass.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.UnregisterClass.cs">
+      <Link>Common\Interop\Windows\User32\Interop.UnregisterClass.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.USEROBJECTFLAGS.cs">
-      <Link>Common\Interop\Windows\user32\Interop.USEROBJECTFLAGS.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.USEROBJECTFLAGS.cs">
+      <Link>Common\Interop\Windows\User32\Interop.USEROBJECTFLAGS.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.WNDCLASS.cs">
-      <Link>Common\Interop\Windows\user32\Interop.WNDCLASS.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.WNDCLASS.cs">
+      <Link>Common\Interop\Windows\User32\Interop.WNDCLASS.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.WndProc.cs">
-      <Link>Common\Interop\Windows\user32\Interop.WndProc.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.WndProc.cs">
+      <Link>Common\Interop\Windows\User32\Interop.WndProc.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCurrentThreadId.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetCurrentThreadId.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCurrentThreadId.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentThreadId.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetModuleHandle.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetModuleHandle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetProcAddress.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetProcAddress.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetProcAddress.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcAddress.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LoadLibrary.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LoadLibrary.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LoadLibrary.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LoadLibrary.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FreeLibrary.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.FreeLibrary.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetConsoleCtrlHandler.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SetConsoleCtrlHandler.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetConsoleCtrlHandler.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SetConsoleCtrlHandler.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\wtsapi32\Interop.Constants.cs">
-      <Link>Common\Interop\Windows\wtsapi32\Interop.Constants.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WtsApi32\Interop.Constants.cs">
+      <Link>Common\Interop\Windows\WtsApi32\Interop.Constants.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\wtsapi32\Interop.WTSRegisterSessionNotification.cs">
-      <Link>Common\Interop\Windows\wtsapi32\Interop.WTSRegisterSessionNotification.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WtsApi32\Interop.WTSRegisterSessionNotification.cs">
+      <Link>Common\Interop\Windows\WtsApi32\Interop.WTSRegisterSessionNotification.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\wtsapi32\Interop.WTSUnRegisterSessionNotification.cs">
-      <Link>Common\Interop\Windows\wtsapi32\Interop.WTSUnRegisterSessionNotification.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WtsApi32\Interop.WTSUnRegisterSessionNotification.cs">
+      <Link>Common\Interop\Windows\WtsApi32\Interop.WTSUnRegisterSessionNotification.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
       <Link>Common\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs</Link>
@@ -167,4 +167,4 @@
   <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp2.0'">
     <Reference Include="System.ComponentModel.TypeConverter" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj b/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj
index 934cdc1..de4f55f 100644 (file)
--- a/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj
+++ b/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj
@@ -7,14 +7,14 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.Constants.cs">
-      <Link>Common\Interop\Windows\user32\Interop.Constants.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.Constants.cs">
+      <Link>Common\Interop\Windows\User32\Interop.Constants.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.FindWindow.cs">
-      <Link>Common\Interop\Windows\user32\Interop.FindWindow.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.FindWindow.cs">
+      <Link>Common\Interop\Windows\User32\Interop.FindWindow.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.SendMessage.cs">
-      <Link>Common\Interop\Windows\user32\Interop.SendMessage.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.SendMessage.cs">
+      <Link>Common\Interop\Windows\User32\Interop.SendMessage.cs</Link>
     </Compile>
     <Compile Include="GenericEventTests.cs" />
     <Compile Include="SystemEvents.InvokeOnEventsThread.cs" />
@@ -34,4 +34,4 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
index a918a38..d501f9e 100644 (file)
--- a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
+++ b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
@@ -83,10 +83,10 @@
     <Compile Include="System\ComponentModel\Design\IDictionaryService.cs" />
     <Compile Include="System\ComponentModel\Design\IExtenderListService.cs" />
     <Compile Include="System\ComponentModel\Design\ITypeDescriptorFilterService.cs" />
-    <Compile Include="$(CommonPath)/System/Drawing/ColorConverterCommon.cs">
+    <Compile Include="$(CommonPath)\System\Drawing\ColorConverterCommon.cs">
       <Link>System\Drawing\ColorConverterCommon.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)/System/Drawing/ColorTable.cs">
+    <Compile Include="$(CommonPath)\System\Drawing\ColorTable.cs">
       <Link>System\Drawing\ColorTable.cs</Link>
     </Compile>
     <Compile Include="System\Drawing\ColorConverter.cs" />
@@ -273,4 +273,4 @@
     <Reference Include="System.Threading.Timer" />
     <Reference Include="System.Xml.XDocument" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Console/src/System.Console.csproj b/src/libraries/System.Console/src/System.Console.csproj
index 818ae66..841fd3d 100644 (file)
--- a/src/libraries/System.Console/src/System.Console.csproj
+++ b/src/libraries/System.Console/src/System.Console.csproj
@@ -36,7 +36,7 @@
     <Compile Include="$(CommonPath)\System\Text\DBCSDecoder.cs">
       <Link>Common\System\Text\DBCSDecoder.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCPInfoEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCPInfoEx.cs">
       <Link>Common\Interop\Windows\Interop.GetCPInfoEx.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
@@ -45,112 +45,112 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Interop.BOOL.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.BOOL.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.Beep.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.Beep.cs">
       <Link>Common\Interop\Windows\Interop.Beep.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FormatMessage.cs">
       <Link>Common\Interop\Windows\Interop.FormatMessage.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ConsoleCursorInfo.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ConsoleCursorInfo.cs">
       <Link>Common\Interop\Windows\Interop.ConsoleCursorInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ConsoleScreenBufferInfo.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ConsoleScreenBufferInfo.cs">
       <Link>Common\Interop\Windows\Interop.ConsoleScreenBufferInfo.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Errors.cs">
       <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FillConsoleOutputAttribute.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FillConsoleOutputAttribute.cs">
       <Link>Common\Interop\Windows\Interop.FillConsoleOutputAttribute.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FillConsoleOutputCharacter.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FillConsoleOutputCharacter.cs">
       <Link>Common\Interop\Windows\Interop.FillConsoleOutputCharacter.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FileTypes.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.FileTypes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetConsoleScreenBufferInfo.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetConsoleScreenBufferInfo.cs">
       <Link>Common\Interop\Windows\Interop.GetConsoleScreenBufferInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetConsoleCP.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetConsoleCP.cs">
       <Link>Common\Interop\Windows\Interop.GetConsoleCP.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetConsoleTitle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetConsoleTitle.cs">
       <Link>Common\Interop\Windows\Interop.GetConsoleTitle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetConsoleMode.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetConsoleMode.cs">
       <Link>Common\Interop\Windows\Interop.GetConsoleMode.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetConsoleOutputCP.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetConsoleOutputCP.cs">
       <Link>Common\Interop\Windows\Interop.GetConsoleOutputCP.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetLargestConsoleWindowSize.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetLargestConsoleWindowSize.cs">
       <Link>Common\Interop\Windows\Interop.GetLargestConsoleWindowSize.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetFileType_IntPtr.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetFileType_IntPtr.cs">
       <Link>Common\Interop\Windows\Interop.GetFileType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetKeyState.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.GetKeyState.cs">
       <Link>Common\Interop\Windows\Interop.GetKeyState.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetStdHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetStdHandle.cs">
       <Link>Common\Interop\Windows\Interop.GetStdHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.HandleTypes.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.HandleTypes.cs">
       <Link>Common\Interop\Windows\Interop.HandleTypes.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.MultiByteToWideChar.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.MultiByteToWideChar.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.PeekConsoleInput.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.PeekConsoleInput.cs">
       <Link>Common\Interop\Windows\Interop.PeekConsoleInput.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ReadFile_IntPtr.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ReadFile_IntPtr.cs">
       <Link>Common\Interop\Windows\Interop.ReadFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ReadConsole.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ReadConsole.cs">
       <Link>Common\Interop\Windows\Interop.ReadConsole.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ReadConsoleInput.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ReadConsoleInput.cs">
       <Link>Common\Interop\Windows\Interop.ReadConsoleInput.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ReadConsoleOutput.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ReadConsoleOutput.cs">
       <Link>Common\Interop\Windows\Interop.ReadConsoleOutput.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetConsoleCP.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetConsoleCP.cs">
       <Link>Common\Interop\Windows\Interop.SetConsoleCP.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetConsoleCtrlHandler.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetConsoleCtrlHandler.cs">
       <Link>Common\Interop\Windows\Interop.SetConsoleCtrlHandler.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetConsoleCursorPosition.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetConsoleCursorPosition.cs">
       <Link>Common\Interop\Windows\Interop.SetConsoleCursorPosition.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetConsoleOutputCP.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetConsoleOutputCP.cs">
       <Link>Common\Interop\Windows\Interop.SetConsoleOutputCP.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetConsoleScreenBufferSize.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetConsoleScreenBufferSize.cs">
       <Link>Common\Interop\Windows\Interop.SetConsoleScreenBufferSize.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetConsoleTextAttribute.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetConsoleTextAttribute.cs">
       <Link>Common\Interop\Windows\Interop.SetConsoleTextAttribute.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetConsoleTitle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetConsoleTitle.cs">
       <Link>Common\Interop\Windows\Interop.SetConsoleTitle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetConsoleWindowInfo.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetConsoleWindowInfo.cs">
       <Link>Common\Interop\Windows\Interop.SetConsoleWindowInfo.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.WideCharToMultiByte.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.WriteFile_IntPtr.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.WriteFile_IntPtr.cs">
       <Link>Common\Interop\Windows\Interop.WriteFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.WriteConsole.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.WriteConsole.cs">
       <Link>Common\Interop\Windows\Interop.WriteConsole.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.WriteConsoleOutput.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.WriteConsoleOutput.cs">
       <Link>Common\Interop\Windows\Interop.WriteConsoleOutput.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\System\Text\EncodingHelper.Windows.cs">

diff --git a/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj
index 9bd2a80..7070f91 100644 (file)
--- a/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj
+++ b/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{D4550556-4745-457F-BA8F-3EBF3836D6B4}</ProjectGuid>
     <AssemblyName>System.Data.SqlClient</AssemblyName>
@@ -240,20 +240,20 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.UNICODE_STRING.cs">
       <Link>Common\Interop\Windows\Interop.UNICODE_STRING.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.IoControlCodeAccess.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.IoControlCodeAccess.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.IoControlCodeAccess.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.IoControlCodeAccess.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CTL_CODE.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.CTL_CODE.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CTL_CODE.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.CTL_CODE.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.DeviceIoControl.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.DeviceIoControl.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.DeviceIoControl.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.DeviceIoControl.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FileOperations.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.FileOperations.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FileOperations.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.FileOperations.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.IoControlTransferType.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.IoControlTransferType.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.IoControlTransferType.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.IoControlTransferType.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.FILE_FULL_EA_INFORMATION.cs">
       <Link>Common\Interop\Windows\NtDll\Interop.FILE_FULL_EA_INFORMATION.cs</Link>
@@ -311,17 +311,17 @@
     <Compile Include="System\Data\SqlClient\SNI\LocalDB.Windows.cs" />
     <Compile Include="System\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs" />
     <Compile Include="System\Data\SqlClient\TdsParser.Windows.cs" />
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LoadLibraryEx.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LoadLibraryEx.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(IsPartialFacadeAssembly)' != 'true'">
     <Compile Include="System\Data\SqlClient\LocalDBAPI.Common.cs" />
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FreeLibrary.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.FreeLibrary.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetProcAddress.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetProcAddress.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetProcAddress.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcAddress.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
       <Link>Common\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs</Link>
@@ -335,14 +335,14 @@
     <Compile Include="$(CommonPath)\System\Net\Security\NegotiateStreamPal.Windows.cs">
       <Link>Common\System\Net\Security\NegotiateStreamPal.Windows.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SafeDeleteContext.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SafeDeleteContext.cs">
       <Link>Common\Interop\Windows\sspicliSafeDeleteContext.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecuritySafeHandles.cs">
-      <Link>Common\Interop\Windows\sspicli\SecuritySafeHandles.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecuritySafeHandles.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.SSPI.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.SSPI.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.SSPI.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.SSPI.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\Security\SecurityContextTokenHandle.cs">
       <Link>Common\System\Net\Security\SecurityContextTokenHandle.cs</Link>
@@ -353,8 +353,8 @@
     <Compile Include="$(CommonPath)\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs">
       <Link>Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_Bindings.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_Bindings.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs">
       <Link>Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs</Link>
@@ -365,44 +365,44 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
       <Link>Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\GlobalSSPI.cs">
-      <Link>Common\Interop\Windows\sspicli\GlobalSSPI.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\GlobalSSPI.cs">
+      <Link>Common\Interop\Windows\SspiCli\GlobalSSPI.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIInterface.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPIInterface.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPIInterface.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPIInterface.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecurityPackageInfoClass.cs">
-      <Link>Common\Interop\Windows\sspicli\SecurityPackageInfoClass.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecurityPackageInfo.cs">
-      <Link>Common\Interop\Windows\sspicli\SecurityPackageInfo.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecurityPackageInfo.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIAuthType.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPIAuthType.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPIAuthType.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPIAuthType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPISecureChannelType.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPISecureChannelType.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPISecureChannelType.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIWrapper.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPIWrapper.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPIWrapper.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPIWrapper.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\Security\NetEventSource.Security.Windows.cs">
       <Link>Common\System\Net\Security\NetEventSource.Security.Windows.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_Sizes.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_Sizes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_StreamSizes.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_StreamSizes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_NegotiationInfoW.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_NegotiationInfoW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs">
       <Link>Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\NegotiationInfoClass.cs">
-      <Link>Common\Interop\Windows\sspicli\NegotiationInfoClass.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\NegotiationInfoClass.cs">
+      <Link>Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Crypt32\Interop.certificates.cs">
       <Link>Common\Interop\Windows\Crypt32\Interop.certificates.cs</Link>
@@ -569,4 +569,4 @@
     <Reference Include="System.Runtime.InteropServices" />
   </ItemGroup>
   <Import Project=".\GenerateThisAssemblyCs.targets" Condition="'$(IsPartialFacadeAssembly)' != 'true'" />
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
index 890b42a..42cb89a 100644 (file)
--- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
+++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
@@ -61,53 +61,53 @@
     <Compile Include="$(CommonPath)\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
       <Link>Common\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ClearEventLog.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.ClearEventLog.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ClearEventLog.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.ClearEventLog.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CloseEventLog.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CloseEventLog.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CloseEventLog.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CloseEventLog.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.DeregisterEventSource.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.DeregisterEventSource.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.DeregisterEventSource.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.DeregisterEventSource.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.GetNumberOfEventLogRecords.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.GetNumberOfEventLogRecords.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.GetNumberOfEventLogRecords.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.GetNumberOfEventLogRecords.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.GetOldestEventLogRecord.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.GetOldestEventLogRecord.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.GetOldestEventLogRecord.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.GetOldestEventLogRecord.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.LookupAccountSid.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.LookupAccountSid.cs">
       <Link>Common\Interop\Windows\Advapi32\Interop.LookupAccountSid.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.NotifyChangeEventLog.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.NotifyChangeEventLog.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.NotifyChangeEventLog.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.NotifyChangeEventLog.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.OpenEventLog.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.OpenEventLog.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.OpenEventLog.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.OpenEventLog.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ReadEventLog.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.ReadEventLog.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ReadEventLog.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.ReadEventLog.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.RegisterEventSource.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.RegisterEventSource.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.RegisterEventSource.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.RegisterEventSource.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ReportEvent.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.ReportEvent.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ReportEvent.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.ReportEvent.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.Constants.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.Constants.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.Constants.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.Constants.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FormatMessage_SafeLibraryHandle.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.FormatMessage_SafeLibraryHandle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FormatMessage_SafeLibraryHandle.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.FormatMessage_SafeLibraryHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FreeLibrary.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.FreeLibrary.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LoadLibraryEx.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LoadLibraryEx.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.WaitForSingleObject.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.WaitForSingleObject.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.WaitForSingleObject.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.WaitForSingleObject.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Errors.cs">
       <Link>Common\Interop\Windows\Interop.Errors.cs</Link>

diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
index 3e39b10..35a6265 100644 (file)
--- a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
@@ -14,25 +14,25 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\version\Interop.FileVersionInfo.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Version\Interop.FileVersionInfo.cs">
       <Link>Common\Interop\Windows\Interop.FileVersionInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\version\Interop.FileVersionInfoType.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Version\Interop.FileVersionInfoType.cs">
       <Link>Common\Interop\Windows\Interop.FileVersionInfoType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\version\Interop.GetFileVersionInfoEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Version\Interop.GetFileVersionInfoEx.cs">
       <Link>Common\Interop\Windows\Interop.GetFileVersionInfoEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\version\Interop.GetFileVersionInfoSizeEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Version\Interop.GetFileVersionInfoSizeEx.cs">
       <Link>Common\Interop\Windows\Interop.GetFileVersionInfoSizeEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.VerLanguageName.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.VerLanguageName.cs">
       <Link>Common\Interop\Windows\Interop.VerLanguageName.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\version\Interop.VerQueryValue.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Version\Interop.VerQueryValue.cs">
       <Link>Common\Interop\Windows\Interop.VerQueryValue.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\version\Interop.VSFixedFileInfo.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Version\Interop.VSFixedFileInfo.cs">
       <Link>Common\Interop\Windows\Interop.VSFixedFileInfo.cs</Link>
     </Compile>
   </ItemGroup>
@@ -63,4 +63,4 @@
     <Reference Include="System.IO" />
     <Reference Include="System.Runtime.Extensions" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj
index a0c36d2..d8bd3a8 100644 (file)
--- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj
@@ -28,8 +28,8 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>ProductionCode\Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.VerLanguageName.cs">
-      <Link>ProductionCode\Common\Interop\Windows\kernel32\Interop.VerLanguageName.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.VerLanguageName.cs">
+      <Link>ProductionCode\Common\Interop\Windows\Kernel32\Interop.VerLanguageName.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
@@ -46,4 +46,4 @@
     <!-- Copy TestAssembly to file without .dll extension so that ILC preserves it as a data file rather than feeding it to the output executable. -->
     <Copy SourceFiles="$(TestPath)\System.Diagnostics.FileVersionInfo.TestAssembly.dll" DestinationFiles="$(TestPath)\System.Diagnostics.FileVersionInfo.TestAssembly.ildll" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
index 04797c8..4ecfb45 100644 (file)
--- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{9758106C-5D4E-475D-B5E7-B7ABC46B1DDA}</ProjectGuid>
@@ -47,11 +47,11 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FormatMessage.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.FormatMessage.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\advapi32\Interop.RegCloseKey.cs">
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Advapi32\Interop.RegCloseKey.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.RegCloseKey.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\advapi32\Interop.RegQueryValueEx.cs">
-      <Link>Common\CoreLib\Interop\Windows\advapi32\Interop.RegQueryValueEx.cs</Link>
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Advapi32\Interop.RegQueryValueEx.cs">
+      <Link>Common\CoreLib\Interop\Windows\Advapi32\Interop.RegQueryValueEx.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs">
       <Link>Common\CoreLib\Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs</Link>
@@ -65,101 +65,101 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.GetTokenInformation.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.GetTokenInformation.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.GetTokenInformation.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.GetTokenInformation.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.PERF_INFO.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.PERF_INFO.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.PERF_INFO.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.PERF_INFO.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ProcessOptions.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.ProcessOptions.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ProcessOptions.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.ProcessOptions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.RegConnectRegistry.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.RegConnectRegistry.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.RegConnectRegistry.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.RegConnectRegistry.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.TOKEN_INFORMATION_CLASS.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.TOKEN_INFORMATION_CLASS.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.Constants.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.Constants.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.Constants.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.Constants.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateFileMapping.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.CreateFileMapping.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreateFileMapping.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.CreateFileMapping.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.DuplicateHandle_SafeProcessHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.DuplicateHandle_SafeProcessHandle.cs">
       <Link>Common\Interop\Windows\kernel32\Interop.DuplicateHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FreeLibrary.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.FreeLibrary.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.GetComputerName.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetComputerName.cs</Link>
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.GetComputerName.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetComputerName.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCurrentProcess_SafeProcessHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCurrentProcess_SafeProcessHandle.cs">
       <Link>Common\Interop\Windows\kernel32\Interop.GetCurrentProcess.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCurrentProcessId.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetCurrentProcessId.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetProcessTimes.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetProcessTimes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetProcessTimes.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcessTimes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.HandleOptions.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.HandleOptions.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.HandleOptions.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.HandleOptions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LoadLibrary.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LoadLibrary.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LoadLibrary.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LoadLibrary.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LocalAlloc.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalAlloc.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LocalAlloc.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.Constants.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LocalAlloc.Constants.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalAlloc.Constants.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LocalAlloc.Constants.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalFree.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LocalFree.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalFree.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LocalFree.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.MapViewOfFile.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.MapViewOfFile.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.MapViewOfFile.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.MapViewOfFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.MemOptions.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.MemOptions.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.MemOptions.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.MemOptions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.MEMORY_BASIC_INFO.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.MEMORY_BASIC_INFO.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.MEMORY_BASIC_INFO.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.MEMORY_BASIC_INFO.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.OpenFileMapping.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.OpenFileMapping.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.OpenFileMapping.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.OpenFileMapping.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.OpenProcess.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.OpenProcess.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.OpenProcess.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.OpenProcess.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.PerformanceCounterOptions.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.PerformanceCounterOptions.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.PerformanceCounterOptions.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.PerformanceCounterOptions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ProcessWaitHandle.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.ProcessWaitHandle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ProcessWaitHandle.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.ProcessWaitHandle.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
       <Link>Common\CoreLib\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.UnmapViewOfFile.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.UnmapViewOfFile.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.UnmapViewOfFile.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.UnmapViewOfFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.VirtualQuery.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.VirtualQuery.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.VirtualQuery.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.VirtualQuery.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.WaitForSingleObject.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.WaitForSingleObject.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.WaitForSingleObject.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.WaitForSingleObject.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\perfcounter\Interop.FormatFromRawValue.cs">
-      <Link>Common\Interop\Windows\perfcounter\Interop.FormatFromRawValue.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\PerfCounter\Interop.FormatFromRawValue.cs">
+      <Link>Common\Interop\Windows\PerfCounter\Interop.FormatFromRawValue.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\perfcounter\Interop.PerformanceData.cs">
-      <Link>Common\Interop\Windows\perfcounter\Interop.PerformanceData.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\PerfCounter\Interop.PerformanceData.cs">
+      <Link>Common\Interop\Windows\PerfCounter\Interop.PerformanceData.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs">
       <Link>Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs</Link>

diff --git a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
index 54874f5..1018139 100644 (file)
--- a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
+++ b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{F55047F8-E47B-46E3-B221-C23595AFE168}</ProjectGuid>
@@ -45,8 +45,8 @@
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true' and '$(TargetGroup)' != 'uap'">
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.EnumProcessModules.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.EnumProcessModules.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.EnumProcessModules.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.EnumProcessModules.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.NtQueryInformationProcess.cs">
       <Link>Common\Interop\Windows\NtDll\Interop.NtQueryInformationProcess.cs</Link>
@@ -54,35 +54,35 @@
     <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.NtQuerySystemInformation.cs">
       <Link>Common\Interop\Windows\NtDll\Interop.NtQuerySystemInformation.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.EnumWindows.cs">
-      <Link>Common\Interop\Windows\user32\Interop.EnumWindows.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.EnumWindows.cs">
+      <Link>Common\Interop\Windows\User32\Interop.EnumWindows.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetWindow.cs">
-      <Link>Common\Interop\Windows\user32\Interop.GetWindow.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.GetWindow.cs">
+      <Link>Common\Interop\Windows\User32\Interop.GetWindow.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetWindowLong.cs">
-      <Link>Common\Interop\Windows\user32\Interop.GetWindowLong.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.GetWindowLong.cs">
+      <Link>Common\Interop\Windows\User32\Interop.GetWindowLong.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetWindowTextLengthW.cs">
-      <Link>Common\Interop\Windows\user32\Interop.GetWindowTextLengthW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.GetWindowTextLengthW.cs">
+      <Link>Common\Interop\Windows\User32\Interop.GetWindowTextLengthW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetWindowTextW.cs">
-      <Link>Common\Interop\Windows\user32\Interop.GetWindowTextW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.GetWindowTextW.cs">
+      <Link>Common\Interop\Windows\User32\Interop.GetWindowTextW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetWindowThreadProcessId.cs">
-      <Link>Common\Interop\Windows\user32\Interop.GetWindowThreadProcessId.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.GetWindowThreadProcessId.cs">
+      <Link>Common\Interop\Windows\User32\Interop.GetWindowThreadProcessId.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.PostMessage.cs">
-      <Link>Common\Interop\Windows\user32\Interop.PostMessage.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.PostMessage.cs">
+      <Link>Common\Interop\Windows\User32\Interop.PostMessage.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.IsWindowVisible.cs">
-      <Link>Common\Interop\Windows\user32\Interop.IsWindowVisible.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.IsWindowVisible.cs">
+      <Link>Common\Interop\Windows\User32\Interop.IsWindowVisible.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.SendMessageTimeout.cs">
-      <Link>Common\Interop\Windows\user32\Interop.SendMessageTimeout.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.SendMessageTimeout.cs">
+      <Link>Common\Interop\Windows\User32\Interop.SendMessageTimeout.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.WaitForInputIdle.cs">
-      <Link>Common\Interop\Windows\user32\Interop.WaitForInputIdle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.WaitForInputIdle.cs">
+      <Link>Common\Interop\Windows\User32\Interop.WaitForInputIdle.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
@@ -92,125 +92,125 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
       <Link>Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.PERF_INFO.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.PERF_INFO.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.PERF_INFO.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.PERF_INFO.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.IsWow64Process_SafeProcessHandle.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.IsWow64Process_SafeProcessHandle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.IsWow64Process_SafeProcessHandle.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.IsWow64Process_SafeProcessHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetExitCodeProcess.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetExitCodeProcess.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetExitCodeProcess.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetExitCodeProcess.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetProcessTimes.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetProcessTimes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetProcessTimes.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcessTimes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetThreadTimes.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetThreadTimes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetThreadTimes.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetThreadTimes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetStdHandle.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetStdHandle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetStdHandle.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetStdHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateProcess.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.CreateProcess.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreateProcess.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.CreateProcess.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.TerminateProcess.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.TerminateProcess.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.TerminateProcess.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.TerminateProcess.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCurrentProcess_SafeProcessHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCurrentProcess_SafeProcessHandle.cs">
       <Link>Common\Interop\Windows\kernel32\Interop.GetCurrentProcess.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.OpenProcess.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.OpenProcess.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.OpenProcess.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.OpenProcess.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.EnumProcesses.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.EnumProcesses.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.EnumProcesses.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.EnumProcesses.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetModuleInformation.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetModuleInformation.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetModuleInformation.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetModuleInformation.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetModuleBaseName.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetModuleBaseName.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetModuleBaseName.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetModuleBaseName.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetModuleFileNameEx.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetModuleFileNameEx.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetModuleFileNameEx.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetModuleFileNameEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetProcessWorkingSetSizeEx.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SetProcessWorkingSetSizeEx.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetProcessWorkingSetSizeEx.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SetProcessWorkingSetSizeEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetProcessWorkingSetSizeEx.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetProcessWorkingSetSizeEx.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetProcessWorkingSetSizeEx.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcessWorkingSetSizeEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetProcessAffinityMask.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SetProcessAffinityMask.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetProcessAffinityMask.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SetProcessAffinityMask.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetProcessAffinityMask.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetProcessAffinityMask.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetProcessAffinityMask.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcessAffinityMask.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetProcessId.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetProcessId.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetProcessId.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcessId.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetThreadPriorityBoost.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetThreadPriorityBoost.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetThreadPriorityBoost.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetThreadPriorityBoost.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetThreadPriorityBoost.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SetThreadPriorityBoost.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetThreadPriorityBoost.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SetThreadPriorityBoost.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetProcessPriorityBoost.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetProcessPriorityBoost.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetProcessPriorityBoost.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcessPriorityBoost.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetProcessPriorityBoost.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SetProcessPriorityBoost.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetProcessPriorityBoost.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SetProcessPriorityBoost.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.OpenThread.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.OpenThread.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.OpenThread.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.OpenThread.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetThreadPriority.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SetThreadPriority.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetThreadPriority.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SetThreadPriority.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetThreadPriority.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetThreadPriority.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetThreadPriority.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetThreadPriority.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetThreadAffinityMask.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SetThreadAffinityMask.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetThreadAffinityMask.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SetThreadAffinityMask.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetThreadIdealProcessor.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SetThreadIdealProcessor.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetThreadIdealProcessor.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SetThreadIdealProcessor.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetPriorityClass.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetPriorityClass.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetPriorityClass.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetPriorityClass.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetPriorityClass.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SetPriorityClass.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetPriorityClass.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SetPriorityClass.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.DuplicateHandle_SafeProcessHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.DuplicateHandle_SafeProcessHandle.cs">
       <Link>Common\Interop\Windows\kernel32\Interop.DuplicateHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ProcessWaitHandle.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.ProcessWaitHandle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ProcessWaitHandle.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.ProcessWaitHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.OpenProcessToken.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.OpenProcessToken.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.OpenProcessToken.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.OpenProcessToken.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.LookupPrivilegeValue.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.LookupPrivilegeValue.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.LookupPrivilegeValue.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.LookupPrivilegeValue.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.AdjustTokenPrivileges.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.AdjustTokenPrivileges.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.AdjustTokenPrivileges.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.AdjustTokenPrivileges.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.GetComputerName.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetComputerName.cs</Link>
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.GetComputerName.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetComputerName.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCurrentProcessId.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetCurrentProcessId.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetConsoleCP.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetConsoleCP.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetConsoleCP.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetConsoleCP.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetConsoleOutputCP.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetConsoleOutputCP.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetConsoleOutputCP.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetConsoleOutputCP.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CreateProcessWithLogon.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CreateProcessWithLogon.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CreateProcessWithLogon.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CreateProcessWithLogon.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Interop.BOOL.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.BOOL.cs</Link>
@@ -218,31 +218,31 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
       <Link>Common\CoreLib\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.LUID.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.LUID.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.LUID.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.LUID.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.LUID_AND_ATTRIBUTES.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.LUID_AND_ATTRIBUTES.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.LUID_AND_ATTRIBUTES.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.LUID_AND_ATTRIBUTES.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.TOKEN_PRIVILEGE.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.TOKEN_PRIVILEGE.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.TOKEN_PRIVILEGE.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.TOKEN_PRIVILEGE.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.Constants.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.Constants.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.Constants.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.Constants.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreatePipe_SafeFileHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreatePipe_SafeFileHandle.cs">
       <Link>Common\Interop\Windows\kernel32\Interop.CreatePipe.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ThreadOptions.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.ThreadOptions.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ThreadOptions.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.ThreadOptions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.HandleTypes.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.HandleTypes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.HandleTypes.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.HandleTypes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ProcessOptions.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.ProcessOptions.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ProcessOptions.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.ProcessOptions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.HandleOptions.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.HandleOptions.cs">
       <Link>Common\Interop\Windows\kernel32\Interop.ProcessOptions.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.MultiByteToWideChar.cs">
@@ -269,8 +269,8 @@
     <Compile Include="$(CommonPath)\System\Text\DBCSDecoder.cs">
       <Link>Common\System\Text\DBCSDecoder.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCPInfoEx.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetCPInfoEx.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCPInfoEx.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetCPInfoEx.cs</Link>
     </Compile>
     <Compile Include="Microsoft\Win32\SafeHandles\SafeProcessHandle.Windows.cs" />
     <Compile Include="Microsoft\Win32\SafeHandles\SafeThreadHandle.cs" />
@@ -391,8 +391,8 @@
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' AND '$(TargetsWindows)' == 'true'">
-    <Compile Include="$(CommonPath)\Interop\Windows\shell32\Interop.ShellExecuteExW.cs">
-      <Link>Common\Interop\Windows\shell32\Interop.ShellExecuteExW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Shell32\Interop.ShellExecuteExW.cs">
+      <Link>Common\Interop\Windows\Shell32\Interop.ShellExecuteExW.cs</Link>
     </Compile>
     <Compile Include="System\Diagnostics\Process.Win32.cs" />
     <Compile Include="System\Diagnostics\ProcessManager.Win32.cs" />

diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj
index 6e4a7c5..3fca810 100644 (file)
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj
@@ -24,7 +24,7 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCurrentProcessId.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs">
       <Link>Common\Interop\Windows\Interop.GetCurrentProcessId.cs</Link>
     </Compile>
   </ItemGroup>
@@ -55,4 +55,4 @@
     <Reference Include="System.Threading.Thread" />
     <Reference Include="System.Xml.ReaderWriter" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj
index 827c2cb..8c0cfb5 100644 (file)
--- a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj
+++ b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj
@@ -43,7 +43,7 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCurrentProcessId.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs">
       <Link>Common\Interop\Windows\Interop.GetCurrentProcessId.cs</Link>
     </Compile>
   </ItemGroup>

diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
index b907794..7d84f4a 100644 (file)
--- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
+++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
@@ -89,7 +89,7 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.LookupAccountSid.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.LookupAccountSid.cs">
       <Link>Common\Interop\Windows\Advapi32\Interop.LookupAccountSid.cs</Link>
     </Compile>
   </ItemGroup>
@@ -125,4 +125,4 @@
   <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp2.0'">
     <Reference Include="System.ComponentModel.TypeConverter" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
index ff984bd..1e2a6f7 100644 (file)
--- a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
+++ b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
@@ -249,20 +249,20 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FreeLibrary.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.FreeLibrary.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LoadLibraryEx.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LoadLibraryEx.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetProcAddress.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetProcAddress.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetProcAddress.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcAddress.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetSysColor.cs">
-      <Link>Common\Interop\Windows\user32\Interop.GetSysColor.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.GetSysColor.cs">
+      <Link>Common\Interop\Windows\User32\Interop.GetSysColor.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.Win32SystemColors.cs">
-      <Link>Common\Interop\Windows\user32\Interop.Win32SystemColors.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.Win32SystemColors.cs">
+      <Link>Common\Interop\Windows\User32\Interop.Win32SystemColors.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
       <Link>Common\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs</Link>
@@ -379,4 +379,4 @@
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
index 23888bd..5a0821e 100644 (file)
--- a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
+++ b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
@@ -46,11 +46,11 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetSysColor.cs">
-      <Link>Common\Interop\Windows\user32\Interop.GetSysColor.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.GetSysColor.cs">
+      <Link>Common\Interop\Windows\User32\Interop.GetSysColor.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.Win32SystemColors.cs">
-      <Link>Common\Interop\Windows\user32\Interop.Win32SystemColors.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.Win32SystemColors.cs">
+      <Link>Common\Interop\Windows\User32\Interop.Win32SystemColors.cs</Link>
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
index f7f1e37..14d7470 100644 (file)
--- a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
@@ -23,22 +23,22 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetDriveType.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetDriveType.cs">
       <Link>Common\Interop\Windows\Interop.GetDriveType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetVolumeInformation.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetVolumeInformation.cs">
       <Link>Common\Interop\Windows\Interop.GetVolumeInformation.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.GetLogicalDrives.cs">
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.GetLogicalDrives.cs">
       <Link>Common\Interop\Windows\Interop.GetLogicalDrives.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetDiskFreeSpaceEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetDiskFreeSpaceEx.cs">
       <Link>Common\Interop\Windows\Interop.GetDiskFreeSpaceEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.MaxLengths.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.MaxLengths.cs">
       <Link>Common\Interop\Windows\Interop.MaxLengths.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetVolumeLabel.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetVolumeLabel.cs">
       <Link>Common\Interop\Windows\Interop.SetVolumeLabel.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.SetThreadErrorMode.cs">
@@ -47,7 +47,7 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.SecurityOptions.cs">
       <Link>Common\Interop\Windows\Interop.SecurityOptions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FileOperations.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FileOperations.cs">
       <Link>Common\Interop\Windows\Interop.FileOperations.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Errors.cs">

diff --git a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
index 45299bd..36e628c 100644 (file)
--- a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
+++ b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
@@ -36,11 +36,11 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FileOperations.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.FileOperations.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FileOperations.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.FileOperations.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ReadDirectoryChangesW.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.ReadDirectoryChangesW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ReadDirectoryChangesW.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.ReadDirectoryChangesW.cs</Link>
     </Compile>
     <Compile Include="System\IO\FileSystemWatcher.Win32.cs">
       <SubType>Component</SubType>
@@ -51,19 +51,19 @@
   </ItemGroup>
   <!-- Windows : Win32 only -->
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)' != 'uap'">
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateFile.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreateFile.cs">
       <Link>Common\Interop\Windows\Interop.CreateFile.cs</Link>
     </Compile>
   </ItemGroup>
   <!-- Windows : UAP - Win32 + WinRT -->
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)' == 'uap'">
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateFile2.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreateFile2.cs">
       <Link>Common\Interop\Windows\Interop.CreateFile2.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.COPYFILE2_EXTENDED_PARAMETERS.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.COPYFILE2_EXTENDED_PARAMETERS.cs">
       <Link>Common\Interop\Windows\Interop.COPYFILE2_EXTENDED_PARAMETERS.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CREATEFILE2_EXTENDED_PARAMETERS.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CREATEFILE2_EXTENDED_PARAMETERS.cs">
       <Link>Common\Interop\Windows\Interop.CREATEFILE2_EXTENDED_PARAMETERS.cs</Link>
     </Compile>
   </ItemGroup>
@@ -165,4 +165,4 @@
   <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
     <Reference Include="System.Collections" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj b/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj
index 3370206..321f011 100644 (file)
--- a/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj
+++ b/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj
@@ -80,88 +80,88 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Interop.BOOL.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.BOOL.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetVolumeInformation.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetVolumeInformation.cs">
       <Link>Common\Interop\Windows\Interop.GetVolumeInformation.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetFileInformationByHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetFileInformationByHandle.cs">
       <Link>Common\Interop\Windows\Interop.SetFileInformationByHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FindNextFile.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FindNextFile.cs">
       <Link>Common\Interop\Windows\Interop.FindNextFile.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FindClose.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.FindClose.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FileOperations.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FileOperations.cs">
       <Link>Common\Interop\Windows\Interop.FileOperations.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FileAttributes.cs">
       <Link>Common\Interop\Windows\Interop.FileAttributes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GenericOperations.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GenericOperations.cs">
       <Link>Common\Interop\Windows\Interop.GenericOperations.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.MaxLengths.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.MaxLengths.cs">
       <Link>Common\Interop\Windows\Interop.MaxLengths.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.WIN32_FIND_DATA.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.WIN32_FIND_DATA.cs">
       <Link>Common\Interop\Windows\Interop.WIN32_FIND_DATA.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FILE_TIME.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FILE_TIME.cs">
       <Link>Common\Interop\Windows\Interop.FILE_TIME.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.WIN32_FILE_ATTRIBUTE_DATA.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.WIN32_FILE_ATTRIBUTE_DATA.cs">
       <Link>Common\Interop\Windows\Interop.WIN32_FILE_ATTRIBUTE_DATA.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GET_FILEEX_INFO_LEVELS.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GET_FILEEX_INFO_LEVELS.cs">
       <Link>Common\Interop\Windows\Interop.GET_FILEEX_INFO_LEVELS.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.SetThreadErrorMode.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.SetThreadErrorMode.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.GetLogicalDrives.cs">
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.GetLogicalDrives.cs">
       <Link>Common\Interop\Windows\Interop.GetLogicalDrives.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.DeleteVolumeMountPoint.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.DeleteVolumeMountPoint.cs">
       <Link>Common\Interop\Windows\Interop.DeleteVolumeMountPoint.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\System\Memory\FixedBufferExtensions.cs">
       <Link>Common\System\Memory\FixedBufferExtensions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.DeleteFile.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.DeleteFile.cs">
       <Link>Common\Interop\Windows\Interop.DeleteFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CompareStringOrdinal.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CompareStringOrdinal.cs">
       <Link>Common\Interop\Windows\Interop.CompareStringOrdinal.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateDirectory.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreateDirectory.cs">
       <Link>Common\Interop\Windows\Interop.CreateDirectory.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetFileAttributes.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetFileAttributes.cs">
       <Link>Common\Interop\Windows\Interop.SetFileAttributes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.MoveFileEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.MoveFileEx.cs">
       <Link>Common\Interop\Windows\Interop.MoveFileEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetFileAttributesEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetFileAttributesEx.cs">
       <Link>Common\Interop\Windows\Interop.GetFileAttributesEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.RemoveDirectory.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.RemoveDirectory.cs">
       <Link>Common\Interop\Windows\Interop.RemoveDirectory.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FindFirstFileEx.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.FindFirstFileEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ReplaceFile.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ReplaceFile.cs">
       <Link>Common\Interop\Windows\Interop.ReplaceFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CopyFile.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CopyFile.cs">
       <Link>Common\Interop\Windows\Interop.CopyFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CopyFileEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CopyFileEx.cs">
       <Link>Common\Interop\Windows\Interop.CopyFileEx.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.FILE_FULL_DIR_INFORMATION.cs">
@@ -170,7 +170,7 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.LongFileTime.cs">
       <Link>Common\Interop\Windows\Interop.LongFileTime.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FILE_INFO_BY_HANDLE_CLASS.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FILE_INFO_BY_HANDLE_CLASS.cs">
       <Link>Common\Interop\Windows\Interop.FILE_INFO_BY_HANDLE_CLASS.cs</Link>
     </Compile>
   </ItemGroup>
@@ -178,10 +178,10 @@
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(UWPCompatible)' != 'true'">
     <Compile Include="System\IO\FileSystem.Win32.cs" />
     <Compile Include="System\IO\Enumeration\FileSystemEnumerator.Win32.cs" />
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateFile.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreateFile.cs">
       <Link>Common\Interop\Windows\Interop.CreateFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.EncryptDecrypt.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.EncryptDecrypt.cs">
       <Link>Common\Interop\Windows\Interop.EncryptDecrypt.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.UNICODE_STRING.cs">
@@ -213,16 +213,16 @@
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(UWPCompatible)' == 'true'">
     <Compile Include="System\IO\FileSystem.WinRT.cs" />
     <Compile Include="System\IO\Enumeration\FileSystemEnumerator.WinRT.cs" />
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateFile2.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreateFile2.cs">
       <Link>Common\Interop\Windows\Interop.CreateFile2.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.COPYFILE2_EXTENDED_PARAMETERS.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.COPYFILE2_EXTENDED_PARAMETERS.cs">
       <Link>Common\Interop\Windows\Interop.COPYFILE2_EXTENDED_PARAMETERS.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CREATEFILE2_EXTENDED_PARAMETERS.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CREATEFILE2_EXTENDED_PARAMETERS.cs">
       <Link>Common\Interop\Windows\Interop.CREATEFILE2_EXTENDED_PARAMETERS.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetFileInformationByHandleEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetFileInformationByHandleEx.cs">
       <Link>Common\Interop\Windows\Interop.GetFileInformationByHandleEx.cs</Link>
     </Compile>
   </ItemGroup>

diff --git a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
index a5fd32c..c8c08a0 100644 (file)
--- a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
+++ b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
@@ -17,37 +17,37 @@
     <Compile Include="System\IO\MemoryMappedFiles\MemoryMappedFileRights.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetGroup)' == 'uap'">
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateFileMappingFromApp.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreateFileMappingFromApp.cs">
       <Link>Common\Interop\Windows\Interop.CreateFileMappingFromApp.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.MapViewOfFileFromApp.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.MapViewOfFileFromApp.cs">
       <Link>Common\Interop\Windows\Interop.MapViewOfFileFromApp.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\mincore\Interop.OpenFileMappingFromApp.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Mincore\Interop.OpenFileMappingFromApp.cs">
       <Link>Common\Interop\Windows\Interop.OpenFileMappingFromApp.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\mincore\Interop.VirtualAllocFromApp.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Mincore\Interop.VirtualAllocFromApp.cs">
       <Link>Common\Interop\Windows\Interop.VirtualAllocFromApp.cs</Link>
     </Compile>
     <Compile Include="System\IO\MemoryMappedFiles\Interop.Windows.Uap.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)' != 'uap'">
     <Compile Include="System\IO\MemoryMappedFiles\Interop.Windows.cs" />
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateFileMapping.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreateFileMapping.cs">
       <Link>Common\Interop\Windows\Interop.CreateFileMapping.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.MapViewOfFile.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.MapViewOfFile.cs">
       <Link>Common\Interop\Windows\Interop.MapViewOfFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.OpenFileMapping.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.OpenFileMapping.cs">
       <Link>Common\Interop\Windows\Interop.OpenFileMapping.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.VirtualAlloc.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.VirtualAlloc.cs">
       <Link>Common\Interop\Windows\Interop.VirtualAlloc.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GlobalMemoryStatusEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GlobalMemoryStatusEx.cs">
       <Link>Common\Interop\Windows\Interop.GlobalMemoryStatusEx.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
@@ -68,34 +68,34 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FileAttributes.cs">
       <Link>Common\Interop\Windows\Interop.FileAttributes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FileOperations.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FileOperations.cs">
       <Link>Common\Interop\Windows\Interop.FileOperations.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FileShareMode.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FileShareMode.cs">
       <Link>Common\Interop\Windows\Interop.FileShareMode.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FlushViewOfFile.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FlushViewOfFile.cs">
       <Link>Common\Interop\Windows\Interop.FlushViewOfFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GenericOperations.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GenericOperations.cs">
       <Link>Common\Interop\Windows\Interop.GenericOperations.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.GetSystemInfo.cs">
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.GetSystemInfo.cs">
       <Link>Common\Interop\Windows\Interop.GetSystemInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.SYSTEM_INFO.cs">
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.SYSTEM_INFO.cs">
       <Link>Common\Interop\Windows\Interop.SYSTEM_INFO.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.HandleOptions.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.HandleOptions.cs">
       <Link>Common\Interop\Windows\Interop.HandleOptions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.MEMORY_BASIC_INFO.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.MEMORY_BASIC_INFO.cs">
       <Link>Common\Interop\Windows\Interop.MEMORY_BASIC_INFO.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.MemOptions.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.MemOptions.cs">
       <Link>Common\Interop\Windows\Interop.MemOptions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.PipeOptions.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.PipeOptions.cs">
       <Link>Common\Interop\Windows\Interop.PipeOptions.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Interop.BOOL.cs">
@@ -104,10 +104,10 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.SecurityOptions.cs">
       <Link>Common\Interop\Windows\Interop.SecurityOptions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.UnmapViewOfFile.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.UnmapViewOfFile.cs">
       <Link>Common\Interop\Windows\Interop.UnmapViewOfFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.VirtualQuery.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.VirtualQuery.cs">
       <Link>Common\Interop\Windows\Interop.VirtualQuery.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\System\IO\Win32Marshal.cs">

diff --git a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
index 4e274ee..2d71e9e 100644 (file)
--- a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
+++ b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
@@ -49,46 +49,46 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GenericOperations.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GenericOperations.cs">
       <Link>Common\Interop\Windows\Interop.GenericOperations.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.HandleOptions.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.HandleOptions.cs">
       <Link>Common\Interop\Windows\Interop.HandleOptions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.PipeOptions.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.PipeOptions.cs">
       <Link>Common\Interop\Windows\Interop.PipeOptions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FileOperations.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FileOperations.cs">
       <Link>Common\Interop\Windows\Interop.FileOperations.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FileTypes.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.FileTypes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.GetCurrentProcess_IntPtr.cs">
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs">
       <Link>Common\Interop\Windows\Interop.GetCurrentProcess.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.DuplicateHandle_IntPtr.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.DuplicateHandle_IntPtr.cs">
       <Link>Common\Interop\Windows\Interop.DuplicateHandle_IntPtr.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.GetFileType_SafeHandle.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.GetFileType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreatePipe_SafePipeHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreatePipe_SafePipeHandle.cs">
       <Link>Common\Interop\Windows\Interop.CreatePipe_SafePipeHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ConnectNamedPipe.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ConnectNamedPipe.cs">
       <Link>Common\Interop\Windows\Interop.ConnectNamedPipe.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.WaitNamedPipe.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.WaitNamedPipe.cs">
       <Link>Common\Interop\Windows\Interop.WaitNamedPipe.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetNamedPipeHandleState.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetNamedPipeHandleState.cs">
       <Link>Common\Interop\Windows\Interop.GetNamedPipeHandleState.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetNamedPipeInfo.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetNamedPipeInfo.cs">
       <Link>Common\Interop\Windows\Interop.GetNamedPipeInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetNamedPipeHandleState.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetNamedPipeHandleState.cs">
       <Link>Common\Interop\Windows\Interop.SetNamedPipeHandleState.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.CancelIoEx.cs">
@@ -109,19 +109,19 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_NativeOverlapped.cs">
       <Link>Common\Interop\Windows\Interop.WriteFile_NativeOverlapped.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.DisconnectNamedPipe.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.DisconnectNamedPipe.cs">
       <Link>Common\Interop\Windows\Interop.DisconnectNamedPipe.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateNamedPipe.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreateNamedPipe.cs">
       <Link>Common\Interop\Windows\Interop.CreateNamedPipe.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.MaxLengths.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.MaxLengths.cs">
       <Link>Common\Interop\Windows\Interop.MaxLengths.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.RevertToSelf.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.RevertToSelf.cs">
       <Link>Common\Interop\Windows\Interop.RevertToSelf.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ImpersonateNamedPipeClient.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ImpersonateNamedPipeClient.cs">
       <Link>Common\Interop\Windows\Interop.ImpersonateNamedPipeClient.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\System\IO\Win32Marshal.cs">
@@ -143,16 +143,16 @@
   </ItemGroup>
   <!-- Windows : Win32 only -->
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)' != 'uap'">
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateNamedPipeClient.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreateNamedPipeClient.cs">
       <Link>Common\Interop\Windows\Interop.CreateNamedPipeClient.cs</Link>
     </Compile>
   </ItemGroup>
   <!-- Windows : UAP - Win32 + WinRT -->
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)' == 'uap'">
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateNamedPipeClient.Uap.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreateNamedPipeClient.Uap.cs">
       <Link>Common\Interop\Windows\Interop.CreateNamedPipeClient.Uap.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CREATEFILE2_EXTENDED_PARAMETERS.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CREATEFILE2_EXTENDED_PARAMETERS.cs">
       <Link>Common\Interop\Windows\Interop.CREATEFILE2_EXTENDED_PARAMETERS.cs</Link>
     </Compile>
   </ItemGroup>

diff --git a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
index fef6db9..a057cdf 100644 (file)
--- a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
+++ b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
@@ -29,56 +29,56 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' != 'netfx' AND '$(TargetsWindows)' == 'true'">
     <Compile Include="System\IO\Ports\SerialStream.Windows.cs" />
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.DCB.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.DCB.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.DCB.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.DCB.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.COMMPROP.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.COMMPROP.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.COMMPROP.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.COMMPROP.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.COMMTIMEOUTS.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.COMMTIMEOUTS.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.COMMTIMEOUTS.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.COMMTIMEOUTS.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.COMSTAT.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.COMSTAT.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.COMSTAT.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.COMSTAT.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetCommState.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SetCommState.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetCommState.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SetCommState.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetCommBreak.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SetCommBreak.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetCommBreak.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SetCommBreak.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ClearCommBreak.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.ClearCommBreak.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ClearCommBreak.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.ClearCommBreak.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.EscapeCommFunction.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.EscapeCommFunction.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.EscapeCommFunction.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.EscapeCommFunction.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetCommTimeouts.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SetCommTimeouts.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetCommTimeouts.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SetCommTimeouts.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCommModemStatus.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetCommModemStatus.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCommModemStatus.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetCommModemStatus.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.ClearCommError.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.ClearCommError.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ClearCommError.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.ClearCommError.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCommProperties.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetCommProperties.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCommProperties.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetCommProperties.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetCommMask.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SetCommMask.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetCommMask.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SetCommMask.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.PurgeComm.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.PurgeComm.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.PurgeComm.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.PurgeComm.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetupComm.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SetupComm.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetupComm.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SetupComm.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCommState.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetCommState.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCommState.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetCommState.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.WaitCommEvent.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.WaitCommEvent.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.WaitCommEvent.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.WaitCommEvent.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs">
       <Link>Common\CoreLib\Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs</Link>
@@ -92,14 +92,14 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_NativeOverlapped.cs">
       <Link>Common\CoreLib\Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_NativeOverlapped.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetOverlappedResult.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetOverlappedResult.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetOverlappedResult.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetOverlappedResult.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FlushFileBuffers.cs">
       <Link>Common\CoreLib\Interop\Windows\Kernel32\Interop.FlushFileBuffers.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GenericOperations.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GenericOperations.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GenericOperations.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GenericOperations.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
       <Link>Common\CoreLib\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs</Link>
@@ -133,16 +133,16 @@
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' != 'uap' and '$(TargetsWindows)' == 'true'">
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CreateFile.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.CreateFile.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CreateFile.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.CreateFile.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'uap'">
-    <Compile Include="$(CommonPath)\Interop\Windows\mincore\Interop.OpenCommPort.cs">
-      <Link>Common\Interop\Windows\mincore\Interop.OpenCommPort.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Mincore\Interop.OpenCommPort.cs">
+      <Link>Common\Interop\Windows\Mincore\Interop.OpenCommPort.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\mincore\Interop.GetCommPorts.cs">
-      <Link>Common\Interop\Windows\mincore\Interop.GetCommPorts.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Mincore\Interop.GetCommPorts.cs">
+      <Link>Common\Interop\Windows\Mincore\Interop.GetCommPorts.cs</Link>
     </Compile>
     <Compile Include="System\IO\Ports\SerialPort.Uap.cs" />
     <Compile Include="System\IO\Ports\SerialStream.Uap.cs" />

diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj
index 1352ac3..64c4933 100644 (file)
--- a/src/libraries/System.Management/src/System.Management.csproj
+++ b/src/libraries/System.Management/src/System.Management.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{950923D8-EC99-4F90-9BA6-8EB64582C555}</ProjectGuid>
     <AssemblyName>System.Management</AssemblyName>
@@ -14,17 +14,17 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FreeLibrary.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.FreeLibrary.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetProcAddress.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetProcAddress.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetProcAddress.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcAddress.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GlobalLock.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GlobalLock.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GlobalLock.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GlobalLock.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LoadLibrary.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LoadLibrary.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LoadLibrary.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LoadLibrary.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Ole32\Interop.CoGetObjectContext.cs">
       <Link>Common\Interop\Windows\Ole32\Interop.CoGetObjectContext.cs</Link>
@@ -90,4 +90,4 @@
     <Reference Include="System.Threading.Thread" />
     <Reference Include="System.Threading.ThreadPool" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild
index a08b726..78d9673 100644 (file)
--- a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild
+++ b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.msbuild
@@ -9,12 +9,12 @@
     <CompileItem Include="$(CommonPath)\Interop\Windows\Crypt32\Interop.certificates_types.cs" />
     <CompileItem Include="$(CommonPath)\Interop\Windows\Crypt32\Interop.certificates.cs" />
     <CompileItem Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FormatMessage.cs" />
-    <CompileItem Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetModuleHandle.cs" />
+    <CompileItem Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs" />
     <CompileItem Include="$(CommonPath)\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs" />
     <CompileItem Include="$(CommonPath)\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs" />
-    <CompileItem Include="$(CommonPath)\Interop\Windows\winhttp\Interop.SafeWinHttpHandle.cs" />
-    <CompileItem Include="$(CommonPath)\Interop\Windows\winhttp\Interop.winhttp_types.cs" />
-    <CompileItem Include="$(CommonPath)\Interop\Windows\winhttp\Interop.winhttp.cs" />
+    <CompileItem Include="$(CommonPath)\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs" />
+    <CompileItem Include="$(CommonPath)\Interop\Windows\WinHttp\Interop.winhttp_types.cs" />
+    <CompileItem Include="$(CommonPath)\Interop\Windows\WinHttp\Interop.winhttp.cs" />
     <CompileItem Include="$(CommonPath)\System\CharArrayHelpers.cs" />
     <CompileItem Include="$(CommonPath)\System\StringExtensions.cs" />
     <CompileItem Include="$(CommonPath)\System\Net\HttpKnownHeaderNames.cs" />

diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
index a708511..1715d63 100644 (file)
--- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
@@ -28,11 +28,11 @@
     <Compile Include="$(CommonPath)\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs">
       <Link>Common\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\winhttp\Interop.SafeWinHttpHandle.cs">
-      <Link>Common\Interop\Windows\winhttp\Interop.SafeWinHttpHandle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs">
+      <Link>Common\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\winhttp\Interop.winhttp_types.cs">
-      <Link>Common\Interop\Windows\winhttp\Interop.winhttp_types.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinHttp\Interop.winhttp_types.cs">
+      <Link>Common\Interop\Windows\WinHttp\Interop.winhttp_types.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\System\CharArrayHelpers.cs">
       <Link>Common\System\CharArrayHelpers.cs</Link>
@@ -145,4 +145,4 @@
     <Compile Include="WinHttpResponseStreamTest.cs" />
     <Compile Include="XunitTestAssemblyAtrributes.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/libraries/System.Net.Http/src/System.Net.Http.csproj
index a6ba267..f6f786a 100644 (file)
--- a/src/libraries/System.Net.Http/src/System.Net.Http.csproj
+++ b/src/libraries/System.Net.Http/src/System.Net.Http.csproj
@@ -282,8 +282,8 @@
     <Compile Include="$(CommonPath)\System\Net\Security\NetEventSource.Security.Windows.cs">
       <Link>Common\System\Net\Security\NetEventSource.Security.Windows.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_Bindings.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_Bindings.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs">
       <Link>Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs</Link>
@@ -291,50 +291,50 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
       <Link>Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_StreamSizes.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_StreamSizes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_NegotiationInfoW.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_NegotiationInfoW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\NegotiationInfoClass.cs">
-      <Link>Common\Interop\Windows\sspicli\NegotiationInfoClass.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\NegotiationInfoClass.cs">
+      <Link>Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs">
       <Link>Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPISecureChannelType.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPISecureChannelType.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPISecureChannelType.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIInterface.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPIInterface.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPIInterface.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPIInterface.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIAuthType.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPIAuthType.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPIAuthType.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPIAuthType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecurityPackageInfoClass.cs">
-      <Link>Common\Interop\Windows\sspicli\SecurityPackageInfoClass.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecurityPackageInfo.cs">
-      <Link>Common\Interop\Windows\sspicli\SecurityPackageInfo.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecurityPackageInfo.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_Sizes.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_Sizes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SafeDeleteContext.cs">
-      <Link>Common\Interop\Windows\sspicli\SafeDeleteContext.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SafeDeleteContext.cs">
+      <Link>Common\Interop\Windows\SspiCli\SafeDeleteContext.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\GlobalSSPI.cs">
-      <Link>Common\Interop\Windows\sspicli\GlobalSSPI.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\GlobalSSPI.cs">
+      <Link>Common\Interop\Windows\SspiCli\GlobalSSPI.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.SSPI.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.SSPI.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.SSPI.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.SSPI.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecuritySafeHandles.cs">
-      <Link>Common\Interop\Windows\sspicli\SecuritySafeHandles.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecuritySafeHandles.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIWrapper.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPIWrapper.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPIWrapper.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPIWrapper.cs</Link>
     </Compile>
   </ItemGroup>
   <!-- Common -->

diff --git a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
index cb87728..b763492 100644 (file)
--- a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
@@ -388,14 +388,14 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs">
       <Link>Common\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\winhttp\Interop.SafeWinHttpHandle.cs">
-      <Link>Common\Interop\Windows\winhttp\Interop.SafeWinHttpHandle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs">
+      <Link>Common\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\System\Runtime\ExceptionServices\ExceptionStackTrace.cs">
       <Link>Common\System\Runtime\ExceptionServices\ExceptionStackTrace.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\winhttp\Interop.winhttp_types.cs">
-      <Link>Common\Interop\Windows\winhttp\Interop.winhttp_types.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinHttp\Interop.winhttp_types.cs">
+      <Link>Common\Interop\Windows\WinHttp\Interop.winhttp_types.cs</Link>
     </Compile>
     <Compile Include="..\..\..\System.Net.Http.WinHttpHandler\tests\UnitTests\FakeInterop.cs">
       <Link>ProductionCode\System\Net\Http\WinInetProxyHelper.cs</Link>
@@ -427,4 +427,4 @@
       <Name>RemoteExecutorConsoleApp</Name>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
index 225b2d0..18528a4 100644 (file)
--- a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
+++ b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
@@ -180,28 +180,28 @@
     <Compile Include="$(CommonPath)\Interop\Windows\HttpApi\Interop.HttpApi.cs">
       <Link>Common\Interop\Windows\HttpApi\Interop.HttpApi.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetFileCompletionNotificationModes.cs">
-      <Link>Interop\Windows\kernel32\Interop.SetFileCompletionNotificationModes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetFileCompletionNotificationModes.cs">
+      <Link>Interop\Windows\Kernel32\Interop.SetFileCompletionNotificationModes.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.CancelIoEx.cs">
       <Link>Common\Interop\Windows\mincore\Interop.CancelIoEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FreeLibrary.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
       <Link>Common\Interop\Windows\mincore\Interop.FreeLibrary.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LoadLibraryEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs">
       <Link>Common\Interop\Windows\mincore\Interop.LoadLibraryEx.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
       <Link>Common\CoreLib\Interop\Windows\mincore\Interop.SECURITY_ATTRIBUTES.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalAlloc.cs">
       <Link>Common\Interop\Windows\mincore_obsolete\Interop.LocalAlloc.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalFree.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalFree.cs">
       <Link>Common\Interop\Windows\mincore_obsolete\Interop.LocalFree.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.Constants.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalAlloc.Constants.cs">
       <Link>Common\Interop\Windows\mincore_obsolete\Interop.LocalAlloc.Constants.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
@@ -272,8 +272,8 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Crypt32\Interop.certificates.cs">
       <Link>Common\Interop\Windows\Crypt32\Interop.certificates.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_Bindings.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_Bindings.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs">
       <Link>Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs</Link>
@@ -281,50 +281,50 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
       <Link>Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_StreamSizes.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_StreamSizes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_NegotiationInfoW.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_NegotiationInfoW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\NegotiationInfoClass.cs">
-      <Link>Common\Interop\Windows\sspicli\NegotiationInfoClass.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\NegotiationInfoClass.cs">
+      <Link>Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs">
       <Link>Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPISecureChannelType.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPISecureChannelType.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPISecureChannelType.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIInterface.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPIInterface.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPIInterface.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPIInterface.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIAuthType.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPIAuthType.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPIAuthType.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPIAuthType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecurityPackageInfoClass.cs">
-      <Link>Common\Interop\Windows\sspicli\SecurityPackageInfoClass.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecurityPackageInfo.cs">
-      <Link>Common\Interop\Windows\sspicli\SecurityPackageInfo.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecurityPackageInfo.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_Sizes.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_Sizes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SafeDeleteContext.cs">
-      <Link>Common\Interop\Windows\sspicli\SafeDeleteContext.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SafeDeleteContext.cs">
+      <Link>Common\Interop\Windows\SspiCli\SafeDeleteContext.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\GlobalSSPI.cs">
-      <Link>Common\Interop\Windows\sspicli\GlobalSSPI.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\GlobalSSPI.cs">
+      <Link>Common\Interop\Windows\SspiCli\GlobalSSPI.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.SSPI.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.SSPI.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.SSPI.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.SSPI.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecuritySafeHandles.cs">
-      <Link>Common\Interop\Windows\sspicli\SecuritySafeHandles.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecuritySafeHandles.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIWrapper.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPIWrapper.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPIWrapper.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPIWrapper.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnix)' == 'true' OR '$(ForceManagedImplementation)' == 'true' OR ('$(TargetsWindows)' == 'true' AND '$(TargetGroup)' == 'uap')">
@@ -354,4 +354,4 @@
     <Reference Include="System.Threading.ThreadPool" />
     <Reference Include="System.Net.ServicePoint" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
index 68f1447..9938e6e 100644 (file)
--- a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
+++ b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
@@ -226,8 +226,8 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_Bindings.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_Bindings.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs">
       <Link>Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs</Link>
@@ -235,50 +235,50 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
       <Link>Common\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_StreamSizes.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_StreamSizes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_NegotiationInfoW.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_NegotiationInfoW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\NegotiationInfoClass.cs">
-      <Link>Common\Interop\Windows\sspicli\NegotiationInfoClass.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\NegotiationInfoClass.cs">
+      <Link>Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs">
       <Link>Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPISecureChannelType.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPISecureChannelType.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPISecureChannelType.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIInterface.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPIInterface.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPIInterface.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPIInterface.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIAuthType.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPIAuthType.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPIAuthType.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPIAuthType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecurityPackageInfoClass.cs">
-      <Link>Common\Interop\Windows\sspicli\SecurityPackageInfoClass.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecurityPackageInfo.cs">
-      <Link>Common\Interop\Windows\sspicli\SecurityPackageInfo.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecurityPackageInfo.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_Sizes.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_Sizes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SafeDeleteContext.cs">
-      <Link>Common\Interop\Windows\sspicli\SafeDeleteContext.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SafeDeleteContext.cs">
+      <Link>Common\Interop\Windows\SspiCli\SafeDeleteContext.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\GlobalSSPI.cs">
-      <Link>Common\Interop\Windows\sspicli\GlobalSSPI.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\GlobalSSPI.cs">
+      <Link>Common\Interop\Windows\SspiCli\GlobalSSPI.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.SSPI.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.SSPI.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.SSPI.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.SSPI.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecuritySafeHandles.cs">
-      <Link>Common\Interop\Windows\sspicli\SecuritySafeHandles.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecuritySafeHandles.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIWrapper.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPIWrapper.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPIWrapper.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPIWrapper.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -309,4 +309,4 @@
     <Reference Include="System.Threading.Tasks" />
     <Reference Include="System.Threading.Timer" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
index 772b5b2..3635bc9 100644 (file)
--- a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
+++ b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
@@ -72,62 +72,62 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\AddressInfo.cs">
-      <Link>Interop\Windows\Winsock\AddressInfo.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\AddressInfo.cs">
+      <Link>Interop\Windows\WinSock\AddressInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\AddressInfoHints.cs">
-      <Link>Interop\Windows\Winsock\AddressInfoHints.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\AddressInfoHints.cs">
+      <Link>Interop\Windows\WinSock\AddressInfoHints.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\hostent.cs">
-      <Link>Interop\Windows\Winsock\hostent.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\hostent.cs">
+      <Link>Interop\Windows\WinSock\hostent.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.closesocket.cs">
-      <Link>Interop\Windows\Winsock\Interop.closesocket.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.closesocket.cs">
+      <Link>Interop\Windows\WinSock\Interop.closesocket.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.gethostname.cs">
-      <Link>Interop\Windows\Winsock\Interop.gethostname.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.gethostname.cs">
+      <Link>Interop\Windows\WinSock\Interop.gethostname.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.GetNameInfoW.cs">
-      <Link>Interop\Windows\Winsock\Interop.GetNameInfoW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.GetNameInfoW.cs">
+      <Link>Interop\Windows\WinSock\Interop.GetNameInfoW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.GetAddrInfoW.cs">
-      <Link>Interop\Windows\Winsock\Interop.GetAddrInfoW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.GetAddrInfoW.cs">
+      <Link>Interop\Windows\WinSock\Interop.GetAddrInfoW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.freeaddrinfo.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.freeaddrinfo.cs">
       <Link>Interop\Windows\Winsock\Interop.freeaddinfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSAStartup.cs">
-      <Link>Interop\Windows\Winsock\Interop.WSAStartup.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSAStartup.cs">
+      <Link>Interop\Windows\WinSock\Interop.WSAStartup.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSASocketW.cs">
-      <Link>Interop\Windows\Winsock\Interop.WSASocketW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSASocketW.cs">
+      <Link>Interop\Windows\WinSock\Interop.WSASocketW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.SocketConstructorFlags.cs">
-      <Link>Interop\Windows\Winsock\Interop.SocketConstructorFlags.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs">
+      <Link>Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\Sockets\ProtocolFamily.cs">
       <Link>Common\System\Net\Sockets\ProtocolFamily.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\SafeFreeAddrInfo.cs">
-      <Link>Interop\Windows\Winsock\SafeFreeAddrInfo.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\SafeFreeAddrInfo.cs">
+      <Link>Interop\Windows\WinSock\SafeFreeAddrInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\AddressInfoEx.cs">
-      <Link>Interop\Windows\Winsock\AddressInfoEx.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\AddressInfoEx.cs">
+      <Link>Interop\Windows\WinSock\AddressInfoEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.GetAddrInfoExW.cs">
-      <Link>Interop\Windows\Winsock\Interop.GetAddrInfoExW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.GetAddrInfoExW.cs">
+      <Link>Interop\Windows\WinSock\Interop.GetAddrInfoExW.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs" Condition="'$(TargetGroup)' != 'uap'">
       <Link>Common\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetProcAddress.cs" Condition="'$(TargetGroup)' != 'uap'">
-      <Link>Interop\Windows\kernel32\Interop.GetProcAddress.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetProcAddress.cs" Condition="'$(TargetGroup)' != 'uap'">
+      <Link>Interop\Windows\Kernel32\Interop.GetProcAddress.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LoadLibraryEx.cs" Condition="'$(TargetGroup)' != 'uap'">
-      <Link>Interop\Windows\kernel32\Interop.LoadLibraryEx.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs" Condition="'$(TargetGroup)' != 'uap'">
+      <Link>Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FreeLibrary.cs">
-      <Link>Interop\Windows\kernel32\Interop.FreeLibrary.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
+      <Link>Interop\Windows\Kernel32\Interop.FreeLibrary.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">

diff --git a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
index 0c9a3b7..fd962ee 100644 (file)
--- a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
+++ b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
@@ -78,62 +78,62 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\AddressInfo.cs">
-      <Link>Interop\Windows\Winsock\AddressInfo.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\AddressInfo.cs">
+      <Link>Interop\Windows\WinSock\AddressInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\AddressInfoHints.cs">
-      <Link>Interop\Windows\Winsock\AddressInfoHints.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\AddressInfoHints.cs">
+      <Link>Interop\Windows\WinSock\AddressInfoHints.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\hostent.cs">
-      <Link>Interop\Windows\Winsock\hostent.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\hostent.cs">
+      <Link>Interop\Windows\WinSock\hostent.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.closesocket.cs">
-      <Link>Interop\Windows\Winsock\Interop.closesocket.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.closesocket.cs">
+      <Link>Interop\Windows\WinSock\Interop.closesocket.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.gethostname.cs">
-      <Link>Interop\Windows\Winsock\Interop.gethostname.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.gethostname.cs">
+      <Link>Interop\Windows\WinSock\Interop.gethostname.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.GetNameInfoW.cs">
-      <Link>Interop\Windows\Winsock\Interop.GetNameInfoW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.GetNameInfoW.cs">
+      <Link>Interop\Windows\WinSock\Interop.GetNameInfoW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.GetAddrInfoW.cs">
-      <Link>Interop\Windows\Winsock\Interop.GetAddrInfoW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.GetAddrInfoW.cs">
+      <Link>Interop\Windows\WinSock\Interop.GetAddrInfoW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.freeaddrinfo.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.freeaddrinfo.cs">
       <Link>Interop\Windows\Winsock\Interop.freeaddinfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSAStartup.cs">
-      <Link>Interop\Windows\Winsock\Interop.WSAStartup.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSAStartup.cs">
+      <Link>Interop\Windows\WinSock\Interop.WSAStartup.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSASocketW.cs">
-      <Link>Interop\Windows\Winsock\Interop.WSASocketW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSASocketW.cs">
+      <Link>Interop\Windows\WinSock\Interop.WSASocketW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.SocketConstructorFlags.cs">
-      <Link>Interop\Windows\Winsock\Interop.SocketConstructorFlags.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs">
+      <Link>Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\Sockets\ProtocolFamily.cs">
       <Link>Common\System\Net\Sockets\ProtocolFamily.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\SafeFreeAddrInfo.cs">
-      <Link>Interop\Windows\Winsock\SafeFreeAddrInfo.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\SafeFreeAddrInfo.cs">
+      <Link>Interop\Windows\WinSock\SafeFreeAddrInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\AddressInfoEx.cs">
-      <Link>Interop\Windows\Winsock\AddressInfoEx.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\AddressInfoEx.cs">
+      <Link>Interop\Windows\WinSock\AddressInfoEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.GetAddrInfoExW.cs">
-      <Link>Interop\Windows\Winsock\Interop.GetAddrInfoExW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.GetAddrInfoExW.cs">
+      <Link>Interop\Windows\WinSock\Interop.GetAddrInfoExW.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
       <Link>Common\CoreLi\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetProcAddress.cs">
-      <Link>Interop\Windows\kernel32\Interop.GetProcAddress.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetProcAddress.cs">
+      <Link>Interop\Windows\Kernel32\Interop.GetProcAddress.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LoadLibraryEx.cs">
-      <Link>Interop\Windows\kernel32\Interop.LoadLibraryEx.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs">
+      <Link>Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.FreeLibrary.cs">
-      <Link>Interop\Windows\kernel32\Interop.FreeLibrary.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
+      <Link>Interop\Windows\Kernel32\Interop.FreeLibrary.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">

diff --git a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
index c77c9ee..a9ff802 100644 (file)
--- a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
+++ b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
@@ -130,23 +130,23 @@
     <Compile Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.NetworkInformation.cs">
       <Link>Interop\Windows\IpHlpApi\Interop.NetworkInformation.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.cs">
-      <Link>Interop\Windows\kernel32\Interop.LocalAlloc.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalAlloc.cs">
+      <Link>Interop\Windows\Kernel32\Interop.LocalAlloc.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.Constants.cs">
-      <Link>Interop\Windows\kernel32\Interop.LocalAlloc.Constants.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalAlloc.Constants.cs">
+      <Link>Interop\Windows\Kernel32\Interop.LocalAlloc.Constants.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalFree.cs">
-      <Link>Interop\Windows\kernel32\Interop.LocalFree.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalFree.cs">
+      <Link>Interop\Windows\Kernel32\Interop.LocalFree.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WinsockBSD.cs">
-      <Link>Interop\Windows\Winsock\Interop.WinsockBSD.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WinsockBSD.cs">
+      <Link>Interop\Windows\WinSock\Interop.WinsockBSD.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSAEventSelect.cs">
-      <Link>Interop\Windows\Winsock\Interop.WSAEventSelect.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSAEventSelect.cs">
+      <Link>Interop\Windows\WinSock\Interop.WSAEventSelect.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSAIoctl.cs">
-      <Link>Interop\Windows\Winsock\Interop.WSAIoctl.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSAIoctl.cs">
+      <Link>Interop\Windows\WinSock\Interop.WSAIoctl.cs</Link>
     </Compile>
   </ItemGroup>
   <!-- Unix -->

diff --git a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
index 5cf52a6..b007aa0 100644 (file)
--- a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
+++ b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
@@ -112,23 +112,23 @@
     <Compile Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.ICMP.cs">
       <Link>Common\Interop\Windows\IpHlpApi\Interop.ICMP.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LocalAlloc.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalAlloc.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LocalAlloc.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.Constants.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LocalAlloc.Constants.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalAlloc.Constants.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LocalAlloc.Constants.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalFree.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LocalFree.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalFree.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LocalFree.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.closesocket.cs">
-      <Link>Common\Interop\Windows\Winsock\Interop.closesocket.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.closesocket.cs">
+      <Link>Common\Interop\Windows\WinSock\Interop.closesocket.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSASocketW.cs">
-      <Link>Common\Interop\Windows\Winsock\Interop.WSASocketW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSASocketW.cs">
+      <Link>Common\Interop\Windows\WinSock\Interop.WSASocketW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.SocketConstructorFlags.cs">
-      <Link>Interop\Windows\Winsock\Interop.SocketConstructorFlags.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs">
+      <Link>Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs</Link>
     </Compile>
     <!-- System.Net.Internals -->
     <Compile Include="$(CommonPath)\System\Net\Sockets\SocketType.cs">

diff --git a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
index ef986ca..9f4d94a 100644 (file)
--- a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
+++ b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
@@ -104,8 +104,8 @@
     <Compile Include="$(CommonPath)\Interop\Windows\SChannel\Interop.SchProtocols.cs">
       <Link>Common\Interop\Windows\SChannel\Interop.SchProtocols.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.ErrorCodes.cs">
-      <Link>Common\Interop\Windows\Winsock\Interop.ErrorCodes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.ErrorCodes.cs">
+      <Link>Common\Interop\Windows\WinSock\Interop.ErrorCodes.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
@@ -134,14 +134,14 @@
     <Compile Include="$(CommonPath)\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs">
       <Link>Common\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LocalAlloc.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalAlloc.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LocalAlloc.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.Constants.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LocalAlloc.Constants.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalAlloc.Constants.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LocalAlloc.Constants.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalFree.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LocalFree.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalFree.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LocalFree.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true'">

diff --git a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
index 3982776..06457de 100644 (file)
--- a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
+++ b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{7860A11A-1841-4416-8A30-28EEEB42C6BB}</ProjectGuid>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -71,8 +71,8 @@
     <Compile Include="$(CommonPath)\System\NotImplemented.cs">
       <Link>ProductionCode\Common\System\NotImplemented.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.ErrorCodes.cs">
-      <Link>ProductionCode\Common\Interop\Windows\Winsock\Interop.ErrorCodes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.ErrorCodes.cs">
+      <Link>ProductionCode\Common\Interop\Windows\WinSock\Interop.ErrorCodes.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true' ">
@@ -103,14 +103,14 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>ProductionCode\Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LocalAlloc.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalAlloc.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LocalAlloc.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.Constants.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LocalAlloc.Constants.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalAlloc.Constants.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LocalAlloc.Constants.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalFree.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LocalFree.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalFree.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LocalFree.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.NtStatus.cs">
       <Link>ProductionCode\Common\Interop\Windows\NtDll\Interop.NtStatus.cs</Link>

diff --git a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
index 5ad503e..36f7e64 100644 (file)
--- a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
+++ b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
@@ -101,8 +101,8 @@
     <Compile Include="$(CommonPath)\System\NotImplemented.cs">
       <Link>ProductionCode\Common\System\NotImplemented.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.ErrorCodes.cs">
-      <Link>ProductionCode\Common\Interop\Windows\Winsock\Interop.ErrorCodes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.ErrorCodes.cs">
+      <Link>ProductionCode\Common\Interop\Windows\WinSock\Interop.ErrorCodes.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
@@ -133,4 +133,4 @@
       <Link>ProductionCode\Common\Interop\Unix\System.Native\Interop.SocketAddress.cs</Link>
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
index 1ad51d8..dcfedea 100644 (file)
--- a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
+++ b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
@@ -91,8 +91,8 @@
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
-    <Compile Include="$(CommonPath)\Interop\Windows\wininet\Interop.wininet_errors.cs">
-      <Link>Common\Interop\Windows\wininet\Interop.wininet_errors.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinInet\Interop.wininet_errors.cs">
+      <Link>Common\Interop\Windows\WinInet\Interop.wininet_errors.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\ContextAwareResult.Windows.cs">
       <Link>Common\System\Net\ContextAwareResult.Windows.cs</Link>

diff --git a/src/libraries/System.Net.Security/src/System.Net.Security.csproj b/src/libraries/System.Net.Security/src/System.Net.Security.csproj
index 966fec3..fe99c62 100644 (file)
--- a/src/libraries/System.Net.Security/src/System.Net.Security.csproj
+++ b/src/libraries/System.Net.Security/src/System.Net.Security.csproj
@@ -166,53 +166,53 @@
     <Compile Include="$(CommonPath)\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs">
       <Link>Common\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_Bindings.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_Bindings.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\GlobalSSPI.cs">
-      <Link>Common\Interop\Windows\sspicli\GlobalSSPI.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\GlobalSSPI.cs">
+      <Link>Common\Interop\Windows\SspiCli\GlobalSSPI.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.SSPI.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.SSPI.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.SSPI.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.SSPI.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_NegotiationInfoW.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_NegotiationInfoW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\NegotiationInfoClass.cs">
-      <Link>Common\Interop\Windows\sspicli\NegotiationInfoClass.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\NegotiationInfoClass.cs">
+      <Link>Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_Sizes.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_Sizes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\System\Collections\Generic\BidirectionalDictionary.cs">
       <Link>Common\System\Collections\Generic\BidirectionalDictionary.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SafeDeleteContext.cs">
-      <Link>Common\Interop\Windows\sspicli\SafeDeleteContext.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SafeDeleteContext.cs">
+      <Link>Common\Interop\Windows\SspiCli\SafeDeleteContext.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecurityPackageInfo.cs">
-      <Link>Common\Interop\Windows\sspicli\SecurityPackageInfo.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecurityPackageInfo.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecurityPackageInfoClass.cs">
-      <Link>Common\Interop\Windows\sspicli\SecurityPackageInfoClass.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecuritySafeHandles.cs">
-      <Link>Common\Interop\Windows\sspicli\SecuritySafeHandles.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecuritySafeHandles.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIAuthType.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPIAuthType.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPIAuthType.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPIAuthType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIInterface.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPIInterface.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPIInterface.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPIInterface.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPISecureChannelType.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPISecureChannelType.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPISecureChannelType.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIWrapper.cs">
-      <Link>Common\Interop\Windows\sspicli\SSPIWrapper.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SSPIWrapper.cs">
+      <Link>Common\Interop\Windows\SspiCli\SSPIWrapper.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_StreamSizes.cs">
-      <Link>Common\Interop\Windows\sspicli\SecPkgContext_StreamSizes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs">
+      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">

diff --git a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
index 0d2be2a..42b2946 100644 (file)
--- a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
+++ b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
@@ -142,98 +142,98 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.accept.cs">
-      <Link>Interop\Windows\Winsock\Interop.accept.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.accept.cs">
+      <Link>Interop\Windows\WinSock\Interop.accept.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.bind.cs">
-      <Link>Interop\Windows\Winsock\Interop.bind.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.bind.cs">
+      <Link>Interop\Windows\WinSock\Interop.bind.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.closesocket.cs">
-      <Link>Interop\Windows\Winsock\Interop.closesocket.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.closesocket.cs">
+      <Link>Interop\Windows\WinSock\Interop.closesocket.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.getpeername.cs">
-      <Link>Interop\Windows\Winsock\Interop.getpeername.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.getpeername.cs">
+      <Link>Interop\Windows\WinSock\Interop.getpeername.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.getsockname.cs">
-      <Link>Interop\Windows\Winsock\Interop.getsockname.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.getsockname.cs">
+      <Link>Interop\Windows\WinSock\Interop.getsockname.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.getsockopt.cs">
-      <Link>Interop\Windows\Winsock\Interop.getsockopt.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.getsockopt.cs">
+      <Link>Interop\Windows\WinSock\Interop.getsockopt.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.ioctlsocket.cs">
-      <Link>Interop\Windows\Winsock\Interop.ioctlsocket.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.ioctlsocket.cs">
+      <Link>Interop\Windows\WinSock\Interop.ioctlsocket.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.listen.cs">
-      <Link>Interop\Windows\Winsock\Interop.listen.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.listen.cs">
+      <Link>Interop\Windows\WinSock\Interop.listen.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.recv.cs">
-      <Link>Interop\Windows\Winsock\Interop.recv.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.recv.cs">
+      <Link>Interop\Windows\WinSock\Interop.recv.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.recvfrom.cs">
-      <Link>Interop\Windows\Winsock\Interop.recvfrom.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.recvfrom.cs">
+      <Link>Interop\Windows\WinSock\Interop.recvfrom.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.select.cs">
-      <Link>Interop\Windows\Winsock\Interop.select.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.select.cs">
+      <Link>Interop\Windows\WinSock\Interop.select.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.send.cs">
-      <Link>Interop\Windows\Winsock\Interop.send.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.send.cs">
+      <Link>Interop\Windows\WinSock\Interop.send.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.sendto.cs">
-      <Link>Interop\Windows\Winsock\Interop.sendto.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.sendto.cs">
+      <Link>Interop\Windows\WinSock\Interop.sendto.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.setsockopt.cs">
-      <Link>Interop\Windows\Winsock\Interop.setsockopt.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.setsockopt.cs">
+      <Link>Interop\Windows\WinSock\Interop.setsockopt.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.shutdown.cs">
-      <Link>Interop\Windows\Winsock\Interop.shutdown.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.shutdown.cs">
+      <Link>Interop\Windows\WinSock\Interop.shutdown.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.TransmitFile.cs">
-      <Link>Interop\Windows\Winsock\Interop.TransmitFile.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.TransmitFile.cs">
+      <Link>Interop\Windows\WinSock\Interop.TransmitFile.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WinsockBSD.cs">
-      <Link>Interop\Windows\Winsock\Interop.WinsockBSD.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WinsockBSD.cs">
+      <Link>Interop\Windows\WinSock\Interop.WinsockBSD.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WinsockAsync.cs">
-      <Link>Interop\Windows\Winsock\Interop.WinsockAsync.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WinsockAsync.cs">
+      <Link>Interop\Windows\WinSock\Interop.WinsockAsync.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSAConnect.cs">
-      <Link>Interop\Windows\Winsock\Interop.WSAConnect.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSAConnect.cs">
+      <Link>Interop\Windows\WinSock\Interop.WSAConnect.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSAGetOverlappedResult.cs">
-      <Link>Interop\Windows\Winsock\Interop.WSAGetOverlappedResult.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSAGetOverlappedResult.cs">
+      <Link>Interop\Windows\WinSock\Interop.WSAGetOverlappedResult.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSAIoctl.cs">
-      <Link>Interop\Windows\Winsock\Interop.WSAIoctl.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSAIoctl.cs">
+      <Link>Interop\Windows\WinSock\Interop.WSAIoctl.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSARecv.cs">
-      <Link>Interop\Windows\Winsock\Interop.WSARecv.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSARecv.cs">
+      <Link>Interop\Windows\WinSock\Interop.WSARecv.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSARecvFrom.cs">
-      <Link>Interop\Windows\Winsock\Interop.WSARecvFrom.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSARecvFrom.cs">
+      <Link>Interop\Windows\WinSock\Interop.WSARecvFrom.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSASend.cs">
-      <Link>Interop\Windows\Winsock\Interop.WSASend.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSASend.cs">
+      <Link>Interop\Windows\WinSock\Interop.WSASend.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSASendTo.cs">
-      <Link>Interop\Windows\Winsock\Interop.WSASendTo.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSASendTo.cs">
+      <Link>Interop\Windows\WinSock\Interop.WSASendTo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSASocketW.cs">
-      <Link>Interop\Windows\Winsock\Interop.WSASocketW.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSASocketW.cs">
+      <Link>Interop\Windows\WinSock\Interop.WSASocketW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.WSASocketW.SafeCloseSocket.cs">
-      <Link>Interop\Windows\Winsock\Interop.WSASocketW.SafeCloseSocket.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.WSASocketW.SafeCloseSocket.cs">
+      <Link>Interop\Windows\WinSock\Interop.WSASocketW.SafeCloseSocket.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\Interop.SocketConstructorFlags.cs">
-      <Link>Interop\Windows\Winsock\Interop.SocketConstructorFlags.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs">
+      <Link>Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\SafeNativeOverlapped.cs">
-      <Link>Interop\Windows\Winsock\SafeNativeOverlapped.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\SafeNativeOverlapped.cs">
+      <Link>Interop\Windows\WinSock\SafeNativeOverlapped.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Winsock\WSABuffer.cs">
-      <Link>Interop\Windows\Winsock\WSABuffer.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinSock\WSABuffer.cs">
+      <Link>Interop\Windows\WinSock\WSABuffer.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.SetFileCompletionNotificationModes.cs">
-      <Link>Interop\Windows\kernel32\Interop.SetFileCompletionNotificationModes.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.SetFileCompletionNotificationModes.cs">
+      <Link>Interop\Windows\Kernel32\Interop.SetFileCompletionNotificationModes.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\CompletionPortHelper.Windows.cs">
       <Link>Common\System\Net\CompletionPortHelper.Windows.cs</Link>

diff --git a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
index aa05700..29fbda3 100644 (file)
--- a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
+++ b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
@@ -10,13 +10,13 @@
     <Compile Include="..\..\Common\src\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="..\..\Common\src\Interop\Windows\kernel32\Interop.FreeLibrary.cs">
+    <Compile Include="..\..\Common\src\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
       <Link>Common\Interop\Windows\Interop.FreeLibrary.cs</Link>
     </Compile>
-    <Compile Include="..\..\Common\src\Interop\Windows\kernel32\Interop.GetModuleHandle.cs">
+    <Compile Include="..\..\Common\src\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs">
       <Link>Common\Interop\Windows\Interop.GetModuleHandle.cs</Link>
     </Compile>
-    <Compile Include="..\..\Common\src\Interop\Windows\kernel32\Interop.LoadLibraryEx.cs">
+    <Compile Include="..\..\Common\src\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs">
       <Link>Common\Interop\Windows\Interop.LoadLibraryEx.cs</Link>
     </Compile>
     <Compile Include="..\..\Common\src\CoreLib\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
@@ -142,4 +142,4 @@
     <DefaultReferenceExclusions Include="System.Reflection.Metadata" />
     <ReferenceFromRuntime Include="System.Reflection.Metadata" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj
index ef37968..b30cb9e 100644 (file)
--- a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj
+++ b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj
@@ -56,11 +56,11 @@
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="System\Runtime\Caching\MemoryMonitor.Windows.cs" />
     <Compile Include="System\Runtime\Caching\PhysicalMemoryMonitor.Windows.cs" />
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GlobalMemoryStatusEx.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GlobalMemoryStatusEx.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GlobalMemoryStatusEx.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GlobalMemoryStatusEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.MEMORY_BASIC_INFO.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.MEMORY_BASIC_INFO.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.MEMORY_BASIC_INFO.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.MEMORY_BASIC_INFO.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
@@ -99,4 +99,4 @@
     <Reference Include="System.Threading.ThreadPool" />
     <Reference Include="System.Threading.Timer" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
index d5aa393..e7a414b 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
+++ b/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
@@ -76,29 +76,29 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Interop.BOOLEAN.cs">
       <Link>Common\Interop\Windows\Interop.BOOLEAN.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCurrentProcessId.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetCurrentProcessId.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FormatMessage.cs">
       <Link>Common\Interop\Windows\kernel32\Interop.FormatMessage.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.GetCurrentDirectory.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetCurrentDirectory.cs</Link>
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.GetCurrentDirectory.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentDirectory.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.GetLogicalDrives.cs">
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.GetLogicalDrives.cs">
       <Link>Common\Interop\Windows\Interop.GetLogicalDrives.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.GetSystemDirectoryW.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetSystemDirectoryW.cs</Link>
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.GetSystemDirectoryW.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetSystemDirectoryW.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.QueryPerformanceCounter.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.QueryPerformanceCounter.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.QueryPerformanceCounter.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.QueryPerformanceCounter.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.QueryPerformanceFrequency.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.QueryPerformanceFrequency.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.QueryPerformanceFrequency.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.QueryPerformanceFrequency.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.SetCurrentDirectory.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SetCurrentDirectory.cs</Link>
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.SetCurrentDirectory.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SetCurrentDirectory.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\System\IO\PathHelper.Windows.cs">
       <Link>CoreLib\System\IO\PathHelper.Windows.cs</Link>

diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
index efaa03b..70d4571 100644 (file)
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
@@ -44,14 +44,14 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetNativeSystemInfo.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetNativeSystemInfo.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetNativeSystemInfo.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetNativeSystemInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.SYSTEM_INFO.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.SYSTEM_INFO.cs</Link>
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.SYSTEM_INFO.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.SYSTEM_INFO.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.GetSystemInfo.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetSystemInfo.cs</Link>
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.GetSystemInfo.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.GetSystemInfo.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly2/System.Runtime.Loader.Test.Assembly2.csproj b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly2/System.Runtime.Loader.Test.Assembly2.csproj
index 63b9ff9..f7d3d02 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly2/System.Runtime.Loader.Test.Assembly2.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Test.Assembly2/System.Runtime.Loader.Test.Assembly2.csproj
@@ -4,6 +4,6 @@
     <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard-Debug;netstandard-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="../System.Runtime.Loader.Test.Assembly/TestClass.cs" />
+    <Compile Include="..\System.Runtime.Loader.Test.Assembly\TestClass.cs" />
   </ItemGroup>
 </Project>

diff --git a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
index d39e6fa..fb7cdf9 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
@@ -65,8 +65,8 @@
     <Compile Include="System\Threading\Tasks\AsyncInfoToTaskBridge.CoreCLR.cs" />
     <Compile Include="System\Threading\WindowsRuntimeSynchronizationContext.cs" />
     <Compile Include="System\WindowsRuntimeSystemExtensions.CoreCLR.cs" />
-    <Compile Include="$(CommonPath)\Interop\Windows\mincore\Interop.RoGetActivationFactory.cs">
-      <Link>Common\Interop\Windows\mincore\Interop.RoGetActivationFactory.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Mincore\Interop.RoGetActivationFactory.cs">
+      <Link>Common\Interop\Windows\Mincore\Interop.RoGetActivationFactory.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\System\Runtime\InteropServices\WindowsRuntime\WindowsRuntimeImportAttribute.cs">
       <Link>Common\System\Runtime\InteropServices\WindowsRuntime\WindowsRuntimeImportAttribute.cs</Link>
@@ -91,8 +91,8 @@
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FormatMessage.cs">
       <Link>Common\Interop\Windows\kernel32\Interop.FormatMessage.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\mincore\Interop.RoGetBufferMarshaler.cs">
-      <Link>Common\Interop\Windows\mincore\Interop.RoGetBufferMarshaler.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Mincore\Interop.RoGetBufferMarshaler.cs">
+      <Link>Common\Interop\Windows\Mincore\Interop.RoGetBufferMarshaler.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>

diff --git a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
index bcf4c73..d3a1b96 100644 (file)
--- a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
+++ b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
@@ -32,76 +32,76 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.LUID.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.LUID.cs">
       <Link>Common\Interop\Interop.LUID.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.LUID_AND_ATTRIBUTES.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.LUID_AND_ATTRIBUTES.cs">
       <Link>Common\Interop\Interop.LUID_AND_ATTRIBUTES.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.TOKEN_PRIVILEGE.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.TOKEN_PRIVILEGE.cs">
       <Link>Common\Interop\Interop.TOKEN_PRIVILEGE.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.SecurityImpersonationLevel.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.SecurityImpersonationLevel.cs">
       <Link>Common\Interop\Interop.SecurityImpersonationLevel.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Errors.cs">
       <Link>Common\Interop\Interop.Errors.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ProcessOptions.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ProcessOptions.cs">
       <Link>Common\Interop\Interop.ProcessOptions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.LookupPrivilegeValue.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.LookupPrivilegeValue.cs">
       <Link>Common\Interop\Interop.LookupPrivilegeValue.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.RevertToSelf.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.RevertToSelf.cs">
       <Link>Common\Interop\Interop.RevertToSelf.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalFree.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalFree.cs">
       <Link>Common\Interop\Interop.LocalFree.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ConvertSdToStringSd.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ConvertSdToStringSd.cs">
       <Link>Common\Interop\Interop.ConvertSdToStringSd.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ConvertStringSdToSd.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ConvertStringSdToSd.cs">
       <Link>Common\Interop\Interop.ConvertStringSdToSd.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.GetSecurityInfoByHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.GetSecurityInfoByHandle.cs">
       <Link>Common\Interop\Interop.GetSecurityInfoByHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.SetSecurityInfoByHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.SetSecurityInfoByHandle.cs">
       <Link>Common\Interop\Interop.SetSecurityInfoByHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.GetSecurityInfoByName.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.GetSecurityInfoByName.cs">
       <Link>Common\Interop\Interop.GetSecurityInfoByName.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.SetSecurityInfoByName.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.SetSecurityInfoByName.cs">
       <Link>Common\Interop\Interop.SetSecurityInfoByName.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.GetSecurityDescriptorLength.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.GetSecurityDescriptorLength.cs">
       <Link>Common\Interop\Interop.GetSecurityDescriptorLength.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
       <Link>Common\Interop\Interop.CloseHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.OpenThreadToken_SafeTokenHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.OpenThreadToken_SafeTokenHandle.cs">
       <Link>Common\Interop\Interop.OpenThreadToken_SafeTokenHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.OpenProcessToken_IntPtr.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.OpenProcessToken_IntPtr.cs">
       <Link>Common\Interop\Interop.OpenProcessToken_IntPtrs.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.GetCurrentProcess_IntPtr.cs">
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs">
       <Link>Common\Interop\Interop.GetCurrentProcess_IntPtr.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.SetThreadToken.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.SetThreadToken.cs">
       <Link>Common\Interop\Interop.SetThreadToken.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCurrentThread.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCurrentThread.cs">
       <Link>Common\Interop\Interop.GetCurrentThread.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.AdjustTokenPrivileges.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.AdjustTokenPrivileges.cs">
       <Link>Common\Interop\Interop.AdjustTokenPrivileges.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.DuplicateTokenEx_SafeTokenHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.DuplicateTokenEx_SafeTokenHandle.cs">
       <Link>Common\Interop\Interop.DuplicateTokenEx_SafeTokenHandle.cs</Link>
     </Compile>
   </ItemGroup>

diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj b/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj
index 2e0da19..2528e89 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj
+++ b/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}</ProjectGuid>
     <AssemblyName>System.Security.Cryptography.Csp</AssemblyName>
@@ -70,71 +70,71 @@
     <Compile Include="$(CommonPath)\Internal\Cryptography\Windows\CryptoThrowHelper.cs">
       <Link>Internal\Cryptography\Windows\CryptoThrowHelper.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptAcquireContext.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptAcquireContext.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptCreateHash.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptCreateHash.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptCreateHash.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptCreateHash.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptDecrypt.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptDecrypt.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptDecrypt.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptDecrypt.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptDeriveKey.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptDeriveKey.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptDeriveKey.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptDeriveKey.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptDestroyHash.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptDestroyHash.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptDestroyHash.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptDestroyHash.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptDestroyKey.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptDestroyKey.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptDestroyKey.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptDestroyKey.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptEncrypt.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptEncrypt.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptEncrypt.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptEncrypt.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptExportKey.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptExportKey.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptExportKey.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptExportKey.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptGenKey.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptGenKey.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptGenKey.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptGenKey.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptGetDefaultProvider.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptGetDefaultProvider.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptGetDefaultProvider.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptGetDefaultProvider.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptGetHashParam.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptGetHashParam.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptGetHashParam.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptGetHashParam.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptGetKeyParam.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptGetKeyParam.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptGetKeyParam.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptGetKeyParam.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptGetProvParam.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptGetProvParam.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptGetProvParam.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptGetProvParam.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptGetUserKey.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptGetUserKey.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptGetUserKey.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptGetUserKey.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptHashData.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptHashData.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptHashData.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptHashData.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptImportKey.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptImportKey.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptImportKey.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptImportKey.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptReleaseContext.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptReleaseContext.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptReleaseContext.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptReleaseContext.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptSetKeyParam.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptSetKeyParam.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptSetKeyParam.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptSetKeyParam.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptSignHash.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptSignHash.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptSignHash.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptSignHash.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\SafeHashHandle.cs">
-      <Link>Common\Interop\Windows\advapi32\SafeHashHandle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\SafeHashHandle.cs">
+      <Link>Common\Interop\Windows\Advapi32\SafeHashHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\SafeKeyHandle.cs">
-      <Link>Common\Interop\Windows\advapi32\SafeKeyHandle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\SafeKeyHandle.cs">
+      <Link>Common\Interop\Windows\Advapi32\SafeKeyHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\SafeProvHandle.cs">
-      <Link>Common\Interop\Windows\advapi32\SafeProvHandle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\SafeProvHandle.cs">
+      <Link>Common\Interop\Windows\Advapi32\SafeProvHandle.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Crypt32\Interop.FindOidInfo.cs">
       <Link>Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs</Link>

diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
index 8a4d4a1..5b122bf 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
+++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{03D84CBD-896D-4B2F-9A22-07034F51E73D}</ProjectGuid>
     <AssemblyName>System.Security.Cryptography.Pkcs</AssemblyName>
@@ -143,29 +143,29 @@
   </ItemGroup>
   <!-- Interop types (platform: Windows) -->
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(IsPartialFacadeAssembly)' != 'true'">
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptAcquireContext.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptAcquireContext.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptDestroyHash.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptDestroyHash.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptDestroyHash.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptDestroyHash.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptDestroyKey.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptDestroyKey.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptDestroyKey.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptDestroyKey.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptGetProvParam.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptGetProvParam.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptGetProvParam.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptGetProvParam.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CryptReleaseContext.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.CryptReleaseContext.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptReleaseContext.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.CryptReleaseContext.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\SafeHashHandle.cs">
-      <Link>Common\Interop\Windows\advapi32\SafeHashHandle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\SafeHashHandle.cs">
+      <Link>Common\Interop\Windows\Advapi32\SafeHashHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\SafeKeyHandle.cs">
-      <Link>Common\Interop\Windows\advapi32\SafeKeyHandle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\SafeKeyHandle.cs">
+      <Link>Common\Interop\Windows\Advapi32\SafeKeyHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\SafeProvHandle.cs">
-      <Link>Common\Interop\Windows\advapi32\SafeProvHandle.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\SafeProvHandle.cs">
+      <Link>Common\Interop\Windows\Advapi32\SafeProvHandle.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Crypt32\Interop.CERT_CONTEXT.cs">
       <Link>Common\Interop\Windows\Crypt32\Interop.CERT_CONTEXT.cs</Link>
@@ -706,6 +706,6 @@
     <Compile Include="System\Security\Cryptography\Pkcs\Rfc3161TimestampTokenInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="@(AsnXml)" /> 
+    <None Include="@(AsnXml)" />
   </ItemGroup>
 </Project>

diff --git a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
index 81a303d..9bc6a0b 100644 (file)
--- a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
+++ b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
@@ -23,146 +23,146 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.TOKENS.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.TOKENS.cs">
       <Link>Common\Interop\Interop.TOKENS.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Errors.cs">
       <Link>Common\Interop\Interop.WinError.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.Winnt.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.Winnt.cs">
       <Link>Common\Interop\Interop.Winnt.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.NtStatus.cs">
       <Link>Common\Interop\Interop.NtStatus.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.LSAStructs.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.LSAStructs.cs">
       <Link>Common\Interop\Interop.LSAStructs.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.SECURITY_LOGON_SESSION_DATA.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.SECURITY_LOGON_SESSION_DATA.cs">
       <Link>Common\Interop\Interop.SECURITY_LOGON_SESSION_DATA.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.UNICODE_STRING.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.UNICODE_STRING.cs">
       <Link>Common\Interop\Interop.UNICODE_STRING.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.GetCurrentProcess_IntPtr.cs">
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs">
       <Link>Common\Interop\Interop.GetCurrentProcess.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCurrentThread.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCurrentThread.cs">
       <Link>Common\Interop\Interop.GetCurrentThread.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ClaimSecurityAttributes.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ClaimSecurityAttributes.cs">
       <Link>Common\Interop\Interop.ClaimSecurityAttributes.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.OpenProcessToken_SafeAccessTokenHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.OpenProcessToken_SafeAccessTokenHandle.cs">
       <Link>Common\Interop\Interop.OpenProcessToken.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.GetTokenInformation.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.GetTokenInformation.cs">
       <Link>Common\Interop\Interop.GetTokenInformation.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.DuplicateTokenEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.DuplicateTokenEx.cs">
       <Link>Common\Interop\Interop.DuplicateTokenEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.DuplicateHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.DuplicateHandle.cs">
       <Link>Common\Interop\Interop.DuplicateHandle.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
       <Link>Common\Interop\Interop.CloseHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.LsaGetLogonSessionData.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.LsaGetLogonSessionData.cs">
       <Link>Common\Interop\Interop.LsaGetLogonSessionData.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.LsaFreeReturnBuffer.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.LsaFreeReturnBuffer.cs">
       <Link>Common\Interop\Interop.LsaFreeReturnBuffer.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.LsaLookupNames2.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.LsaLookupNames2.cs">
       <Link>Common\Interop\Interop.LsaLookupNames2.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.LsaLookupSids.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.LsaLookupSids.cs">
       <Link>Common\Interop\Interop.LsaLookupSids.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.LsaClose.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.LsaClose.cs">
       <Link>Common\Interop\Interop.LsaClose.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.LsaFreeMemory.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.LsaFreeMemory.cs">
       <Link>Common\Interop\Interop.LsaFreeMemory.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.LsaOpenPolicy.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.LsaOpenPolicy.cs">
       <Link>Common\Interop\Interop.LsaOpenPolicy.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ConvertStringSidToSid.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ConvertStringSidToSid.cs">
       <Link>Common\Interop\Interop.ConvertStringSidToSid.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CreateWellKnownSid.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CreateWellKnownSid.cs">
       <Link>Common\Interop\Interop.CreateWellKnownSid.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.GetWindowsAccountDomainSid.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.GetWindowsAccountDomainSid.cs">
       <Link>Common\Interop\Interop.GetWindowsAccountDomainSid.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.IsWellKnownSid.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.IsWellKnownSid.cs">
       <Link>Common\Interop\Interop.IsWellKnownSid.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.IsEqualDomainSid.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.IsEqualDomainSid.cs">
       <Link>Common\Interop\Interop.IsEqualDomainSid.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.OpenThreadToken.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.OpenThreadToken.cs">
       <Link>Common\Interop\Interop.OpenThreadToken.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.RevertToSelf.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.RevertToSelf.cs">
       <Link>Common\Interop\Interop.RevertToSelf.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ImpersonateLoggedOnUser.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ImpersonateLoggedOnUser.cs">
       <Link>Common\Interop\Interop.ImpersonateLoggedOnUser.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.LsaNtStatusToWinError.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.LsaNtStatusToWinError.cs">
       <Link>Common\Interop\Interop.LsaNtStatusToWinError.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalFree.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalFree.cs">
       <Link>Common\Interop\Interop.LocalFree.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalAlloc.cs">
       <Link>Common\Interop\Interop.LocalAlloc.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.LocalAlloc.Constants.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.LocalAlloc.Constants.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LocalAlloc.Constants.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.LocalAlloc.Constants.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.AuthenticationPackageNames.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.AuthenticationPackageNames.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.AuthenticationPackageNames.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.AuthenticationPackageNames.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.KerbLogonSubmitType.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.KerbLogonSubmitType.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.KerbLogonSubmitType.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.KerbLogonSubmitType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.KerbS4uLogin.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.KerbS4uLogin.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.KerbS4uLogin.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.KerbS4uLogin.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.LsaConnectUntrusted.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.LsaConnectUntrusted.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.LsaConnectUntrusted.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.LsaConnectUntrusted.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.LsaDeregisterLogonProcess.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.LsaDeregisterLogonProcess.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.LsaDeregisterLogonProcess.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.LsaDeregisterLogonProcess.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.LsaLogonUser.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.LsaLogonUser.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.LsaLogonUser.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.LsaLogonUser.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.LsaLookupAuthenticationPackage.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.LsaLookupAuthenticationPackage.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.LsaLookupAuthenticationPackage.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.LsaLookupAuthenticationPackage.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.LsaString.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.LsaString.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.LsaString.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.LsaString.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.LsaUnicodeString.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.LsaUnicodeString.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.LsaUnicodeString.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.LsaUnicodeString.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.QuotaLimits.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.QuotaLimits.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.QuotaLimits.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.QuotaLimits.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.SecurityLogonType.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.SecurityLogonType.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.SecurityLogonType.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.SecurityLogonType.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.TokenSource.cs">
-      <Link>Common\Interop\Windows\sspicli\Interop.TokenSource.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\SspiCli\Interop.TokenSource.cs">
+      <Link>Common\Interop\Windows\SspiCli\Interop.TokenSource.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.AllocateLocallyUniqueId.cs">
-      <Link>Common\Interop\Windows\advapi32\Interop.AllocateLocallyUniqueId.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.AllocateLocallyUniqueId.cs">
+      <Link>Common\Interop\Windows\Advapi32\Interop.AllocateLocallyUniqueId.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs">
       <Link>Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs</Link>
@@ -172,12 +172,12 @@
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp')) AND '$(TargetsWindows)' == 'true'">
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CheckTokenMembership.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CheckTokenMembership.cs">
       <Link>Common\Interop\Interop.CheckTokenMembership.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'uap' AND '$(TargetsWindows)' == 'true'">
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CheckTokenMembershipEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.CheckTokenMembershipEx.cs">
       <Link>Common\Interop\Interop.CheckTokenMembershipEx.cs</Link>
     </Compile>
   </ItemGroup>

diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj
index 833cbb4..131c6dc 100644 (file)
--- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj
+++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj
@@ -21,67 +21,67 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Errors.cs">
       <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ServiceProcessOptions.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ServiceProcessOptions.cs">
       <Link>Common\Interop\Windows\Interop.ServiceProcessOptions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CloseServiceHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CloseServiceHandle.cs">
       <Link>Common\Interop\Windows\Interop.CloseServiceHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ControlService.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ControlService.cs">
       <Link>Common\Interop\Windows\Interop.ControlService.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.EnumDependentServices.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.EnumDependentServices.cs">
       <Link>Common\Interop\Windows\Interop.EnumDependentServices.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.EnumServicesStatusEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.EnumServicesStatusEx.cs">
       <Link>Common\Interop\Windows\Interop.EnumServicesStatusEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.GetServiceDisplayName.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.GetServiceDisplayName.cs">
       <Link>Common\Interop\Windows\Interop.GetServiceDisplayName.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.GetServiceKeyName.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.GetServiceKeyName.cs">
       <Link>Common\Interop\Windows\Interop.GetServiceKeyName.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.OpenSCManager.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.OpenSCManager.cs">
       <Link>Common\Interop\Windows\Interop.OpenSCManager.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.OpenService.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.OpenService.cs">
       <Link>Common\Interop\Windows\Interop.OpenService.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.QueryServiceConfig.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.QueryServiceConfig.cs">
       <Link>Common\Interop\Windows\Interop.QueryServiceConfig.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.QueryServiceStatus.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.QueryServiceStatus.cs">
       <Link>Common\Interop\Windows\Interop.QueryServiceStatus.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.StartService.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.StartService.cs">
       <Link>Common\Interop\Windows\Interop.StartService.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ENUM_SERVICE_STATUS.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ENUM_SERVICE_STATUS.cs">
       <Link>Common\Interop\Windows\Interop.ENUM_SERVICE_STATUS.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ENUM_SERVICE_STATUS_PROCESS.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ENUM_SERVICE_STATUS_PROCESS.cs">
       <Link>Common\Interop\Windows\Interop.ENUM_SERVICE_STATUS_PROCESS.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.QUERY_SERVICE_CONFIG.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.QUERY_SERVICE_CONFIG.cs">
       <Link>Common\Interop\Windows\Interop.QUERY_SERVICE_CONFIG.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.SERVICE_STATUS.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.SERVICE_STATUS.cs">
       <Link>Common\Interop\Windows\Interop.SERVICE_STATUS.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.SERVICE_TABLE_ENTRY.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.SERVICE_TABLE_ENTRY.cs">
       <Link>Common\Interop\Windows\Interop.SERVICE_TABLE_ENTRY.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.SetServiceStatus.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.SetServiceStatus.cs">
       <Link>Common\Interop\Windows\Interop.SetServiceStatus.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.WTSSESSION_NOTIFICATION.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.WTSSESSION_NOTIFICATION.cs">
       <Link>Common\Interop\Windows\Interop.WTSSESSION_NOTIFICATION.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.RegisterServiceCtrlHandlerEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.RegisterServiceCtrlHandlerEx.cs">
       <Link>Common\Interop\Windows\Interop.RegisterServiceCtrlHandlerEx.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.StartServiceCtrlDispatcher.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.StartServiceCtrlDispatcher.cs">
       <Link>Common\Interop\Windows\Interop.StartServiceCtrlDispatcher.cs</Link>
     </Compile>
     <Compile Include="Microsoft\Win32\SafeHandles\SafeServiceHandle.cs" />
@@ -120,4 +120,4 @@
   <ItemGroup>
     <Reference Include="System.Diagnostics.EventLog" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj
index 19a4730..e4be825 100644 (file)
--- a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj
+++ b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{E62B874D-1A0D-41BC-8CFC-9E09D0860A77}</ProjectGuid>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -18,35 +18,35 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ServiceProcessOptions.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ServiceProcessOptions.cs">
       <Link>Common\Interop\Windows\Interop.ServiceProcessOptions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CloseServiceHandle.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CloseServiceHandle.cs">
       <Link>Common\Interop\Windows\Interop.CloseServiceHandle.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.OpenSCManager.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.OpenSCManager.cs">
       <Link>Common\Interop\Windows\Interop.OpenSCManager.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.OpenService.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.OpenService.cs">
       <Link>Common\Interop\Windows\Interop.OpenService.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.CreateService.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CreateService.cs">
       <Link>Common\Interop\Windows\Interop.CreateService.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.SERVICE_DESCRIPTION.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.SERVICE_DESCRIPTION.cs">
       <Link>Common\Interop\Windows\Interop.SERVICE_DESCRIPTION.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.ChangeServiceConfig2.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.ChangeServiceConfig2.cs">
       <Link>Common\Interop\Windows\Interop.ChangeServiceConfig2.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.SERVICE_DELAYED_AUTOSTART_INFO.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.SERVICE_DELAYED_AUTOSTART_INFO.cs">
       <Link>Common\Interop\Windows\Interop.SERVICE_DELAYED_AUTOSTART_INFO.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.DeleteService.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.DeleteService.cs">
       <Link>Common\Interop\Windows\Interop.DeleteService.cs</Link>
     </Compile>
     <Compile Include="$(CommonTestPath)\System\Threading\Tasks\TaskTimeoutExtensions.cs">
       <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
index 6fbdf0b..560705f 100644 (file)
--- a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
+++ b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
@@ -36,7 +36,7 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCPInfoEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCPInfoEx.cs">
       <Link>Common\Interop\Windows\Interop.GetCPInfoEx.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs">
@@ -75,4 +75,4 @@
     <PreferredIANANamesPath>Data\PreferredCodePageNames.csv</PreferredIANANamesPath>
     <OutputDataTablePath>System\Text\EncodingTable.Data.cs</OutputDataTablePath>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj
index 0b0b9cf..3e53b21 100644 (file)
--- a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj
+++ b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj
@@ -30,26 +30,26 @@
     <Compile Include="$(CommonPath)\Interop\Windows\User32\Interop.MessageBeep.cs">
       <Link>Common\Interop\Windows\User32\Interop.MessageBeep.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\winmm\Interop.MMCKINFO.cs">
-      <Link>Common\Interop\Windows\winmm\Interop.MMCKINFO.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinMm\Interop.MMCKINFO.cs">
+      <Link>Common\Interop\Windows\WinMm\Interop.MMCKINFO.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\winmm\Interop.mmioAscend.cs">
-      <Link>Common\Interop\Windows\winmm\Interop.mmioAscend.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinMm\Interop.mmioAscend.cs">
+      <Link>Common\Interop\Windows\WinMm\Interop.mmioAscend.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\winmm\Interop.mmioClose.cs">
-      <Link>Common\Interop\Windows\winmm\Interop.mmioClose.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinMm\Interop.mmioClose.cs">
+      <Link>Common\Interop\Windows\WinMm\Interop.mmioClose.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\winmm\Interop.mmioDescend.cs">
-      <Link>Common\Interop\Windows\winmm\Interop.mmioDescend.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinMm\Interop.mmioDescend.cs">
+      <Link>Common\Interop\Windows\WinMm\Interop.mmioDescend.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\winmm\Interop.mmioRead.cs">
-      <Link>Common\Interop\Windows\winmm\Interop.mmioRead.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinMm\Interop.mmioRead.cs">
+      <Link>Common\Interop\Windows\WinMm\Interop.mmioRead.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\winmm\Interop.mmioOpen.cs">
-      <Link>Common\Interop\Windows\winmm\Interop.mmioOpen.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinMm\Interop.mmioOpen.cs">
+      <Link>Common\Interop\Windows\WinMm\Interop.mmioOpen.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\winmm\Interop.PlaySound.cs">
-      <Link>Common\Interop\Windows\winmm\Interop.PlaySound.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Windows\WinMm\Interop.PlaySound.cs">
+      <Link>Common\Interop\Windows\WinMm\Interop.PlaySound.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>