Move most of CoreLib interop under Common (#1247)

Contributes to #1232
dotnet · Jan 3, 2020 · f1c7ed8 · f1c7ed8
1 parent d099bc9
commit f1c7ed8
Show file tree

Hide file tree

Showing 235 changed files with 1,203 additions and 974 deletions.
diff --git a/src/coreclr/src/System.Private.CoreLib/Common/NotImplemented.cs b/src/coreclr/src/System.Private.CoreLib/Common/NotImplemented.cs
diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -116,7 +116,7 @@
     Helper Paths
   -->
   <PropertyGroup>
-    <CommonPath>$(MSBuildThisFileDirectory)Common</CommonPath>
+    <CommonPath>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'Common', 'src'))</CommonPath>
     <BclSourcesRoot>$(MSBuildThisFileDirectory)src</BclSourcesRoot>
   </PropertyGroup>
 
@@ -259,6 +259,7 @@
     <Compile Include="$(BclSourcesRoot)\System\RuntimeHandles.cs" />
     <Compile Include="$(BclSourcesRoot)\System\RuntimeType.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Security\DynamicSecurityMethodAttribute.cs" />
+    <Compile Include="$(BclSourcesRoot)\System\SR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\StartupHookProvider.cs" />
     <Compile Include="$(BclSourcesRoot)\System\String.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\StubHelpers.cs" />
@@ -283,11 +284,21 @@
     <Compile Include="$(BclSourcesRoot)\System\ValueType.cs" />
     <Compile Include="$(BclSourcesRoot)\System\WeakReference.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\WeakReference.T.CoreCLR.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.GetStdHandle.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.HandleTypes.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.LocalAlloc.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Ole32\Interop.CoTaskMemAlloc.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\OleAut32\Interop.SysAllocStringByteLen.cs" />
+    <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.HandleTypes.cs">
+      <Link>Common\Interop\Windows\Kernel32\Interop.HandleTypes.cs</Link>
+    </Compile>
+    <Compile Include="$(LibrariesProjectRoot)\System.Private.CoreLib\src\Interop\Windows\Kernel32\Interop.LocalAlloc.cs">
+      <Link>Interop\Windows\Kernel32\Interop.LocalAlloc.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.CoTaskMemAlloc.cs">
+      <Link>Common\Interop\Windows\Ole32\Interop.CoTaskMemAlloc.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.SysAllocStringByteLen.cs">
+      <Link>Common\Interop\Windows\OleAut32\Interop.SysAllocStringByteLen.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(FeatureUtf8String)' == 'true'">
     <Compile Include="$(BclSourcesRoot)\System\Char8.cs" />
@@ -310,7 +321,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(BclSourcesRoot)\System\Diagnostics\Eventing\XplatEventLogger.cs" Condition="'$(FeatureXplatEventSource)' == 'true'" />
-    <Compile Include="$(IntermediateOutputPath)../../../Eventing/$(BuildArch)/$(Configuration)/NativeRuntimeEventSource.cs" Condition="'$(FeaturePerfTracing)' == 'true' AND '$(BuildingInsideVisualStudio)' != 'true' " />
+    <Compile Include="$(IntermediateOutputPath)..\..\..\Eventing\$(BuildArch)\$(Configuration)\NativeRuntimeEventSource.cs" Condition="'$(FeaturePerfTracing)' == 'true' AND '$(BuildingInsideVisualStudio)' != 'true' " />
   </ItemGroup>
   <ItemGroup Condition="'$(FeatureCominterop)' == 'true'">
     <Compile Include="$(BclSourcesRoot)\Internal\Runtime\InteropServices\WindowsRuntime\ExceptionSupport.cs" />
@@ -382,7 +393,9 @@
     <Compile Include="$(BclSourcesRoot)\System\Variant.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Interop.BOOL.cs" /> <!-- The CLR internally uses a BOOL type analogous to the Windows BOOL type on Unix -->
+    <Compile Include="$(CommonPath)Interop\Windows\Interop.BOOL.cs"> <!-- The CLR internally uses a BOOL type analogous to the Windows BOOL type on Unix -->
+      <Link>Common\Interop\Windows\Interop.BOOL.cs</Link>
+    </Compile>
     <Compile Include="$(BclSourcesRoot)\Interop\Unix\Interop.Libraries.cs" />
     <Compile Include="$(BclSourcesRoot)\System\DateTime.Unix.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\GlobalizationMode.Unix.cs" />
@@ -403,11 +416,11 @@
   </ItemGroup>
   <!-- Include additional sources shared files in the compilation -->
   <ItemGroup>
-    <!-- These files are shared with other framework components and don't live the same folder as the rest of them-->
-    <Compile Include="$(CommonPath)\NotImplemented.cs" />
-    <Compile Include="$(CommonPath)\System\SR.cs" />
+    <Compile Include="$(CommonPath)System\NotImplemented.cs">
+      <Link>Common\System\NotImplemented.cs</Link>
+    </Compile>
   </ItemGroup>
-  <Import Project="$(CoreLibSharedDir)System.Private.CoreLib.Shared.projitems" Label="Shared" />
+  <Import Project="$(LibrariesProjectRoot)\System.Private.CoreLib\src\System.Private.CoreLib.Shared.projitems" Label="Shared" />
   <PropertyGroup>
     <CheckCDefines Condition="'$(CheckCDefines)'==''">true</CheckCDefines>
   </PropertyGroup>

