From 65c3ded554fe535662de40d824212df32a386174 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Sat, 1 Apr 2017 11:40:23 -0700
Subject: [PATCH] Move identical files to shared partition

Commit migrated from https://github.com/dotnet/coreclr/commit/f8db01c0e175550cb696ea6ec608e662f1e3d286
---
 src/coreclr/src/mscorlib/System.Private.CoreLib.csproj       | 10 ----------
 .../mscorlib/shared/System.Private.CoreLib.Shared.projitems  | 12 +++++++++---
 .../System/IO/StreamHelpers.CopyValidation.cs                |  0
 .../{src => shared}/System/Security/SecureString.Unix.cs     |  0
 .../mscorlib/{src => shared}/System/Security/SecureString.cs |  0
 .../System/Threading/Tasks/TaskCanceledException.cs          |  0
 .../{src => shared}/System/Threading/Tasks/TaskExtensions.cs |  0
 .../System/Threading/Tasks/TaskSchedulerException.cs         |  0
 8 files changed, 9 insertions(+), 13 deletions(-)
 rename src/coreclr/src/mscorlib/{src => shared}/System/IO/StreamHelpers.CopyValidation.cs (100%)
 rename src/coreclr/src/mscorlib/{src => shared}/System/Security/SecureString.Unix.cs (100%)
 rename src/coreclr/src/mscorlib/{src => shared}/System/Security/SecureString.cs (100%)
 rename src/coreclr/src/mscorlib/{src => shared}/System/Threading/Tasks/TaskCanceledException.cs (100%)
 rename src/coreclr/src/mscorlib/{src => shared}/System/Threading/Tasks/TaskExtensions.cs (100%)
 rename src/coreclr/src/mscorlib/{src => shared}/System/Threading/Tasks/TaskSchedulerException.cs (100%)

diff --git a/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj b/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
index 2434661..39695c5 100644
--- a/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
@@ -636,9 +636,6 @@
     <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\FutureFactory.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\Task.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\TaskContinuation.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\TaskCanceledException.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\TaskExtensions.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\TaskSchedulerException.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\TaskExceptionHolder.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\TaskFactory.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\TaskScheduler.cs" />
@@ -682,7 +679,6 @@
     <Compile Include="$(BclSourcesRoot)\System\IO\PinnedBufferMemoryStream.cs" />
     <Compile Include="$(BclSourcesRoot)\System\IO\SeekOrigin.cs" />
     <Compile Include="$(BclSourcesRoot)\System\IO\Stream.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\IO\StreamHelpers.CopyValidation.cs" />
     <Compile Include="$(BclSourcesRoot)\System\IO\TextReader.cs" Condition="'$(TargetsUnix)' == 'true'" />
     <Compile Include="$(BclSourcesRoot)\System\IO\StreamReader.cs" Condition="'$(TargetsUnix)' == 'true'" />
     <Compile Include="$(BclSourcesRoot)\System\IO\UnmanagedMemoryAccessor.cs" />
@@ -888,9 +884,6 @@
     <Compile Include="$(BclSourcesRoot)\Interop\Windows\Normaliz\Interop.Idna.cs" />
     <Compile Include="$(BclSourcesRoot)\Interop\Windows\Normaliz\Interop.Normalization.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="$(BclSourcesRoot)\System\Security\SecureString.cs" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnix)' != 'true'">
     <Compile Include="$(BclSourcesRoot)\System\Security\SafeBSTRHandle.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Security\SecureString.Windows.cs" />
@@ -900,9 +893,6 @@
     <Compile Include="$(BclSourcesRoot)\Interop\Windows\oleaut32\Interop.SysStringLen.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
-    <Compile Include="$(BclSourcesRoot)\System\Security\SecureString.Unix.cs" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
     <Compile Include="$(BclSourcesRoot)\System\HResults.cs" />
     <Compile Include="$(BclSourcesRoot)\Interop\Unix\System.Native\Interop.GetRandomBytes.cs" />
     <Compile Include="$(BclSourcesRoot)\Interop\Unix\System.Native\Interop.SysLog.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 ca00cb8..3acace8 100644
