Move identical Interop files to shared partition

Commit migrated from https://github.com/dotnet/coreclr/commit/b9e6c160ffadc294367bf0f3f93cc301d3a7ecf6

diff --git a/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj b/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
index a2f3452..2434661 100644 (file)
--- a/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
@@ -579,20 +579,12 @@
     <Compile Include="$(BclSourcesRoot)\System\Globalization\JapaneseCalendar.Win32.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\TextInfo.Windows.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(FeatureCoreFxGlobalization)' == 'true' and '$(TargetsUnix)' == 'true'">
+  <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
     <Compile Include="$(BclSourcesRoot)\System\Globalization\EncodingTable.Unix.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\EncodingDataItem.Unix.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Text\Normalization.Unix.cs" />
-    <Compile Include="$(BclSourcesRoot)\Interop\Unix\System.Globalization.Native\Interop.Calendar.cs" />
-    <Compile Include="$(BclSourcesRoot)\Interop\Unix\System.Globalization.Native\Interop.Casing.cs" />
     <Compile Include="$(BclSourcesRoot)\Interop\Unix\System.Globalization.Native\Interop.Collation.cs" />
     <Compile Include="$(BclSourcesRoot)\Interop\Unix\System.Globalization.Native\Interop.ICU.cs" />
-    <Compile Include="$(BclSourcesRoot)\Interop\Unix\System.Globalization.Native\Interop.Idna.cs" />
-    <Compile Include="$(BclSourcesRoot)\Interop\Unix\System.Globalization.Native\Interop.Locale.cs" />
-    <Compile Include="$(BclSourcesRoot)\Interop\Unix\System.Globalization.Native\Interop.Normalization.cs" />
-    <Compile Include="$(BclSourcesRoot)\Interop\Unix\System.Globalization.Native\Interop.ResultCode.cs" />
-    <Compile Include="$(BclSourcesRoot)\Interop\Unix\System.Globalization.Native\Interop.TimeZoneInfo.cs" />
-    <Compile Include="$(BclSourcesRoot)\Interop\Unix\System.Globalization.Native\Interop.Utils.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\HijriCalendar.Unix.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\IdnMapping.Unix.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\JapaneseCalendar.Unix.cs" />
@@ -903,9 +895,7 @@
     <Compile Include="$(BclSourcesRoot)\System\Security\SafeBSTRHandle.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Security\SecureString.Windows.cs" />
     <!-- Interop sources -->
-    <Compile Include="$(BclSourcesRoot)\Interop\Windows\Crypt32\Interop.CryptProtectMemory.cs" />
     <Compile Include="$(BclSourcesRoot)\Interop\Windows\NtDll\Interop.ZeroMemory.cs" />
-    <Compile Include="$(BclSourcesRoot)\Interop\Windows\kernel32\Interop.WideCharToMultiByte.cs" />
     <Compile Include="$(BclSourcesRoot)\Interop\Windows\oleaut32\Interop.SysAllocStringLen.cs" />
     <Compile Include="$(BclSourcesRoot)\Interop\Windows\oleaut32\Interop.SysStringLen.cs" />
   </ItemGroup>

diff --git a/src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.Calendar.cs b/src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.Calendar.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.Calendar.cs
rename to src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.Calendar.cs

diff --git a/src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.Casing.cs b/src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.Casing.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.Casing.cs
rename to src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.Casing.cs

diff --git a/src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.Idna.cs b/src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.Idna.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.Idna.cs
rename to src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.Idna.cs

diff --git a/src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.Locale.cs b/src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.Locale.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.Locale.cs
rename to src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.Locale.cs

diff --git a/src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.Normalization.cs b/src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.Normalization.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.Normalization.cs
rename to src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.Normalization.cs

diff --git a/src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.ResultCode.cs b/src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.ResultCode.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.ResultCode.cs
rename to src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.ResultCode.cs

diff --git a/src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.TimeZoneInfo.cs b/src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.TimeZoneInfo.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.TimeZoneInfo.cs
rename to src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.TimeZoneInfo.cs

diff --git a/src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.Utils.cs b/src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.Utils.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.Utils.cs
rename to src/coreclr/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.Utils.cs

diff --git a/src/coreclr/src/mscorlib/src/Interop/Windows/Crypt32/Interop.CryptProtectMemory.cs b/src/coreclr/src/mscorlib/shared/Interop/Windows/Crypt32/Interop.CryptProtectMemory.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/Interop/Windows/Crypt32/Interop.CryptProtectMemory.cs
rename to src/coreclr/src/mscorlib/shared/Interop/Windows/Crypt32/Interop.CryptProtectMemory.cs

diff --git a/src/coreclr/src/mscorlib/src/Interop/Windows/kernel32/Interop.WideCharToMultiByte.cs b/src/coreclr/src/mscorlib/shared/Interop/Windows/Kernel32/Interop.WideCharToMultiByte.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/Interop/Windows/kernel32/Interop.WideCharToMultiByte.cs
rename to src/coreclr/src/mscorlib/shared/Interop/Windows/Kernel32/Interop.WideCharToMultiByte.cs

diff --git a/src/coreclr/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems b/src/coreclr/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems
index b24eda3..ca00cb8 100644 (file)
--- a/src/coreclr/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems
+++ b/src/coreclr/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems
@@ -15,6 +15,7 @@
   </PropertyGroup>
   <ItemGroup Condition="$(TargetsWindows)">
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Crypt32\Interop.CryptProtectMemory.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Interop.BOOL.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Interop.Errors.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Interop.Libraries.cs"/>
@@ -40,6 +41,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Kernel32\Interop.SetEndOfFile.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Kernel32\Interop.SetErrorMode.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Kernel32\Interop.SetFilePointerEx.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_IntPtr.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_NativeOverlapped.cs"/>
   </ItemGroup>
@@ -47,6 +49,14 @@
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\Interop.Errors.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\Interop.IOErrors.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\Interop.Libraries.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Globalization.Native\Interop.Calendar.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Globalization.Native\Interop.Casing.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Globalization.Native\Interop.Idna.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Globalization.Native\Interop.Locale.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Globalization.Native\Interop.Normalization.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Globalization.Native\Interop.ResultCode.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Globalization.Native\Interop.TimeZoneInfo.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Globalization.Native\Interop.Utils.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'"/>
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Native\Interop.Close.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Native\Interop.FLock.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Native\Interop.FSync.cs"/>