diff --git a/...ystem.Private.CoreLib/Common/System/SR.cs → ...c/System.Private.CoreLib/src/System/SR.cs b/...ystem.Private.CoreLib/Common/System/SR.cs → ...c/System.Private.CoreLib/src/System/SR.cs
diff --git a/...oreLib/src/Interop/Unix/Interop.Errors.cs → ...Common/src/Interop/Unix/Interop.Errors.cs b/...oreLib/src/Interop/Unix/Interop.Errors.cs → ...Common/src/Interop/Unix/Interop.Errors.cs
diff --git a/...eLib/src/Interop/Unix/Interop.IOErrors.cs → ...mmon/src/Interop/Unix/Interop.IOErrors.cs b/...eLib/src/Interop/Unix/Interop.IOErrors.cs → ...mmon/src/Interop/Unix/Interop.IOErrors.cs
diff --git a/src/libraries/Common/src/Interop/Unix/Interop.Libraries.cs b/src/libraries/Common/src/Interop/Unix/Interop.Libraries.cs
@@ -8,7 +8,7 @@ internal static partial class Libraries
     {
         // Shims
         internal const string SystemNative = "System.Native";
-        internal const string HttpNative = "System.Net.Http.Native";
+        internal const string GlobalizationNative = "System.Globalization.Native";
         internal const string NetSecurityNative = "System.Net.Security.Native";
         internal const string CryptoNative = "System.Security.Cryptography.Native.OpenSsl";
         internal const string CompressionNative = "System.IO.Compression.Native";

diff --git a/....Globalization.Native/Interop.Calendar.cs → ....Globalization.Native/Interop.Calendar.cs b/....Globalization.Native/Interop.Calendar.cs → ....Globalization.Native/Interop.Calendar.cs
diff --git a/...em.Globalization.Native/Interop.Casing.cs → ...em.Globalization.Native/Interop.Casing.cs b/...em.Globalization.Native/Interop.Casing.cs → ...em.Globalization.Native/Interop.Casing.cs
diff --git a/...Globalization.Native/Interop.Collation.cs → ...Globalization.Native/Interop.Collation.cs b/...Globalization.Native/Interop.Collation.cs → ...Globalization.Native/Interop.Collation.cs
diff --git a/...ystem.Globalization.Native/Interop.ICU.cs → ...ystem.Globalization.Native/Interop.ICU.cs b/...ystem.Globalization.Native/Interop.ICU.cs → ...ystem.Globalization.Native/Interop.ICU.cs
diff --git a/...stem.Globalization.Native/Interop.Idna.cs → ...stem.Globalization.Native/Interop.Idna.cs b/...stem.Globalization.Native/Interop.Idna.cs → ...stem.Globalization.Native/Interop.Idna.cs
diff --git a/...em.Globalization.Native/Interop.Locale.cs → ...em.Globalization.Native/Interop.Locale.cs b/...em.Globalization.Native/Interop.Locale.cs → ...em.Globalization.Native/Interop.Locale.cs
diff --git a/...alization.Native/Interop.Normalization.cs → ...alization.Native/Interop.Normalization.cs b/...alization.Native/Interop.Normalization.cs → ...alization.Native/Interop.Normalization.cs
diff --git a/...lobalization.Native/Interop.ResultCode.cs → ...lobalization.Native/Interop.ResultCode.cs b/...lobalization.Native/Interop.ResultCode.cs → ...lobalization.Native/Interop.ResultCode.cs
diff --git a/...balization.Native/Interop.TimeZoneInfo.cs → ...balization.Native/Interop.TimeZoneInfo.cs b/...balization.Native/Interop.TimeZoneInfo.cs → ...balization.Native/Interop.TimeZoneInfo.cs
diff --git a/...tem.Globalization.Native/Interop.Utils.cs → ...tem.Globalization.Native/Interop.Utils.cs b/...tem.Globalization.Native/Interop.Utils.cs → ...tem.Globalization.Native/Interop.Utils.cs
diff --git a/...erop/Unix/System.Native/Interop.Access.cs → ...erop/Unix/System.Native/Interop.Access.cs b/...erop/Unix/System.Native/Interop.Access.cs → ...erop/Unix/System.Native/Interop.Access.cs
diff --git a/...terop/Unix/System.Native/Interop.ChDir.cs → ...terop/Unix/System.Native/Interop.ChDir.cs b/...terop/Unix/System.Native/Interop.ChDir.cs → ...terop/Unix/System.Native/Interop.ChDir.cs
diff --git a/...terop/Unix/System.Native/Interop.Close.cs → ...terop/Unix/System.Native/Interop.Close.cs b/...terop/Unix/System.Native/Interop.Close.cs → ...terop/Unix/System.Native/Interop.Close.cs
diff --git a/...terop/Unix/System.Native/Interop.FLock.cs → ...terop/Unix/System.Native/Interop.FLock.cs b/...terop/Unix/System.Native/Interop.FLock.cs → ...terop/Unix/System.Native/Interop.FLock.cs
diff --git a/...terop/Unix/System.Native/Interop.FSync.cs → ...terop/Unix/System.Native/Interop.FSync.cs b/...terop/Unix/System.Native/Interop.FSync.cs → ...terop/Unix/System.Native/Interop.FSync.cs
diff --git a/...p/Unix/System.Native/Interop.FTruncate.cs → ...p/Unix/System.Native/Interop.FTruncate.cs b/...p/Unix/System.Native/Interop.FTruncate.cs → ...p/Unix/System.Native/Interop.FTruncate.cs
diff --git a/...ystem.Native/Interop.GetCpuUtilization.cs → ...ystem.Native/Interop.GetCpuUtilization.cs b/...ystem.Native/Interop.GetCpuUtilization.cs → ...ystem.Native/Interop.GetCpuUtilization.cs
diff --git a/...erop/Unix/System.Native/Interop.GetCwd.cs → ...erop/Unix/System.Native/Interop.GetCwd.cs b/...erop/Unix/System.Native/Interop.GetCwd.cs → ...erop/Unix/System.Native/Interop.GetCwd.cs
diff --git a/...rop/Unix/System.Native/Interop.GetEUid.cs → ...rop/Unix/System.Native/Interop.GetEUid.cs b/...rop/Unix/System.Native/Interop.GetEUid.cs → ...rop/Unix/System.Native/Interop.GetEUid.cs
diff --git a/...Unix/System.Native/Interop.GetHostName.cs → ...Unix/System.Native/Interop.GetHostName.cs b/...Unix/System.Native/Interop.GetHostName.cs → ...Unix/System.Native/Interop.GetHostName.cs
diff --git a/...op/Unix/System.Native/Interop.GetPwUid.cs → ...op/Unix/System.Native/Interop.GetPwUid.cs b/...op/Unix/System.Native/Interop.GetPwUid.cs → ...op/Unix/System.Native/Interop.GetPwUid.cs
diff --git a/...x/System.Native/Interop.GetRandomBytes.cs → ...x/System.Native/Interop.GetRandomBytes.cs b/...x/System.Native/Interop.GetRandomBytes.cs → ...x/System.Native/Interop.GetRandomBytes.cs
diff --git a/...em.Native/Interop.GetSystemTimeAsTicks.cs → ...em.Native/Interop.GetSystemTimeAsTicks.cs b/...em.Native/Interop.GetSystemTimeAsTicks.cs → ...em.Native/Interop.GetSystemTimeAsTicks.cs
diff --git a/...nix/System.Native/Interop.GetTimestamp.cs → ...nix/System.Native/Interop.GetTimestamp.cs b/...nix/System.Native/Interop.GetTimestamp.cs → ...nix/System.Native/Interop.GetTimestamp.cs
diff --git a/...Unix/System.Native/Interop.GetUnixName.cs → ...Unix/System.Native/Interop.GetUnixName.cs b/...Unix/System.Native/Interop.GetUnixName.cs → ...Unix/System.Native/Interop.GetUnixName.cs
diff --git a/...x/System.Native/Interop.GetUnixRelease.cs → ...x/System.Native/Interop.GetUnixRelease.cs b/...x/System.Native/Interop.GetUnixRelease.cs → ...x/System.Native/Interop.GetUnixRelease.cs
diff --git a/...terop/Unix/System.Native/Interop.LSeek.cs → ...terop/Unix/System.Native/Interop.LSeek.cs b/...terop/Unix/System.Native/Interop.LSeek.cs → ...terop/Unix/System.Native/Interop.LSeek.cs
diff --git a/...x/System.Native/Interop.LockFileRegion.cs → ...x/System.Native/Interop.LockFileRegion.cs b/...x/System.Native/Interop.LockFileRegion.cs → ...x/System.Native/Interop.LockFileRegion.cs
diff --git a/...op/Unix/System.Native/Interop.MksTemps.cs → ...op/Unix/System.Native/Interop.MksTemps.cs b/...op/Unix/System.Native/Interop.MksTemps.cs → ...op/Unix/System.Native/Interop.MksTemps.cs
diff --git a/...Unix/System.Native/Interop.MountPoints.cs → ...Unix/System.Native/Interop.MountPoints.cs b/...Unix/System.Native/Interop.MountPoints.cs → ...Unix/System.Native/Interop.MountPoints.cs
diff --git a/...nterop/Unix/System.Native/Interop.Open.cs → ...nterop/Unix/System.Native/Interop.Open.cs b/...nterop/Unix/System.Native/Interop.Open.cs → ...nterop/Unix/System.Native/Interop.Open.cs
diff --git a/...p/Unix/System.Native/Interop.OpenFlags.cs → ...p/Unix/System.Native/Interop.OpenFlags.cs b/...p/Unix/System.Native/Interop.OpenFlags.cs → ...p/Unix/System.Native/Interop.OpenFlags.cs
diff --git a/...op/Unix/System.Native/Interop.PathConf.cs → ...op/Unix/System.Native/Interop.PathConf.cs b/...op/Unix/System.Native/Interop.PathConf.cs → ...op/Unix/System.Native/Interop.PathConf.cs
diff --git a/...Unix/System.Native/Interop.Permissions.cs → ...Unix/System.Native/Interop.Permissions.cs b/...Unix/System.Native/Interop.Permissions.cs → ...Unix/System.Native/Interop.Permissions.cs
diff --git a/...nix/System.Native/Interop.PosixFAdvise.cs → ...nix/System.Native/Interop.PosixFAdvise.cs b/...nix/System.Native/Interop.PosixFAdvise.cs → ...nix/System.Native/Interop.PosixFAdvise.cs
diff --git a/...nterop/Unix/System.Native/Interop.Read.cs → ...nterop/Unix/System.Native/Interop.Read.cs b/...nterop/Unix/System.Native/Interop.Read.cs → ...nterop/Unix/System.Native/Interop.Read.cs
diff --git a/...rop/Unix/System.Native/Interop.ReadDir.cs → ...rop/Unix/System.Native/Interop.ReadDir.cs b/...rop/Unix/System.Native/Interop.ReadDir.cs → ...rop/Unix/System.Native/Interop.ReadDir.cs
diff --git a/...op/Unix/System.Native/Interop.ReadLink.cs → ...op/Unix/System.Native/Interop.ReadLink.cs b/...op/Unix/System.Native/Interop.ReadLink.cs → ...op/Unix/System.Native/Interop.ReadLink.cs
diff --git a/...nterop/Unix/System.Native/Interop.Stat.cs → ...nterop/Unix/System.Native/Interop.Stat.cs b/...nterop/Unix/System.Native/Interop.Stat.cs → ...nterop/Unix/System.Native/Interop.Stat.cs
diff --git a/...rop/Unix/System.Native/Interop.SysConf.cs → ...rop/Unix/System.Native/Interop.SysConf.cs b/...rop/Unix/System.Native/Interop.SysConf.cs → ...rop/Unix/System.Native/Interop.SysConf.cs
diff --git a/...erop/Unix/System.Native/Interop.SysLog.cs → ...erop/Unix/System.Native/Interop.SysLog.cs b/...erop/Unix/System.Native/Interop.SysLog.cs → ...erop/Unix/System.Native/Interop.SysLog.cs
diff --git a/...erop/Unix/System.Native/Interop.Unlink.cs → ...erop/Unix/System.Native/Interop.Unlink.cs b/...erop/Unix/System.Native/Interop.Unlink.cs → ...erop/Unix/System.Native/Interop.Unlink.cs
diff --git a/...terop/Unix/System.Native/Interop.Write.cs → ...terop/Unix/System.Native/Interop.Write.cs b/...terop/Unix/System.Native/Interop.Write.cs → ...terop/Unix/System.Native/Interop.Write.cs
diff --git a/...ndows/Advapi32/Interop.ActivityControl.cs → ...ndows/Advapi32/Interop.ActivityControl.cs b/...ndows/Advapi32/Interop.ActivityControl.cs → ...ndows/Advapi32/Interop.ActivityControl.cs
diff --git a/...dows/Advapi32/Interop.EVENT_INFO_CLASS.cs → ...dows/Advapi32/Interop.EVENT_INFO_CLASS.cs b/...dows/Advapi32/Interop.EVENT_INFO_CLASS.cs → ...dows/Advapi32/Interop.EVENT_INFO_CLASS.cs
diff --git a/...ows/Advapi32/Interop.EtwEnableCallback.cs → ...ows/Advapi32/Interop.EtwEnableCallback.cs b/...ows/Advapi32/Interop.EtwEnableCallback.cs → ...ows/Advapi32/Interop.EtwEnableCallback.cs
diff --git a/...dvapi32/Interop.EventActivityIdControl.cs → ...dvapi32/Interop.EventActivityIdControl.cs b/...dvapi32/Interop.EventActivityIdControl.cs → ...dvapi32/Interop.EventActivityIdControl.cs
diff --git a/...Windows/Advapi32/Interop.EventRegister.cs → ...Windows/Advapi32/Interop.EventRegister.cs b/...Windows/Advapi32/Interop.EventRegister.cs → ...Windows/Advapi32/Interop.EventRegister.cs
diff --git a/...s/Advapi32/Interop.EventSetInformation.cs → ...s/Advapi32/Interop.EventSetInformation.cs b/...s/Advapi32/Interop.EventSetInformation.cs → ...s/Advapi32/Interop.EventSetInformation.cs
diff --git a/...ows/Advapi32/Interop.EventTraceGuidsEx.cs → ...ows/Advapi32/Interop.EventTraceGuidsEx.cs b/...ows/Advapi32/Interop.EventTraceGuidsEx.cs → ...ows/Advapi32/Interop.EventTraceGuidsEx.cs
diff --git a/...ndows/Advapi32/Interop.EventUnregister.cs → ...ndows/Advapi32/Interop.EventUnregister.cs b/...ndows/Advapi32/Interop.EventUnregister.cs → ...ndows/Advapi32/Interop.EventUnregister.cs
diff --git a/...dows/Advapi32/Interop.EventWriteString.cs → ...dows/Advapi32/Interop.EventWriteString.cs b/...dows/Advapi32/Interop.EventWriteString.cs → ...dows/Advapi32/Interop.EventWriteString.cs
diff --git a/...ws/Advapi32/Interop.EventWriteTransfer.cs → ...ws/Advapi32/Interop.EventWriteTransfer.cs b/...ws/Advapi32/Interop.EventWriteTransfer.cs → ...ws/Advapi32/Interop.EventWriteTransfer.cs
diff --git a/...ws/Advapi32/Interop.LookupAccountNameW.cs → ...ws/Advapi32/Interop.LookupAccountNameW.cs b/...ws/Advapi32/Interop.LookupAccountNameW.cs → ...ws/Advapi32/Interop.LookupAccountNameW.cs
diff --git a/...p/Windows/Advapi32/Interop.RegCloseKey.cs → ...p/Windows/Advapi32/Interop.RegCloseKey.cs b/...p/Windows/Advapi32/Interop.RegCloseKey.cs → ...p/Windows/Advapi32/Interop.RegCloseKey.cs
diff --git a/...indows/Advapi32/Interop.RegCreateKeyEx.cs → ...indows/Advapi32/Interop.RegCreateKeyEx.cs b/...indows/Advapi32/Interop.RegCreateKeyEx.cs → ...indows/Advapi32/Interop.RegCreateKeyEx.cs
diff --git a/...indows/Advapi32/Interop.RegDeleteKeyEx.cs → ...indows/Advapi32/Interop.RegDeleteKeyEx.cs b/...indows/Advapi32/Interop.RegDeleteKeyEx.cs → ...indows/Advapi32/Interop.RegDeleteKeyEx.cs
diff --git a/...indows/Advapi32/Interop.RegDeleteValue.cs → ...indows/Advapi32/Interop.RegDeleteValue.cs b/...indows/Advapi32/Interop.RegDeleteValue.cs → ...indows/Advapi32/Interop.RegDeleteValue.cs
diff --git a/.../Windows/Advapi32/Interop.RegEnumKeyEx.cs → .../Windows/Advapi32/Interop.RegEnumKeyEx.cs b/.../Windows/Advapi32/Interop.RegEnumKeyEx.cs → .../Windows/Advapi32/Interop.RegEnumKeyEx.cs
diff --git a/.../Windows/Advapi32/Interop.RegEnumValue.cs → .../Windows/Advapi32/Interop.RegEnumValue.cs b/.../Windows/Advapi32/Interop.RegEnumValue.cs → .../Windows/Advapi32/Interop.RegEnumValue.cs
diff --git a/...p/Windows/Advapi32/Interop.RegFlushKey.cs → ...p/Windows/Advapi32/Interop.RegFlushKey.cs b/...p/Windows/Advapi32/Interop.RegFlushKey.cs → ...p/Windows/Advapi32/Interop.RegFlushKey.cs
diff --git a/.../Windows/Advapi32/Interop.RegOpenKeyEx.cs → .../Windows/Advapi32/Interop.RegOpenKeyEx.cs b/.../Windows/Advapi32/Interop.RegOpenKeyEx.cs → .../Windows/Advapi32/Interop.RegOpenKeyEx.cs
diff --git a/...ndows/Advapi32/Interop.RegQueryInfoKey.cs → ...ndows/Advapi32/Interop.RegQueryInfoKey.cs b/...ndows/Advapi32/Interop.RegQueryInfoKey.cs → ...ndows/Advapi32/Interop.RegQueryInfoKey.cs
diff --git a/...ndows/Advapi32/Interop.RegQueryValueEx.cs → ...ndows/Advapi32/Interop.RegQueryValueEx.cs b/...ndows/Advapi32/Interop.RegQueryValueEx.cs → ...ndows/Advapi32/Interop.RegQueryValueEx.cs
diff --git a/...Windows/Advapi32/Interop.RegSetValueEx.cs → ...Windows/Advapi32/Interop.RegSetValueEx.cs b/...Windows/Advapi32/Interop.RegSetValueEx.cs → ...Windows/Advapi32/Interop.RegSetValueEx.cs
diff --git a/...ows/Advapi32/Interop.RegistryConstants.cs → ...ows/Advapi32/Interop.RegistryConstants.cs b/...ows/Advapi32/Interop.RegistryConstants.cs → ...ows/Advapi32/Interop.RegistryConstants.cs
diff --git a/...Interop.BCryptGenRandom.GetRandomBytes.cs → ...Interop.BCryptGenRandom.GetRandomBytes.cs b/...Interop.BCryptGenRandom.GetRandomBytes.cs → ...Interop.BCryptGenRandom.GetRandomBytes.cs
diff --git a/...Windows/BCrypt/Interop.BCryptGenRandom.cs → ...Windows/BCrypt/Interop.BCryptGenRandom.cs b/...Windows/BCrypt/Interop.BCryptGenRandom.cs → ...Windows/BCrypt/Interop.BCryptGenRandom.cs
diff --git a/...nterop/Windows/BCrypt/Interop.NTSTATUS.cs → ...nterop/Windows/BCrypt/Interop.NTSTATUS.cs b/...nterop/Windows/BCrypt/Interop.NTSTATUS.cs → ...nterop/Windows/BCrypt/Interop.NTSTATUS.cs
diff --git a/...ows/Crypt32/Interop.CryptProtectMemory.cs → ...ows/Crypt32/Interop.CryptProtectMemory.cs b/...ows/Crypt32/Interop.CryptProtectMemory.cs → ...ows/Crypt32/Interop.CryptProtectMemory.cs
diff --git a/...reLib/src/Interop/Windows/Interop.BOOL.cs → ...ommon/src/Interop/Windows/Interop.BOOL.cs b/...reLib/src/Interop/Windows/Interop.BOOL.cs → ...ommon/src/Interop/Windows/Interop.BOOL.cs
diff --git a/...ib/src/Interop/Windows/Interop.BOOLEAN.cs → ...on/src/Interop/Windows/Interop.BOOLEAN.cs b/...ib/src/Interop/Windows/Interop.BOOLEAN.cs → ...on/src/Interop/Windows/Interop.BOOLEAN.cs
diff --git a/src/libraries/Common/src/Interop/Windows/Interop.Errors.cs b/src/libraries/Common/src/Interop/Windows/Interop.Errors.cs
@@ -2,10 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-internal partial class Interop
+internal static partial class Interop
 {
-    // https://msdn.microsoft.com/en-us/library/windows/desktop/ms681382.aspx
-    internal partial class Errors
+    // As defined in winerror.h and https://docs.microsoft.com/en-us/windows/win32/debug/system-error-codes
+    internal static partial class Errors
     {
         internal const int ERROR_SUCCESS = 0x0;
         internal const int ERROR_INVALID_FUNCTION = 0x1;
@@ -23,6 +23,7 @@ internal partial class Errors
         internal const int ERROR_SHARING_VIOLATION = 0x20;
         internal const int ERROR_LOCK_VIOLATION = 0x21;
         internal const int ERROR_HANDLE_EOF = 0x26;
+        internal const int ERROR_NOT_SUPPORTED = 0x32;
         internal const int ERROR_BAD_NETPATH = 0x35;
         internal const int ERROR_NETWORK_ACCESS_DENIED = 0x41;
         internal const int ERROR_BAD_NET_NAME = 0x43;
@@ -49,15 +50,19 @@ internal partial class Errors
         internal const int ERROR_MORE_DATA = 0xEA;
         internal const int ERROR_NO_MORE_ITEMS = 0x103;
         internal const int ERROR_DIRECTORY = 0x10B;
+        internal const int ERROR_NOT_OWNER = 0x120;
+        internal const int ERROR_TOO_MANY_POSTS = 0x12A;
         internal const int ERROR_PARTIAL_COPY = 0x12B;
         internal const int ERROR_ARITHMETIC_OVERFLOW = 0x216;
         internal const int ERROR_PIPE_CONNECTED = 0x217;
         internal const int ERROR_PIPE_LISTENING = 0x218;
+        internal const int ERROR_MUTANT_LIMIT_EXCEEDED = 0x24B;
         internal const int ERROR_OPERATION_ABORTED = 0x3E3;
         internal const int ERROR_IO_INCOMPLETE = 0x3E4;
         internal const int ERROR_IO_PENDING = 0x3E5;
         internal const int ERROR_NO_TOKEN = 0x3f0;
         internal const int ERROR_SERVICE_DOES_NOT_EXIST = 0x424;
+        internal const int ERROR_NO_UNICODE_TRANSLATION = 0x459;
         internal const int ERROR_DLL_INIT_FAILED = 0x45A;
         internal const int ERROR_COUNTER_TIMEOUT = 0x461;
         internal const int ERROR_NO_ASSOCIATION = 0x483;
@@ -80,10 +85,10 @@ internal partial class Errors
         internal const int ERROR_NO_SECURITY_ON_OBJECT = 0x546;
         internal const int ERROR_CANNOT_IMPERSONATE = 0x558;
         internal const int ERROR_CLASS_ALREADY_EXISTS = 0x582;
+        internal const int ERROR_NO_SYSTEM_RESOURCES = 0x5AA;
+        internal const int ERROR_TIMEOUT = 0x5B4;
         internal const int ERROR_EVENTLOG_FILE_CHANGED = 0x5DF;
         internal const int ERROR_TRUSTED_RELATIONSHIP_FAILURE = 0x6FD;
         internal const int ERROR_RESOURCE_LANG_NOT_FOUND = 0x717;
-        internal const int EFail = unchecked((int)0x80004005);
-        internal const int E_FILENOTFOUND = unchecked((int)0x80070002);
     }
 }
diff --git a/...op/Windows/Kernel32/Interop.CancelIoEx.cs → ...op/Windows/Kernel32/Interop.CancelIoEx.cs b/...op/Windows/Kernel32/Interop.CancelIoEx.cs → ...op/Windows/Kernel32/Interop.CancelIoEx.cs
diff --git a/...p/Windows/Kernel32/Interop.CloseHandle.cs → ...p/Windows/Kernel32/Interop.CloseHandle.cs b/...p/Windows/Kernel32/Interop.CloseHandle.cs → ...p/Windows/Kernel32/Interop.CloseHandle.cs
diff --git a/...indows/Kernel32/Interop.CompletionPort.cs → ...indows/Kernel32/Interop.CompletionPort.cs b/...indows/Kernel32/Interop.CompletionPort.cs → ...indows/Kernel32/Interop.CompletionPort.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
@@ -2,12 +2,18 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-internal partial class Interop
+internal static partial class Interop
 {
-    internal partial class Kernel32
+    internal static partial class Kernel32
     {
         internal const int WAIT_TIMEOUT = 0x00000102;
         internal const int WAIT_OBJECT_0 = 0x00000000;
         internal const int WAIT_ABANDONED = 0x00000080;
+
+        internal const int MAXIMUM_ALLOWED = 0x02000000;
+        internal const int SYNCHRONIZE = 0x00100000;
+        internal const int MUTEX_MODIFY_STATE = 0x00000001;
+        internal const int SEMAPHORE_MODIFY_STATE = 0x00000002;
+        internal const int EVENT_MODIFY_STATE = 0x00000002;
     }
 }
diff --git a/...ndows/Kernel32/Interop.EventWaitHandle.cs → ...ndows/Kernel32/Interop.EventWaitHandle.cs b/...ndows/Kernel32/Interop.EventWaitHandle.cs → ...ndows/Kernel32/Interop.EventWaitHandle.cs
diff --git a/...nel32/Interop.ExpandEnvironmentStrings.cs → ...nel32/Interop.ExpandEnvironmentStrings.cs b/...nel32/Interop.ExpandEnvironmentStrings.cs → ...nel32/Interop.ExpandEnvironmentStrings.cs
diff --git a/...rop/Windows/Kernel32/Interop.FILE_TIME.cs → ...rop/Windows/Kernel32/Interop.FILE_TIME.cs b/...rop/Windows/Kernel32/Interop.FILE_TIME.cs → ...rop/Windows/Kernel32/Interop.FILE_TIME.cs
diff --git a/...indows/Kernel32/Interop.FileAttributes.cs → ...indows/Kernel32/Interop.FileAttributes.cs b/...indows/Kernel32/Interop.FileAttributes.cs → ...indows/Kernel32/Interop.FileAttributes.cs
diff --git a/.../Kernel32/Interop.FileTimeToSystemTime.cs → .../Kernel32/Interop.FileTimeToSystemTime.cs b/.../Kernel32/Interop.FileTimeToSystemTime.cs → .../Kernel32/Interop.FileTimeToSystemTime.cs
diff --git a/...rop/Windows/Kernel32/Interop.FileTypes.cs → ...rop/Windows/Kernel32/Interop.FileTypes.cs b/...rop/Windows/Kernel32/Interop.FileTypes.cs → ...rop/Windows/Kernel32/Interop.FileTypes.cs
diff --git a/...rop/Windows/Kernel32/Interop.FindClose.cs → ...rop/Windows/Kernel32/Interop.FindClose.cs b/...rop/Windows/Kernel32/Interop.FindClose.cs → ...rop/Windows/Kernel32/Interop.FindClose.cs
diff --git a/...ndows/Kernel32/Interop.FindFirstFileEx.cs → ...ndows/Kernel32/Interop.FindFirstFileEx.cs b/...ndows/Kernel32/Interop.FindFirstFileEx.cs → ...ndows/Kernel32/Interop.FindFirstFileEx.cs
diff --git a/...dows/Kernel32/Interop.FlushFileBuffers.cs → ...dows/Kernel32/Interop.FlushFileBuffers.cs b/...dows/Kernel32/Interop.FlushFileBuffers.cs → ...dows/Kernel32/Interop.FlushFileBuffers.cs
diff --git a/...Windows/Kernel32/Interop.FormatMessage.cs → ...Windows/Kernel32/Interop.FormatMessage.cs b/...Windows/Kernel32/Interop.FormatMessage.cs → ...Windows/Kernel32/Interop.FormatMessage.cs
diff --git a/...ernel32/Interop.FreeEnvironmentStrings.cs → ...ernel32/Interop.FreeEnvironmentStrings.cs b/...ernel32/Interop.FreeEnvironmentStrings.cs → ...ernel32/Interop.FreeEnvironmentStrings.cs
diff --git a/...ernel32/Interop.GET_FILEEX_INFO_LEVELS.cs → ...ernel32/Interop.GET_FILEEX_INFO_LEVELS.cs b/...ernel32/Interop.GET_FILEEX_INFO_LEVELS.cs → ...ernel32/Interop.GET_FILEEX_INFO_LEVELS.cs
diff --git a/...ows/Kernel32/Interop.GenericOperations.cs → ...ows/Kernel32/Interop.GenericOperations.cs b/...ows/Kernel32/Interop.GenericOperations.cs → ...ows/Kernel32/Interop.GenericOperations.cs
diff --git a/...rop/Windows/Kernel32/Interop.GetCPInfo.cs → ...rop/Windows/Kernel32/Interop.GetCPInfo.cs b/...rop/Windows/Kernel32/Interop.GetCPInfo.cs → ...rop/Windows/Kernel32/Interop.GetCPInfo.cs
diff --git a/...ndows/Kernel32/Interop.GetComputerName.cs → ...ndows/Kernel32/Interop.GetComputerName.cs b/...ndows/Kernel32/Interop.GetComputerName.cs → ...ndows/Kernel32/Interop.GetComputerName.cs
diff --git a/...s/Kernel32/Interop.GetCurrentDirectory.cs → ...s/Kernel32/Interop.GetCurrentDirectory.cs b/...s/Kernel32/Interop.GetCurrentDirectory.cs → ...s/Kernel32/Interop.GetCurrentDirectory.cs
diff --git a/...nel32/Interop.GetCurrentProcess_IntPtr.cs → ...nel32/Interop.GetCurrentProcess_IntPtr.cs b/...nel32/Interop.GetCurrentProcess_IntPtr.cs → ...nel32/Interop.GetCurrentProcess_IntPtr.cs
diff --git a/...ws/Kernel32/Interop.GetCurrentThreadId.cs → ...ws/Kernel32/Interop.GetCurrentThreadId.cs b/...ws/Kernel32/Interop.GetCurrentThreadId.cs → ...ws/Kernel32/Interop.GetCurrentThreadId.cs
diff --git a/...Kernel32/Interop.GetEnvironmentStrings.cs → ...Kernel32/Interop.GetEnvironmentStrings.cs b/...Kernel32/Interop.GetEnvironmentStrings.cs → ...Kernel32/Interop.GetEnvironmentStrings.cs
diff --git a/...ernel32/Interop.GetEnvironmentVariable.cs → ...ernel32/Interop.GetEnvironmentVariable.cs b/...ernel32/Interop.GetEnvironmentVariable.cs → ...ernel32/Interop.GetEnvironmentVariable.cs
diff --git a/...s/Kernel32/Interop.GetFileAttributesEx.cs → ...s/Kernel32/Interop.GetFileAttributesEx.cs b/...s/Kernel32/Interop.GetFileAttributesEx.cs → ...s/Kernel32/Interop.GetFileAttributesEx.cs
diff --git a/...ernel32/Interop.GetFileType_SafeHandle.cs → ...ernel32/Interop.GetFileType_SafeHandle.cs b/...ernel32/Interop.GetFileType_SafeHandle.cs → ...ernel32/Interop.GetFileType_SafeHandle.cs
diff --git a/...dows/Kernel32/Interop.GetFullPathNameW.cs → ...dows/Kernel32/Interop.GetFullPathNameW.cs b/...dows/Kernel32/Interop.GetFullPathNameW.cs → ...dows/Kernel32/Interop.GetFullPathNameW.cs
diff --git a/...dows/Kernel32/Interop.GetLogicalDrives.cs → ...dows/Kernel32/Interop.GetLogicalDrives.cs b/...dows/Kernel32/Interop.GetLogicalDrives.cs → ...dows/Kernel32/Interop.GetLogicalDrives.cs
diff --git a/...dows/Kernel32/Interop.GetLongPathNameW.cs → ...dows/Kernel32/Interop.GetLongPathNameW.cs b/...dows/Kernel32/Interop.GetLongPathNameW.cs → ...dows/Kernel32/Interop.GetLongPathNameW.cs
diff --git a/.../Kernel32/Interop.GetProcessMemoryInfo.cs → .../Kernel32/Interop.GetProcessMemoryInfo.cs b/.../Kernel32/Interop.GetProcessMemoryInfo.cs → .../Kernel32/Interop.GetProcessMemoryInfo.cs
diff --git a/.../Windows/Kernel32/Interop.GetStdHandle.cs → .../Windows/Kernel32/Interop.GetStdHandle.cs b/.../Windows/Kernel32/Interop.GetStdHandle.cs → .../Windows/Kernel32/Interop.GetStdHandle.cs
diff --git a/...s/Kernel32/Interop.GetSystemDirectoryW.cs → ...s/Kernel32/Interop.GetSystemDirectoryW.cs b/...s/Kernel32/Interop.GetSystemDirectoryW.cs → ...s/Kernel32/Interop.GetSystemDirectoryW.cs
diff --git a/...Windows/Kernel32/Interop.GetSystemInfo.cs → ...Windows/Kernel32/Interop.GetSystemInfo.cs b/...Windows/Kernel32/Interop.GetSystemInfo.cs → ...Windows/Kernel32/Interop.GetSystemInfo.cs
diff --git a/...Windows/Kernel32/Interop.GetSystemTime.cs → ...Windows/Kernel32/Interop.GetSystemTime.cs b/...Windows/Kernel32/Interop.GetSystemTime.cs → ...Windows/Kernel32/Interop.GetSystemTime.cs
diff --git a/...rnel32/Interop.GetSystemTimeAsFileTime.cs → ...rnel32/Interop.GetSystemTimeAsFileTime.cs b/...rnel32/Interop.GetSystemTimeAsFileTime.cs → ...rnel32/Interop.GetSystemTimeAsFileTime.cs
diff --git a/...Interop.GetSystemTimePreciseAsFileTime.cs → ...Interop.GetSystemTimePreciseAsFileTime.cs b/...Interop.GetSystemTimePreciseAsFileTime.cs → ...Interop.GetSystemTimePreciseAsFileTime.cs
diff --git a/...indows/Kernel32/Interop.GetSystemTimes.cs → ...indows/Kernel32/Interop.GetSystemTimes.cs b/...indows/Kernel32/Interop.GetSystemTimes.cs → ...indows/Kernel32/Interop.GetSystemTimes.cs
diff --git a/...dows/Kernel32/Interop.GetTempFileNameW.cs → ...dows/Kernel32/Interop.GetTempFileNameW.cs b/...dows/Kernel32/Interop.GetTempFileNameW.cs → ...dows/Kernel32/Interop.GetTempFileNameW.cs
diff --git a/.../Windows/Kernel32/Interop.GetTempPathW.cs → .../Windows/Kernel32/Interop.GetTempPathW.cs b/.../Windows/Kernel32/Interop.GetTempPathW.cs → .../Windows/Kernel32/Interop.GetTempPathW.cs
diff --git a/...Windows/Kernel32/Interop.GetVersionExW.cs → ...Windows/Kernel32/Interop.GetVersionExW.cs b/...Windows/Kernel32/Interop.GetVersionExW.cs → ...Windows/Kernel32/Interop.GetVersionExW.cs
diff --git a/...Windows/Kernel32/Interop.Globalization.cs → ...Windows/Kernel32/Interop.Globalization.cs b/...Windows/Kernel32/Interop.Globalization.cs → ...Windows/Kernel32/Interop.Globalization.cs
diff --git a/...p/Windows/Kernel32/Interop.HandleTypes.cs → ...p/Windows/Kernel32/Interop.HandleTypes.cs b/...p/Windows/Kernel32/Interop.HandleTypes.cs → ...p/Windows/Kernel32/Interop.HandleTypes.cs
diff --git a/...Kernel32/Interop.IsWow64Process_IntPtr.cs → ...Kernel32/Interop.IsWow64Process_IntPtr.cs b/...Kernel32/Interop.IsWow64Process_IntPtr.cs → ...Kernel32/Interop.IsWow64Process_IntPtr.cs
diff --git a/...erop/Windows/Kernel32/Interop.LockFile.cs → ...erop/Windows/Kernel32/Interop.LockFile.cs b/...erop/Windows/Kernel32/Interop.LockFile.cs → ...erop/Windows/Kernel32/Interop.LockFile.cs
diff --git a/...erop/Windows/Kernel32/Interop.MAX_PATH.cs → ...erop/Windows/Kernel32/Interop.MAX_PATH.cs b/...erop/Windows/Kernel32/Interop.MAX_PATH.cs → ...erop/Windows/Kernel32/Interop.MAX_PATH.cs
diff --git a/...indows/Kernel32/Interop.MEMORYSTATUSEX.cs → ...indows/Kernel32/Interop.MEMORYSTATUSEX.cs b/...indows/Kernel32/Interop.MEMORYSTATUSEX.cs → ...indows/Kernel32/Interop.MEMORYSTATUSEX.cs
diff --git a/...nel32/Interop.MEMORY_BASIC_INFORMATION.cs → ...nel32/Interop.MEMORY_BASIC_INFORMATION.cs b/...nel32/Interop.MEMORY_BASIC_INFORMATION.cs → ...nel32/Interop.MEMORY_BASIC_INFORMATION.cs
diff --git a/...c/Interop/Windows/Kernel32/Interop.MUI.cs → ...c/Interop/Windows/Kernel32/Interop.MUI.cs b/...c/Interop/Windows/Kernel32/Interop.MUI.cs → ...c/Interop/Windows/Kernel32/Interop.MUI.cs
diff --git a/...s/Kernel32/Interop.MultiByteToWideChar.cs → ...s/Kernel32/Interop.MultiByteToWideChar.cs b/...s/Kernel32/Interop.MultiByteToWideChar.cs → ...s/Kernel32/Interop.MultiByteToWideChar.cs
diff --git a/...Interop/Windows/Kernel32/Interop.Mutex.cs → ...Interop/Windows/Kernel32/Interop.Mutex.cs b/...Interop/Windows/Kernel32/Interop.Mutex.cs → ...Interop/Windows/Kernel32/Interop.Mutex.cs
diff --git a/...ndows/Kernel32/Interop.OSVERSIONINFOEX.cs → ...ndows/Kernel32/Interop.OSVERSIONINFOEX.cs b/...ndows/Kernel32/Interop.OSVERSIONINFOEX.cs → ...ndows/Kernel32/Interop.OSVERSIONINFOEX.cs
diff --git a/...ows/Kernel32/Interop.OutputDebugString.cs → ...ows/Kernel32/Interop.OutputDebugString.cs b/...ows/Kernel32/Interop.OutputDebugString.cs → ...ows/Kernel32/Interop.OutputDebugString.cs
diff --git a/...rnel32/Interop.QueryPerformanceCounter.cs → ...rnel32/Interop.QueryPerformanceCounter.cs b/...rnel32/Interop.QueryPerformanceCounter.cs → ...rnel32/Interop.QueryPerformanceCounter.cs
diff --git a/...el32/Interop.QueryPerformanceFrequency.cs → ...el32/Interop.QueryPerformanceFrequency.cs b/...el32/Interop.QueryPerformanceFrequency.cs → ...el32/Interop.QueryPerformanceFrequency.cs
diff --git a/...l32/Interop.QueryUnbiasedInterruptTime.cs → ...l32/Interop.QueryUnbiasedInterruptTime.cs b/...l32/Interop.QueryUnbiasedInterruptTime.cs → ...l32/Interop.QueryUnbiasedInterruptTime.cs
diff --git a/...l32/Interop.ReadFile_SafeHandle_IntPtr.cs → ...l32/Interop.ReadFile_SafeHandle_IntPtr.cs b/...l32/Interop.ReadFile_SafeHandle_IntPtr.cs → ...l32/Interop.ReadFile_SafeHandle_IntPtr.cs
diff --git a/...p.ReadFile_SafeHandle_NativeOverlapped.cs → ...p.ReadFile_SafeHandle_NativeOverlapped.cs b/...p.ReadFile_SafeHandle_NativeOverlapped.cs → ...p.ReadFile_SafeHandle_NativeOverlapped.cs
diff --git a/...ows/Kernel32/Interop.ResolveLocaleName.cs → ...ows/Kernel32/Interop.ResolveLocaleName.cs b/...ows/Kernel32/Interop.ResolveLocaleName.cs → ...ows/Kernel32/Interop.ResolveLocaleName.cs
diff --git a/...s/Kernel32/Interop.SECURITY_ATTRIBUTES.cs → ...s/Kernel32/Interop.SECURITY_ATTRIBUTES.cs b/...s/Kernel32/Interop.SECURITY_ATTRIBUTES.cs → ...s/Kernel32/Interop.SECURITY_ATTRIBUTES.cs
diff --git a/...p/Windows/Kernel32/Interop.SYSTEM_INFO.cs → ...p/Windows/Kernel32/Interop.SYSTEM_INFO.cs b/...p/Windows/Kernel32/Interop.SYSTEM_INFO.cs → ...p/Windows/Kernel32/Interop.SYSTEM_INFO.cs
diff --git a/...ndows/Kernel32/Interop.SecurityOptions.cs → ...ndows/Kernel32/Interop.SecurityOptions.cs b/...ndows/Kernel32/Interop.SecurityOptions.cs → ...ndows/Kernel32/Interop.SecurityOptions.cs
diff --git a/...rop/Windows/Kernel32/Interop.Semaphore.cs → ...rop/Windows/Kernel32/Interop.Semaphore.cs b/...rop/Windows/Kernel32/Interop.Semaphore.cs → ...rop/Windows/Kernel32/Interop.Semaphore.cs
diff --git a/...s/Kernel32/Interop.SetCurrentDirectory.cs → ...s/Kernel32/Interop.SetCurrentDirectory.cs b/...s/Kernel32/Interop.SetCurrentDirectory.cs → ...s/Kernel32/Interop.SetCurrentDirectory.cs
diff --git a/.../Windows/Kernel32/Interop.SetEndOfFile.cs → .../Windows/Kernel32/Interop.SetEndOfFile.cs b/.../Windows/Kernel32/Interop.SetEndOfFile.cs → .../Windows/Kernel32/Interop.SetEndOfFile.cs
diff --git a/...ernel32/Interop.SetEnvironmentVariable.cs → ...ernel32/Interop.SetEnvironmentVariable.cs b/...ernel32/Interop.SetEnvironmentVariable.cs → ...ernel32/Interop.SetEnvironmentVariable.cs
diff --git a/...dows/Kernel32/Interop.SetFilePointerEx.cs → ...dows/Kernel32/Interop.SetFilePointerEx.cs b/...dows/Kernel32/Interop.SetFilePointerEx.cs → ...dows/Kernel32/Interop.SetFilePointerEx.cs
diff --git a/...ws/Kernel32/Interop.SetThreadErrorMode.cs → ...ws/Kernel32/Interop.SetThreadErrorMode.cs b/...ws/Kernel32/Interop.SetThreadErrorMode.cs → ...ws/Kernel32/Interop.SetThreadErrorMode.cs
diff --git a/.../Kernel32/Interop.SystemTimeToFileTime.cs → .../Kernel32/Interop.SystemTimeToFileTime.cs b/.../Kernel32/Interop.SystemTimeToFileTime.cs → .../Kernel32/Interop.SystemTimeToFileTime.cs
diff --git a/...ows/Kernel32/Interop.TimeZone.Registry.cs → ...ows/Kernel32/Interop.TimeZone.Registry.cs b/...ows/Kernel32/Interop.TimeZone.Registry.cs → ...ows/Kernel32/Interop.TimeZone.Registry.cs
diff --git a/...erop/Windows/Kernel32/Interop.TimeZone.cs → ...erop/Windows/Kernel32/Interop.TimeZone.cs b/...erop/Windows/Kernel32/Interop.TimeZone.cs → ...erop/Windows/Kernel32/Interop.TimeZone.cs
diff --git a/...nterop.TzSpecificLocalTimeToSystemTime.cs → ...nterop.TzSpecificLocalTimeToSystemTime.cs b/...nterop.TzSpecificLocalTimeToSystemTime.cs → ...nterop.TzSpecificLocalTimeToSystemTime.cs
diff --git a/...s/Kernel32/Interop.VerSetConditionMask.cs → ...s/Kernel32/Interop.VerSetConditionMask.cs b/...s/Kernel32/Interop.VerSetConditionMask.cs → ...s/Kernel32/Interop.VerSetConditionMask.cs
diff --git a/...dows/Kernel32/Interop.VerifyVersionExW.cs → ...dows/Kernel32/Interop.VerifyVersionExW.cs b/...dows/Kernel32/Interop.VerifyVersionExW.cs → ...dows/Kernel32/Interop.VerifyVersionExW.cs
diff --git a/...p/Windows/Kernel32/Interop.VirtualFree.cs → ...p/Windows/Kernel32/Interop.VirtualFree.cs b/...p/Windows/Kernel32/Interop.VirtualFree.cs → ...p/Windows/Kernel32/Interop.VirtualFree.cs
diff --git a/...el32/Interop.WIN32_FILE_ATTRIBUTE_DATA.cs → ...el32/Interop.WIN32_FILE_ATTRIBUTE_DATA.cs b/...el32/Interop.WIN32_FILE_ATTRIBUTE_DATA.cs → ...el32/Interop.WIN32_FILE_ATTRIBUTE_DATA.cs
diff --git a/...ndows/Kernel32/Interop.WIN32_FIND_DATA.cs → ...ndows/Kernel32/Interop.WIN32_FIND_DATA.cs b/...ndows/Kernel32/Interop.WIN32_FIND_DATA.cs → ...ndows/Kernel32/Interop.WIN32_FIND_DATA.cs
diff --git a/...s/Kernel32/Interop.WideCharToMultiByte.cs → ...s/Kernel32/Interop.WideCharToMultiByte.cs b/...s/Kernel32/Interop.WideCharToMultiByte.cs → ...s/Kernel32/Interop.WideCharToMultiByte.cs
diff --git a/...32/Interop.WriteFile_SafeHandle_IntPtr.cs → ...32/Interop.WriteFile_SafeHandle_IntPtr.cs b/...32/Interop.WriteFile_SafeHandle_IntPtr.cs → ...32/Interop.WriteFile_SafeHandle_IntPtr.cs
diff --git a/....WriteFile_SafeHandle_NativeOverlapped.cs → ....WriteFile_SafeHandle_NativeOverlapped.cs b/....WriteFile_SafeHandle_NativeOverlapped.cs → ....WriteFile_SafeHandle_NativeOverlapped.cs
diff --git a/.../Interop/Windows/Normaliz/Interop.Idna.cs → .../Interop/Windows/Normaliz/Interop.Idna.cs b/.../Interop/Windows/Normaliz/Interop.Idna.cs → .../Interop/Windows/Normaliz/Interop.Idna.cs
diff --git a/...Windows/Normaliz/Interop.Normalization.cs → ...Windows/Normaliz/Interop.Normalization.cs b/...Windows/Normaliz/Interop.Normalization.cs → ...Windows/Normaliz/Interop.Normalization.cs
diff --git a/...s/NtDll/Interop.NtQueryInformationFile.cs → ...s/NtDll/Interop.NtQueryInformationFile.cs b/...s/NtDll/Interop.NtQueryInformationFile.cs → ...s/NtDll/Interop.NtQueryInformationFile.cs
diff --git a/...rop/Windows/Ole32/Interop.CoCreateGuid.cs → ...rop/Windows/Ole32/Interop.CoCreateGuid.cs b/...rop/Windows/Ole32/Interop.CoCreateGuid.cs → ...rop/Windows/Ole32/Interop.CoCreateGuid.cs
diff --git a/...p/Windows/Ole32/Interop.CoTaskMemAlloc.cs → ...p/Windows/Ole32/Interop.CoTaskMemAlloc.cs b/...p/Windows/Ole32/Interop.CoTaskMemAlloc.cs → ...p/Windows/Ole32/Interop.CoTaskMemAlloc.cs
diff --git a/...OleAut32/Interop.SysAllocStringByteLen.cs → ...OleAut32/Interop.SysAllocStringByteLen.cs b/...OleAut32/Interop.SysAllocStringByteLen.cs → ...OleAut32/Interop.SysAllocStringByteLen.cs
diff --git a/...ows/OleAut32/Interop.SysAllocStringLen.cs → ...ows/OleAut32/Interop.SysAllocStringLen.cs b/...ows/OleAut32/Interop.SysAllocStringLen.cs → ...ows/OleAut32/Interop.SysAllocStringLen.cs
diff --git a/...Windows/OleAut32/Interop.SysFreeString.cs → ...Windows/OleAut32/Interop.SysFreeString.cs b/...Windows/OleAut32/Interop.SysFreeString.cs → ...Windows/OleAut32/Interop.SysFreeString.cs
diff --git a/...Windows/Secur32/Interop.GetUserNameExW.cs → ...Windows/Secur32/Interop.GetUserNameExW.cs b/...Windows/Secur32/Interop.GetUserNameExW.cs → ...Windows/Secur32/Interop.GetUserNameExW.cs
diff --git a/...s/Shell32/Interop.SHGetKnownFolderPath.cs → ...s/Shell32/Interop.SHGetKnownFolderPath.cs b/...s/Shell32/Interop.SHGetKnownFolderPath.cs → ...s/Shell32/Interop.SHGetKnownFolderPath.cs
diff --git a/...erop/Windows/User32/Interop.LoadString.cs → ...erop/Windows/User32/Interop.LoadString.cs b/...erop/Windows/User32/Interop.LoadString.cs → ...erop/Windows/User32/Interop.LoadString.cs
diff --git a/src/libraries/Common/src/System/HResults.cs b/src/libraries/Common/src/System/HResults.cs
@@ -138,6 +138,7 @@ internal static class HResults
         internal const int CTL_E_PERMISSIONDENIED = unchecked((int)0x800A0046);
         internal const int E_ELEMENTNOTAVAILABLE = unchecked((int)0x802B001F);
         internal const int E_ELEMENTNOTENABLED = unchecked((int)0x802B001E);
+        internal const int E_FILENOTFOUND = unchecked((int)0x80070002);
         internal const int E_FAIL = unchecked((int)0x80004005);
         internal const int E_HANDLE = unchecked((int)0x80070006);
         internal const int E_ILLEGAL_DELEGATE_ASSIGNMENT = unchecked((int)0x80000018);

diff --git a/src/libraries/Common/tests/Common.Tests.csproj b/src/libraries/Common/tests/Common.Tests.csproj
@@ -154,7 +154,7 @@
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
     <Compile Include="Tests\System\IO\PathInternal.Windows.Tests.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
+    <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
       <Link>Common\Interop\Windows\kernel32\Interop.FormatMessage.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
@@ -173,7 +173,7 @@
     <Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.Unix.cs">
       <Link>System\IO\PathInternal.Unix.cs</Link>
     </Compile>
-    <Compile Include="$(CoreLibSharedDir)Interop\Unix\System.Native\Interop.PathConf.cs">
+    <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.PathConf.cs">
       <Link>Common\Interop\Unix\Interop.PathConf.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">

diff --git a/src/libraries/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj b/src/libraries/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
   <!-- Windows imports -->
   <ItemGroup>
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs">
+    <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs">
       <Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NtDll\Interop.RTL_OSVERSIONINFOEX.cs">
@@ -47,8 +47,8 @@
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
-      <Link>Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
+    <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
+      <Link>Common\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>
@@ -59,16 +59,16 @@
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.TOKEN_ELEVATION.cs">
       <Link>Common\Interop\Windows\Advapi32\Interop.TOKEN_ELEVATION.cs</Link>
     </Compile>
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Interop.BOOL.cs">
-      <Link>Interop\Windows\Interop.BOOL.cs</Link>
+    <Compile Include="$(CommonPath)Interop\Windows\Interop.BOOL.cs">
+      <Link>Common\Interop\Windows\Interop.BOOL.cs</Link>
     </Compile>
   </ItemGroup>
   <!-- Unix imports -->
   <ItemGroup>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs">
       <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs</Link>
     </Compile>
-    <Compile Include="$(CoreLibSharedDir)Interop\Unix\System.Native\Interop.GetEUid.cs">
+    <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetEUid.cs">
       <Link>Common\Interop\Unix\Interop.GetEUid.cs</Link>
     </Compile>
   </ItemGroup>
@@ -78,4 +78,4 @@
     <PackageReference Include="xunit.assert" Version="$(XUnitVersion)" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsVersion)" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/...cs.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj b/...cs.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj
