Moving all of the Compat Assemblies to flat folder (dotnet/corefx#9782)

Moving all of the Compat Assemblies to flat folder

Commit migrated from https://github.com/dotnet/corefx/commit/5eb4d84c51fdf0e90b9d9e143873131a7d51373f

diff --git a/src/libraries/System.ComponentModel.Composition/src/ApiCompatBaseline.txt b/src/libraries/System.ComponentModel.Composition/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System.ComponentModel.Composition/src/ApiCompatBaseline.txt
rename to src/libraries/System.ComponentModel.Composition/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj b/src/libraries/System.ComponentModel.Composition/src/Compat/System.ComponentModel.Composition.csproj
similarity index 82%
rename from src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj
rename to src/libraries/System.ComponentModel.Composition/src/Compat/System.ComponentModel.Composition.csproj
index 03c9b79..89821ba 100644 (file)
--- a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj
+++ b/src/libraries/System.ComponentModel.Composition/src/Compat/System.ComponentModel.Composition.csproj
@@ -9,7 +9,7 @@
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
     <ProjectGuid>{B0535517-3B72-4343-A773-3F3D68592919}</ProjectGuid>
-    <ContractProject>..\ref\Compat\System.ComponentModel.Composition.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.ComponentModel.Composition.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -18,4 +18,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System/src/project.json b/src/libraries/System.ComponentModel.Composition/src/Compat/project.json
similarity index 100%
rename from src/libraries/System/src/project.json
rename to src/libraries/System.ComponentModel.Composition/src/Compat/project.json

diff --git a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.builds b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.builds
index c3a7df5..d5fe11a 100644 (file)
--- a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.builds
+++ b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.ComponentModel.Composition.csproj" />
+    <Project Include="Compat/System.ComponentModel.Composition.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/System.Core/src/ApiCompatBaseline.txt b/src/libraries/System.Core/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System.Core/src/ApiCompatBaseline.txt
rename to src/libraries/System.Core/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System.Core/src/System.Core.csproj b/src/libraries/System.Core/src/Compat/System.Core.csproj
similarity index 83%
rename from src/libraries/System.Core/src/System.Core.csproj
rename to src/libraries/System.Core/src/Compat/System.Core.csproj
index db423d2..273d564 100644 (file)
--- a/src/libraries/System.Core/src/System.Core.csproj
+++ b/src/libraries/System.Core/src/Compat/System.Core.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\System.Core.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.Core.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -17,4 +17,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/System.Xml.Serialization/src/project.json b/src/libraries/System.Core/src/Compat/project.json
similarity index 100%
rename from src/libraries/System.Xml.Serialization/src/project.json
rename to src/libraries/System.Core/src/Compat/project.json

diff --git a/src/libraries/System.Core/src/System.Core.builds b/src/libraries/System.Core/src/System.Core.builds
index 16e2ff8..337583f 100644 (file)
--- a/src/libraries/System.Core/src/System.Core.builds
+++ b/src/libraries/System.Core/src/System.Core.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.Core.csproj" />
+    <Project Include="Compat/System.Core.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/System.Data.Services.Client/src/ApiCompatBaseline.txt b/src/libraries/System.Data.Services.Client/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System.Data.Services.Client/src/ApiCompatBaseline.txt
rename to src/libraries/System.Data.Services.Client/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System.Data.Services.Client/src/System.Data.Services.Client.csproj b/src/libraries/System.Data.Services.Client/src/Compat/System.Data.Services.Client.csproj
similarity index 82%
rename from src/libraries/System.Data.Services.Client/src/System.Data.Services.Client.csproj
rename to src/libraries/System.Data.Services.Client/src/Compat/System.Data.Services.Client.csproj
index 2babdc4..767ca41 100644 (file)
--- a/src/libraries/System.Data.Services.Client/src/System.Data.Services.Client.csproj
+++ b/src/libraries/System.Data.Services.Client/src/Compat/System.Data.Services.Client.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\System.Data.Services.Client.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.Data.Services.Client.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -17,4 +17,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/System.Windows/src/project.json b/src/libraries/System.Data.Services.Client/src/Compat/project.json
similarity index 100%
rename from src/libraries/System.Windows/src/project.json
rename to src/libraries/System.Data.Services.Client/src/Compat/project.json

diff --git a/src/libraries/System.Data.Services.Client/src/System.Data.Services.Client.builds b/src/libraries/System.Data.Services.Client/src/System.Data.Services.Client.builds
index 66c98fb..e1be658 100644 (file)
--- a/src/libraries/System.Data.Services.Client/src/System.Data.Services.Client.builds
+++ b/src/libraries/System.Data.Services.Client/src/System.Data.Services.Client.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.Data.Services.Client.csproj" />
+    <Project Include="Compat/System.Data.Services.Client.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/System.Data/src/ApiCompatBaseline.txt b/src/libraries/System.Data/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System.Data/src/ApiCompatBaseline.txt
rename to src/libraries/System.Data/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System.Data/src/System.Data.csproj b/src/libraries/System.Data/src/Compat/System.Data.csproj
similarity index 83%
rename from src/libraries/System.Data/src/System.Data.csproj
rename to src/libraries/System.Data/src/Compat/System.Data.csproj
index 4dc057b..0f727da 100644 (file)
--- a/src/libraries/System.Data/src/System.Data.csproj
+++ b/src/libraries/System.Data/src/Compat/System.Data.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\System.Data.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.Data.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -17,4 +17,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/System.Web.Services/src/project.json b/src/libraries/System.Data/src/Compat/project.json
similarity index 100%
rename from src/libraries/System.Web.Services/src/project.json
rename to src/libraries/System.Data/src/Compat/project.json

diff --git a/src/libraries/System.Data/src/System.Data.builds b/src/libraries/System.Data/src/System.Data.builds
index df571e6..bab164f 100644 (file)
--- a/src/libraries/System.Data/src/System.Data.builds
+++ b/src/libraries/System.Data/src/System.Data.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.Data.csproj" />
+    <Project Include="Compat/System.Data.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/System.IO.Compression.FileSystem/src/ApiCompatBaseline.txt b/src/libraries/System.EnterpriseServices/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System.IO.Compression.FileSystem/src/ApiCompatBaseline.txt
rename to src/libraries/System.EnterpriseServices/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System.EnterpriseServices/src/System.EnterpriseServices.csproj b/src/libraries/System.EnterpriseServices/src/Compat/System.EnterpriseServices.csproj
similarity index 82%
rename from src/libraries/System.EnterpriseServices/src/System.EnterpriseServices.csproj
rename to src/libraries/System.EnterpriseServices/src/Compat/System.EnterpriseServices.csproj
index 91b7901..7f231d9 100644 (file)
--- a/src/libraries/System.EnterpriseServices/src/System.EnterpriseServices.csproj
+++ b/src/libraries/System.EnterpriseServices/src/Compat/System.EnterpriseServices.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\System.EnterpriseServices.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.EnterpriseServices.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -17,4 +17,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/System.EnterpriseServices/src/project.json b/src/libraries/System.EnterpriseServices/src/Compat/project.json
similarity index 100%
rename from src/libraries/System.EnterpriseServices/src/project.json
rename to src/libraries/System.EnterpriseServices/src/Compat/project.json

diff --git a/src/libraries/System.EnterpriseServices/src/System.EnterpriseServices.builds b/src/libraries/System.EnterpriseServices/src/System.EnterpriseServices.builds
index c09f572..973ea9f 100644 (file)
--- a/src/libraries/System.EnterpriseServices/src/System.EnterpriseServices.builds
+++ b/src/libraries/System.EnterpriseServices/src/System.EnterpriseServices.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.EnterpriseServices.csproj" />
+    <Project Include="Compat/System.EnterpriseServices.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/System.EnterpriseServices/src/ApiCompatBaseline.txt b/src/libraries/System.IO.Compression.FileSystem/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System.EnterpriseServices/src/ApiCompatBaseline.txt
rename to src/libraries/System.IO.Compression.FileSystem/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System.IO.Compression.FileSystem/src/System.IO.Compression.FileSystem.csproj b/src/libraries/System.IO.Compression.FileSystem/src/Compat/System.IO.Compression.FileSystem.csproj
similarity index 82%
rename from src/libraries/System.IO.Compression.FileSystem/src/System.IO.Compression.FileSystem.csproj
rename to src/libraries/System.IO.Compression.FileSystem/src/Compat/System.IO.Compression.FileSystem.csproj
index 36e2fc5..61c9cbf 100644 (file)
--- a/src/libraries/System.IO.Compression.FileSystem/src/System.IO.Compression.FileSystem.csproj
+++ b/src/libraries/System.IO.Compression.FileSystem/src/Compat/System.IO.Compression.FileSystem.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\System.IO.Compression.FileSystem.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.IO.Compression.FileSystem.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -17,4 +17,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/System.Transactions/src/project.json b/src/libraries/System.IO.Compression.FileSystem/src/Compat/project.json
similarity index 100%
rename from src/libraries/System.Transactions/src/project.json
rename to src/libraries/System.IO.Compression.FileSystem/src/Compat/project.json

diff --git a/src/libraries/System.IO.Compression.FileSystem/src/System.IO.Compression.FileSystem.builds b/src/libraries/System.IO.Compression.FileSystem/src/System.IO.Compression.FileSystem.builds
index 8828cd5..3afcd6c 100644 (file)
--- a/src/libraries/System.IO.Compression.FileSystem/src/System.IO.Compression.FileSystem.builds
+++ b/src/libraries/System.IO.Compression.FileSystem/src/System.IO.Compression.FileSystem.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.IO.Compression.FileSystem.csproj" />
+    <Project Include="Compat/System.IO.Compression.FileSystem.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/System.Net.Http.WebRequest/src/ApiCompatBaseline.txt b/src/libraries/System.Net.Http.WebRequest/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System.Net.Http.WebRequest/src/ApiCompatBaseline.txt
rename to src/libraries/System.Net.Http.WebRequest/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System.Net.Http.WebRequest/src/System.Net.Http.WebRequest.csproj b/src/libraries/System.Net.Http.WebRequest/src/Compat/System.Net.Http.WebRequest.csproj
similarity index 82%
rename from src/libraries/System.Net.Http.WebRequest/src/System.Net.Http.WebRequest.csproj
rename to src/libraries/System.Net.Http.WebRequest/src/Compat/System.Net.Http.WebRequest.csproj
index f1ad8dd..1ee3fd1 100644 (file)
--- a/src/libraries/System.Net.Http.WebRequest/src/System.Net.Http.WebRequest.csproj
+++ b/src/libraries/System.Net.Http.WebRequest/src/Compat/System.Net.Http.WebRequest.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\System.Net.Http.WebRequest.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.Net.Http.WebRequest.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -17,4 +17,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/System.Net/src/project.json b/src/libraries/System.Net.Http.WebRequest/src/Compat/project.json
similarity index 100%
rename from src/libraries/System.Net/src/project.json
rename to src/libraries/System.Net.Http.WebRequest/src/Compat/project.json

diff --git a/src/libraries/System.Net.Http.WebRequest/src/System.Net.Http.WebRequest.builds b/src/libraries/System.Net.Http.WebRequest/src/System.Net.Http.WebRequest.builds
index 51b0bd2..1307945 100644 (file)
--- a/src/libraries/System.Net.Http.WebRequest/src/System.Net.Http.WebRequest.builds
+++ b/src/libraries/System.Net.Http.WebRequest/src/System.Net.Http.WebRequest.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.Net.Http.WebRequest.csproj" />
+    <Project Include="Compat/System.Net.Http.WebRequest.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/System.Net/src/ApiCompatBaseline.txt b/src/libraries/System.Net/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System.Net/src/ApiCompatBaseline.txt
rename to src/libraries/System.Net/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System.Net/src/System.Net.csproj b/src/libraries/System.Net/src/Compat/System.Net.csproj
similarity index 83%
rename from src/libraries/System.Net/src/System.Net.csproj
rename to src/libraries/System.Net/src/Compat/System.Net.csproj
index fe8ed8b..47b8ab4 100644 (file)
--- a/src/libraries/System.Net/src/System.Net.csproj
+++ b/src/libraries/System.Net/src/Compat/System.Net.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\System.Net.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.Net.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -17,4 +17,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/System.Net.Http.WebRequest/src/project.json b/src/libraries/System.Net/src/Compat/project.json
similarity index 100%
rename from src/libraries/System.Net.Http.WebRequest/src/project.json
rename to src/libraries/System.Net/src/Compat/project.json

diff --git a/src/libraries/System.Net/src/System.Net.builds b/src/libraries/System.Net/src/System.Net.builds
index 2ba75d1..bb3cbc5 100644 (file)
--- a/src/libraries/System.Net/src/System.Net.builds
+++ b/src/libraries/System.Net/src/System.Net.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.Net.csproj" />
+    <Project Include="Compat/System.Net.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/System.Numerics/src/ApiCompatBaseline.txt b/src/libraries/System.Numerics/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System.Numerics/src/ApiCompatBaseline.txt
rename to src/libraries/System.Numerics/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System.Numerics/src/System.Numerics.csproj b/src/libraries/System.Numerics/src/Compat/System.Numerics.csproj
similarity index 83%
rename from src/libraries/System.Numerics/src/System.Numerics.csproj
rename to src/libraries/System.Numerics/src/Compat/System.Numerics.csproj
index 702f8e1..8abdf92 100644 (file)
--- a/src/libraries/System.Numerics/src/System.Numerics.csproj
+++ b/src/libraries/System.Numerics/src/Compat/System.Numerics.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\System.Numerics.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.Numerics.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -17,4 +17,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/System.Numerics/src/project.json b/src/libraries/System.Numerics/src/Compat/project.json
similarity index 100%
rename from src/libraries/System.Numerics/src/project.json
rename to src/libraries/System.Numerics/src/Compat/project.json

diff --git a/src/libraries/System.Numerics/src/System.Numerics.builds b/src/libraries/System.Numerics/src/System.Numerics.builds
index 7de382c..9b83f97 100644 (file)
--- a/src/libraries/System.Numerics/src/System.Numerics.builds
+++ b/src/libraries/System.Numerics/src/System.Numerics.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.Numerics.csproj" />
+    <Project Include="Compat/System.Numerics.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/System.Runtime.Serialization/src/ApiCompatBaseline.txt b/src/libraries/System.Runtime.Serialization/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System.Runtime.Serialization/src/ApiCompatBaseline.txt
rename to src/libraries/System.Runtime.Serialization/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System.Runtime.Serialization/src/System.Runtime.Serialization.csproj b/src/libraries/System.Runtime.Serialization/src/Compat/System.Runtime.Serialization.csproj
similarity index 82%
rename from src/libraries/System.Runtime.Serialization/src/System.Runtime.Serialization.csproj
rename to src/libraries/System.Runtime.Serialization/src/Compat/System.Runtime.Serialization.csproj
index 241bca1..aa43341 100644 (file)
--- a/src/libraries/System.Runtime.Serialization/src/System.Runtime.Serialization.csproj
+++ b/src/libraries/System.Runtime.Serialization/src/Compat/System.Runtime.Serialization.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\System.Runtime.Serialization.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.Runtime.Serialization.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -17,4 +17,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/System.Runtime.Serialization/src/project.json b/src/libraries/System.Runtime.Serialization/src/Compat/project.json
similarity index 100%
rename from src/libraries/System.Runtime.Serialization/src/project.json
rename to src/libraries/System.Runtime.Serialization/src/Compat/project.json

diff --git a/src/libraries/System.Runtime.Serialization/src/System.Runtime.Serialization.builds b/src/libraries/System.Runtime.Serialization/src/System.Runtime.Serialization.builds
index 15df0fb..da36b25 100644 (file)
--- a/src/libraries/System.Runtime.Serialization/src/System.Runtime.Serialization.builds
+++ b/src/libraries/System.Runtime.Serialization/src/System.Runtime.Serialization.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.Runtime.Serialization.csproj" />
+    <Project Include="Compat/System.Runtime.Serialization.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/System.ServiceModel/src/ApiCompatBaseline.txt b/src/libraries/System.ServiceModel/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System.ServiceModel/src/ApiCompatBaseline.txt
rename to src/libraries/System.ServiceModel/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System.ServiceModel/src/System.ServiceModel.csproj b/src/libraries/System.ServiceModel/src/Compat/System.ServiceModel.csproj
similarity index 82%
rename from src/libraries/System.ServiceModel/src/System.ServiceModel.csproj
rename to src/libraries/System.ServiceModel/src/Compat/System.ServiceModel.csproj
index 4f60f7a..d5a150e 100644 (file)
--- a/src/libraries/System.ServiceModel/src/System.ServiceModel.csproj
+++ b/src/libraries/System.ServiceModel/src/Compat/System.ServiceModel.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\System.ServiceModel.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.ServiceModel.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -17,4 +17,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/System.ServiceModel/src/project.json b/src/libraries/System.ServiceModel/src/Compat/project.json
similarity index 66%
rename from src/libraries/System.ServiceModel/src/project.json
rename to src/libraries/System.ServiceModel/src/Compat/project.json
index 2c469d9..9efe420 100644 (file)
--- a/src/libraries/System.ServiceModel/src/project.json
+++ b/src/libraries/System.ServiceModel/src/Compat/project.json
@@ -5,7 +5,9 @@
     "System.ServiceModel.Http": "4.1.1-beta-24222-03",
     "System.ServiceModel.NetTcp": "    4.1.1-beta-24222-03",
     "System.ServiceModel.Primitives": "4.1.1-beta-24222-03",
-    "System.ServiceModel.Security": "  4.0.2-beta-24222-03"
+    "System.ServiceModel.Security": "  4.0.2-beta-24222-03",
+    "System.Runtime.Serialization.Primitives": "4.1.2-beta-24222-03",
+    "System.Runtime.Serialization.Xml": "4.1.2-beta-24222-03"
   },
   "frameworks": {
     "netstandard1.6": {

diff --git a/src/libraries/System.ServiceModel/src/System.ServiceModel.builds b/src/libraries/System.ServiceModel/src/System.ServiceModel.builds
index 54fe57c..9e5695d 100644 (file)
--- a/src/libraries/System.ServiceModel/src/System.ServiceModel.builds
+++ b/src/libraries/System.ServiceModel/src/System.ServiceModel.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.ServiceModel.csproj" />
+    <Project Include="Compat/System.ServiceModel.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/System.Transactions/src/ApiCompatBaseline.txt b/src/libraries/System.Transactions/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System.Transactions/src/ApiCompatBaseline.txt
rename to src/libraries/System.Transactions/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System.Transactions/src/System.Transactions.csproj b/src/libraries/System.Transactions/src/Compat/System.Transactions.csproj
similarity index 82%
rename from src/libraries/System.Transactions/src/System.Transactions.csproj
rename to src/libraries/System.Transactions/src/Compat/System.Transactions.csproj
index 3d4df8c..87507a5 100644 (file)
--- a/src/libraries/System.Transactions/src/System.Transactions.csproj
+++ b/src/libraries/System.Transactions/src/Compat/System.Transactions.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\System.Transactions.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.Transactions.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -17,4 +17,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/System.IO.Compression.FileSystem/src/project.json b/src/libraries/System.Transactions/src/Compat/project.json
similarity index 100%
rename from src/libraries/System.IO.Compression.FileSystem/src/project.json
rename to src/libraries/System.Transactions/src/Compat/project.json

diff --git a/src/libraries/System.Transactions/src/System.Transactions.builds b/src/libraries/System.Transactions/src/System.Transactions.builds
index dc058b3..490ad7f 100644 (file)
--- a/src/libraries/System.Transactions/src/System.Transactions.builds
+++ b/src/libraries/System.Transactions/src/System.Transactions.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.Transactions.csproj" />
+    <Project Include="Compat/System.Transactions.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/System.Web.Services/src/ApiCompatBaseline.txt b/src/libraries/System.Web.Services/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System.Web.Services/src/ApiCompatBaseline.txt
rename to src/libraries/System.Web.Services/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System.Web.Services/src/System.Web.Services.csproj b/src/libraries/System.Web.Services/src/Compat/System.Web.Services.csproj
similarity index 82%
rename from src/libraries/System.Web.Services/src/System.Web.Services.csproj
rename to src/libraries/System.Web.Services/src/Compat/System.Web.Services.csproj
index e3fa76c..769617d 100644 (file)
--- a/src/libraries/System.Web.Services/src/System.Web.Services.csproj
+++ b/src/libraries/System.Web.Services/src/Compat/System.Web.Services.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\System.Web.Services.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.Web.Services.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -17,4 +17,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/System.Data/src/project.json b/src/libraries/System.Web.Services/src/Compat/project.json
similarity index 100%
rename from src/libraries/System.Data/src/project.json
rename to src/libraries/System.Web.Services/src/Compat/project.json

diff --git a/src/libraries/System.Web.Services/src/System.Web.Services.builds b/src/libraries/System.Web.Services/src/System.Web.Services.builds
index 261d2f4..286d8c1 100644 (file)
--- a/src/libraries/System.Web.Services/src/System.Web.Services.builds
+++ b/src/libraries/System.Web.Services/src/System.Web.Services.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.Web.Services.csproj" />
+    <Project Include="Compat/System.Web.Services.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/System.Windows/src/ApiCompatBaseline.txt b/src/libraries/System.Windows/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System.Windows/src/ApiCompatBaseline.txt
rename to src/libraries/System.Windows/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System.Windows/src/System.Windows.csproj b/src/libraries/System.Windows/src/Compat/System.Windows.csproj
similarity index 83%
rename from src/libraries/System.Windows/src/System.Windows.csproj
rename to src/libraries/System.Windows/src/Compat/System.Windows.csproj
index ff741d5..5347f45 100644 (file)
--- a/src/libraries/System.Windows/src/System.Windows.csproj
+++ b/src/libraries/System.Windows/src/Compat/System.Windows.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\System.Windows.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.Windows.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -17,4 +17,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/System.Data.Services.Client/src/project.json b/src/libraries/System.Windows/src/Compat/project.json
similarity index 100%
rename from src/libraries/System.Data.Services.Client/src/project.json
rename to src/libraries/System.Windows/src/Compat/project.json

diff --git a/src/libraries/System.Windows/src/System.Windows.builds b/src/libraries/System.Windows/src/System.Windows.builds
index 11888d2..4a6b748 100644 (file)
--- a/src/libraries/System.Windows/src/System.Windows.builds
+++ b/src/libraries/System.Windows/src/System.Windows.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.Windows.csproj" />
+    <Project Include="Compat/System.Windows.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/System.Xml.Serialization/src/ApiCompatBaseline.txt b/src/libraries/System.Xml.Serialization/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System.Xml.Serialization/src/ApiCompatBaseline.txt
rename to src/libraries/System.Xml.Serialization/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System.Xml.Serialization/src/System.Xml.Serialization.csproj b/src/libraries/System.Xml.Serialization/src/Compat/System.Xml.Serialization.csproj
similarity index 82%
rename from src/libraries/System.Xml.Serialization/src/System.Xml.Serialization.csproj
rename to src/libraries/System.Xml.Serialization/src/Compat/System.Xml.Serialization.csproj
index 6e61ebd..9e46987 100644 (file)
--- a/src/libraries/System.Xml.Serialization/src/System.Xml.Serialization.csproj
+++ b/src/libraries/System.Xml.Serialization/src/Compat/System.Xml.Serialization.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\System.Xml.Serialization.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.Xml.Serialization.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -17,4 +17,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/System.Core/src/project.json b/src/libraries/System.Xml.Serialization/src/Compat/project.json
similarity index 100%
rename from src/libraries/System.Core/src/project.json
rename to src/libraries/System.Xml.Serialization/src/Compat/project.json

diff --git a/src/libraries/System.Xml.Serialization/src/System.Xml.Serialization.builds b/src/libraries/System.Xml.Serialization/src/System.Xml.Serialization.builds
index 05bf606..d3234b3 100644 (file)
--- a/src/libraries/System.Xml.Serialization/src/System.Xml.Serialization.builds
+++ b/src/libraries/System.Xml.Serialization/src/System.Xml.Serialization.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.Xml.Serialization.csproj" />
+    <Project Include="Compat/System.Xml.Serialization.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/System/src/ApiCompatBaseline.txt b/src/libraries/System/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/System/src/ApiCompatBaseline.txt
rename to src/libraries/System/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/System/src/System.csproj b/src/libraries/System/src/Compat/System.csproj
similarity index 84%
rename from src/libraries/System/src/System.csproj
rename to src/libraries/System/src/Compat/System.csproj
index 5669ae8..4e6c3d5 100644 (file)
--- a/src/libraries/System/src/System.csproj
+++ b/src/libraries/System/src/Compat/System.csproj
@@ -9,7 +9,7 @@
     <ContractProject>..\ref\System.csproj</ContractProject>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\System.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\System.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -18,4 +18,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/System.ComponentModel.Composition/src/project.json b/src/libraries/System/src/Compat/project.json
similarity index 100%
rename from src/libraries/System.ComponentModel.Composition/src/project.json
rename to src/libraries/System/src/Compat/project.json

diff --git a/src/libraries/System/src/System.builds b/src/libraries/System/src/System.builds
index db11f82..384a8f9 100644 (file)
--- a/src/libraries/System/src/System.builds
+++ b/src/libraries/System/src/System.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="System.csproj" />
+    <Project Include="Compat/System.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/mscorlib/mscorlib.sln b/src/libraries/mscorlib/mscorlib.sln
index f7fd884..478f32f 100644 (file)
--- a/src/libraries/mscorlib/mscorlib.sln
+++ b/src/libraries/mscorlib/mscorlib.sln
@@ -8,7 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6DF80D
                ..\.nuget\packages.Windows_NT.config = ..\.nuget\packages.Windows_NT.config
        EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mscorlib", "src\mscorlib.csproj", "{1B8337CE-3B0A-4447-9620-D9B5EE3E552D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mscorlib", "src\Compat\mscorlib.csproj", "{1B8337CE-3B0A-4447-9620-D9B5EE3E552D}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/libraries/mscorlib/src/ApiCompatBaseline.txt b/src/libraries/mscorlib/src/Compat/ApiCompatBaseline.txt
similarity index 100%
rename from src/libraries/mscorlib/src/ApiCompatBaseline.txt
rename to src/libraries/mscorlib/src/Compat/ApiCompatBaseline.txt

diff --git a/src/libraries/mscorlib/src/mscorlib.csproj b/src/libraries/mscorlib/src/Compat/mscorlib.csproj
similarity index 83%
rename from src/libraries/mscorlib/src/mscorlib.csproj
rename to src/libraries/mscorlib/src/Compat/mscorlib.csproj
index e2935e2..7edc48f 100644 (file)
--- a/src/libraries/mscorlib/src/mscorlib.csproj
+++ b/src/libraries/mscorlib/src/Compat/mscorlib.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesArgs>$(GenFacadesArgs) -ignoreMissingTypes</GenFacadesArgs>
     <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
-    <ContractProject>..\ref\Compat\mscorlib.csproj</ContractProject>
+    <ContractProject>..\..\ref\Compat\mscorlib.csproj</ContractProject>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -17,4 +17,7 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="CopyReferencesToBin" AfterTargets="Build">
+    <Copy SourceFiles="@(ReferencePath)" DestinationFolder="$(OutDir)" />
+  </Target>
 </Project>

diff --git a/src/libraries/mscorlib/src/project.json b/src/libraries/mscorlib/src/Compat/project.json
similarity index 100%
rename from src/libraries/mscorlib/src/project.json
rename to src/libraries/mscorlib/src/Compat/project.json

diff --git a/src/libraries/mscorlib/src/mscorlib.builds b/src/libraries/mscorlib/src/mscorlib.builds
index 18066eb..75628e8 100644 (file)
--- a/src/libraries/mscorlib/src/mscorlib.builds
+++ b/src/libraries/mscorlib/src/mscorlib.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="mscorlib.csproj" />
+    <Project Include="Compat/mscorlib.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>

diff --git a/src/libraries/post.builds b/src/libraries/post.builds
index 9f63aa5..69fa304 100644 (file)
--- a/src/libraries/post.builds
+++ b/src/libraries/post.builds
@@ -15,4 +15,20 @@
   <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
   <Target Name="DumpTargets" />
 
+  <Target Name="CopyContractsToCompatFolder" AfterTargets="Build">
+    <ItemGroup>
+      <AllCompatAssemblies Include="$(BaseOutputPath)/**/Compat/*.dll" />
+      <AllCompatAssemblies>
+        <IsRefAssembly  Condition="$([System.String]::Copy('%(AllCompatAssemblies.FullPath)').Contains('/ref/')) OR
+                                   $([System.String]::Copy('%(AllCompatAssemblies.FullPath)').Contains('\ref\'))">true</IsRefAssembly>
+        <IsIntermediateAssembly Condition="$([System.String]::Copy('%(AllCompatAssemblies.FullPath)').Contains('/obj/')) OR
+                                   $([System.String]::Copy('%(AllCompatAssemblies.FullPath)').Contains('\obj\'))">true</IsIntermediateAssembly>
+      </AllCompatAssemblies>
+      <AllCompatAssemblies Remove="@(AllCompatAssemblies)" Condition="'%(AllCompatAssemblies.IsIntermediateAssembly)'=='true'" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(AllCompatAssemblies)" Condition="'%(AllCompatAssemblies.IsRefAssembly)'=='true'" DestinationFolder="$(BaseOutputPath)/Compat/ref" />
+    <Copy SourceFiles="@(AllCompatAssemblies)" Condition="'%(AllCompatAssemblies.IsRefAssembly)'!='true'" DestinationFolder="$(BaseOutputPath)/Compat/facades" />
+  </Target>
+
 </Project>