From 5b14fe355c939b1516c4b95f2f7235da0c3d8d7c Mon Sep 17 00:00:00 2001
From: Alex Perovich <alperovi@microsoft.com>
Date: Tue, 28 Feb 2017 14:37:49 -0800
Subject: [PATCH] Add more shared sources

Commit migrated from https://github.com/dotnet/coreclr/commit/856f5f5e69f1e3b7bbffb552fc6acb76adfc33b8
---
 src/coreclr/src/mscorlib/System.Private.CoreLib.csproj             | 7 -------
 .../src/mscorlib/shared/System.Private.CoreLib.Shared.sources      | 3 +++
 .../System/Runtime/InteropServices/StringBuffer.cs                 | 0
 .../{corefx => shared}/System/Security/CryptographicException.cs   | 0
 .../System/Threading/DeferredDisposableLifetime.cs                 | 0
 5 files changed, 3 insertions(+), 7 deletions(-)
 rename src/coreclr/src/mscorlib/{corefx => shared}/System/Runtime/InteropServices/StringBuffer.cs (100%)
 rename src/coreclr/src/mscorlib/{corefx => shared}/System/Security/CryptographicException.cs (100%)
 rename src/coreclr/src/mscorlib/{corefx => shared}/System/Threading/DeferredDisposableLifetime.cs (100%)

diff --git a/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj b/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
index b1086fc..60103f7 100644
--- a/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
@@ -235,9 +235,6 @@
     <MscorlibSources Condition="'$(FeatureCominterop)' == 'true'" Include="$(BclSourcesRoot)\System\Runtime\InteropServices\DispatchWrapper.cs" />
     <MscorlibSources Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ICustomFactory.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <MscorlibSources Include="$(CoreFxSourcesRoot)\System\Runtime\InteropServices\StringBuffer.cs" />
-  </ItemGroup>
   <ItemGroup Condition="'$(FeatureClassicCominterop)' == 'true'">
     <MscorlibSources Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ITypeLibConverter.cs" />
   </ItemGroup>
@@ -832,7 +829,6 @@
     <MscorlibSources Condition="'$(FeatureCominterop)' == 'true'" Include="$(BclSourcesRoot)\System\Threading\Tasks\IAsyncCausalityTracerStatics.cs" />
   </ItemGroup>
   <ItemGroup>
-    <MscorlibSources Include="$(CoreFxSourcesRoot)\System\Threading\DeferredDisposableLifetime.cs" />
     <MscorlibSources Include="$(CoreFxSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.cs" />
     <MscorlibSources Include="$(CoreFxSourcesRoot)\System\Threading\ClrThreadPoolBoundHandleOverlapped.cs" />
     <MscorlibSources Include="$(CoreFxSourcesRoot)\System\Threading\ClrThreadPoolPreAllocatedOverlapped.cs" />
@@ -1074,9 +1070,6 @@
   <ItemGroup>
     <MscorlibSources Include="$(BclSourcesRoot)\System\Numerics\Hashing\HashHelpers.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <MscorlibSources Include="$(CoreFxSourcesRoot)\System\Security\CryptographicException.cs" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnix)' != 'true'">
     <MscorlibSources Include="$(CoreFxSourcesRoot)\System\HResults.cs" />
     <MscorlibSources Include="$(CoreFxSourcesRoot)\Interop\Windows\kernel32\Interop.CreateFile.cs" />
diff --git a/src/coreclr/src/mscorlib/shared/System.Private.CoreLib.Shared.sources b/src/coreclr/src/mscorlib/shared/System.Private.CoreLib.Shared.sources
index c6fdba9..8c6cfb4 100644
--- a/src/coreclr/src/mscorlib/shared/System.Private.CoreLib.Shared.sources
+++ b/src/coreclr/src/mscorlib/shared/System.Private.CoreLib.Shared.sources
@@ -68,6 +68,9 @@
     <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\Runtime\InteropServices\StringBuffer.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)\System\Security\CryptographicException.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)\System\Threading\DeferredDisposableLifetime.cs"/>
   </ItemGroup>
   <ItemGroup Condition="$(TargetsWindows)">
     <Compile Include="$(MSBuildThisFileDirectory)\System\IO\FileStream.Win32.cs"/>
diff --git a/src/coreclr/src/mscorlib/corefx/System/Runtime/InteropServices/StringBuffer.cs b/src/coreclr/src/mscorlib/shared/System/Runtime/InteropServices/StringBuffer.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/corefx/System/Runtime/InteropServices/StringBuffer.cs
rename to src/coreclr/src/mscorlib/shared/System/Runtime/InteropServices/StringBuffer.cs
diff --git a/src/coreclr/src/mscorlib/corefx/System/Security/CryptographicException.cs b/src/coreclr/src/mscorlib/shared/System/Security/CryptographicException.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/corefx/System/Security/CryptographicException.cs
rename to src/coreclr/src/mscorlib/shared/System/Security/CryptographicException.cs
diff --git a/src/coreclr/src/mscorlib/corefx/System/Threading/DeferredDisposableLifetime.cs b/src/coreclr/src/mscorlib/shared/System/Threading/DeferredDisposableLifetime.cs
similarity index 100%
rename from src/coreclr/src/mscorlib/corefx/System/Threading/DeferredDisposableLifetime.cs
rename to src/coreclr/src/mscorlib/shared/System/Threading/DeferredDisposableLifetime.cs
-- 
2.7.4