@@ -12,18 +12,18 @@
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <ItemGroup>
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Interop.Errors.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Interop.Libraries.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.ActivityControl.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EtwEnableCallback.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EVENT_INFO_CLASS.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EventActivityIdControl.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EventRegister.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EventSetInformation.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EventTraceGuidsEx.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EventUnregister.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EventWriteString.cs" />
-    <Compile Include="$(CoreLibSharedDir)Interop\Windows\Advapi32\Interop.EventWriteTransfer.cs" />
+    <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs" />
+    <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs" />
+    <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ActivityControl.cs" />
+    <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EtwEnableCallback.cs" />
+    <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EVENT_INFO_CLASS.cs" />
+    <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EventActivityIdControl.cs" />
+    <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EventRegister.cs" />
+    <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EventSetInformation.cs" />
+    <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EventTraceGuidsEx.cs" />
+    <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EventUnregister.cs" />
+    <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EventWriteString.cs" />
+    <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EventWriteTransfer.cs" />
     <Compile Include="$(CoreLibSharedDir)System\Diagnostics\Tracing\*.cs" />
     <Compile Remove="$(CoreLibSharedDir)System\Diagnostics\Tracing\FrameworkEventSource.cs" />
     <Compile Include="$(CoreLibSharedDir)System\Diagnostics\Tracing\TraceLogging\*.cs" />