--- a/src/coreclr/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems
+++ b/src/coreclr/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems
@@ -157,9 +157,10 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\InvalidProgramException.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\InvalidTimeZoneException.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\IO\Error.cs"/>
-    <Compile Include="$(MSBuildThisFileDirectory)System\IO\FileStream.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)System\IO\Path.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)System\IO\PathInternal.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\IO\FileStream.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\IO\Path.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\IO\PathInternal.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\IO\StreamHelpers.CopyValidation.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\IObservable.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\IObserver.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\IProgress.cs"/>
@@ -282,6 +283,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Security\AllowPartiallyTrustedCallersAttribute.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\Security\CryptographicException.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\Security\PartialTrustVisibilityLevel.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Security\SecureString.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\Security\SecurityCriticalAttribute.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\Security\SecurityCriticalScope.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\Security\SecurityException.cs"/>
@@ -302,6 +304,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Text\StringBuilder.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\ThreadAttributes.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\Threading\DeferredDisposableLifetime.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\TaskCanceledException.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\TaskExtensions.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\TaskSchedulerException.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Timeout.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\ThreadStaticAttribute.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\TimeoutException.cs"/>
@@ -337,6 +342,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\IO\FileStream.Unix.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\IO\Path.Unix.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\IO\PathInternal.Unix.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Security\SecureString.Unix.cs"/>
   </ItemGroup>
   <ItemGroup Condition="$(TargetsUnix) and $(TargetsOSX)">
     <Compile Include="$(MSBuildThisFileDirectory)System\IO\FileStream.OSX.cs"/>
diff --git a/src/coreclr/src/mscorlib/src/System/IO/StreamHelpers.CopyValidation.cs b/src/coreclr/src/mscorlib/shared/System/IO/StreamHelpers.CopyValidation.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/System/IO/StreamHelpers.CopyValidation.cs
rename to src/coreclr/src/mscorlib/shared/System/IO/StreamHelpers.CopyValidation.cs
diff --git a/src/coreclr/src/mscorlib/src/System/Security/SecureString.Unix.cs b/src/coreclr/src/mscorlib/shared/System/Security/SecureString.Unix.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/System/Security/SecureString.Unix.cs
rename to src/coreclr/src/mscorlib/shared/System/Security/SecureString.Unix.cs
diff --git a/src/coreclr/src/mscorlib/src/System/Security/SecureString.cs b/src/coreclr/src/mscorlib/shared/System/Security/SecureString.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/System/Security/SecureString.cs
rename to src/coreclr/src/mscorlib/shared/System/Security/SecureString.cs
diff --git a/src/coreclr/src/mscorlib/src/System/Threading/Tasks/TaskCanceledException.cs b/src/coreclr/src/mscorlib/shared/System/Threading/Tasks/TaskCanceledException.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/System/Threading/Tasks/TaskCanceledException.cs
rename to src/coreclr/src/mscorlib/shared/System/Threading/Tasks/TaskCanceledException.cs
diff --git a/src/coreclr/src/mscorlib/src/System/Threading/Tasks/TaskExtensions.cs b/src/coreclr/src/mscorlib/shared/System/Threading/Tasks/TaskExtensions.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/System/Threading/Tasks/TaskExtensions.cs
rename to src/coreclr/src/mscorlib/shared/System/Threading/Tasks/TaskExtensions.cs
diff --git a/src/coreclr/src/mscorlib/src/System/Threading/Tasks/TaskSchedulerException.cs b/src/coreclr/src/mscorlib/shared/System/Threading/Tasks/TaskSchedulerException.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/src/System/Threading/Tasks/TaskSchedulerException.cs
rename to src/coreclr/src/mscorlib/shared/System/Threading/Tasks/TaskSchedulerException.cs
-- 
2.7.4