Revert System.Private.DataContractSerialization pkgproj reference to csproj reference

System.Runtime.Serialization.Json, System.Runtime.Serialization.Xml, System.Xml.XmlSerializer are compiled against it's implementation, it has no compile time assets.

Commit migrated from https://github.com/dotnet/corefx/commit/37fb7cf005fc4dd95ddb196150cac62955acf7c5

diff --git a/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj b/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj
index a08f4ce..20b7052 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj
@@ -27,7 +27,7 @@
     <Compile Include="Performance\JsonNetPerformanceTest.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(UseContractReferences)' == ''" >
-    <ProjectReference Include="..\..\System.Private.DataContractSerialization\pkg\System.Private.DataContractSerialization.pkgproj">
+    <ProjectReference Include="..\..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj">
       <Project>{6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}</Project>
       <Name>System.Private.DataContractSerialization</Name>
       <KeepProjectReference>true</KeepProjectReference>

diff --git a/src/libraries/System.Runtime.Serialization.Json/tests/project.json b/src/libraries/System.Runtime.Serialization.Json/tests/project.json
index 5b9bee8..2c5146d 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Json/tests/project.json
+++ b/src/libraries/System.Runtime.Serialization.Json/tests/project.json
@@ -14,9 +14,6 @@
     "System.ObjectModel": "4.0.13-beta-24230-04",
     "System.Runtime": "4.1.1-beta-24230-04",
     "System.Runtime.Extensions": "4.1.1-beta-24230-04",
-    "System.Runtime.Serialization.Primitives": "4.1.2-beta-24230-04",
-    "System.Runtime.Serialization.Json": "4.0.3-beta-24230-04",
-    "System.Runtime.Serialization.Xml": "4.1.2-beta-24230-04",
     "System.Threading.Tasks": "4.0.12-beta-24230-04",
     "System.Xml.ReaderWriter": "4.1.0-beta-24230-04",
     "System.Xml.XDocument": "4.0.12-beta-24230-04",

diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj
index 8bf6fdf..b85d127 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj
@@ -37,7 +37,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(UseContractReferences)' == ''">
-    <ProjectReference Include="..\..\System.Private.DataContractSerialization\pkg\System.Private.DataContractSerialization.pkgproj">
+    <ProjectReference Include="..\..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj">
       <Project>{6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}</Project>
       <Name>System.Private.DataContractSerialization</Name>
       <KeepProjectReference>true</KeepProjectReference>

diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/project.json b/src/libraries/System.Runtime.Serialization.Xml/tests/project.json
index 232ded9..c2fa7bd 100644 (file)
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/project.json
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/project.json
@@ -13,9 +13,6 @@
     "System.ObjectModel": "4.0.13-beta-24230-04",
     "System.Runtime": "4.1.1-beta-24230-04",
     "System.Runtime.Extensions": "4.1.1-beta-24230-04",
-    "System.Runtime.Serialization.Primitives": "4.1.2-beta-24230-04",
-    "System.Runtime.Serialization.Json": "4.0.3-beta-24230-04",
-    "System.Runtime.Serialization.Xml": "4.1.2-beta-24230-04",
     "System.Text.Encoding": "4.0.12-beta-24230-04",
     "System.Threading.Tasks": "4.0.12-beta-24230-04",
     "System.Xml.ReaderWriter": "4.1.0-beta-24230-04",

diff --git a/src/libraries/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.csproj b/src/libraries/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.csproj
index 9d68d89..c584b7d 100644 (file)
--- a/src/libraries/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.csproj
+++ b/src/libraries/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.csproj
@@ -25,7 +25,7 @@
     <Compile Include="Performance\XsPerformanceTest.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(UseContractReferences)' == ''" >
-    <ProjectReference Include="..\..\System.Private.DataContractSerialization\pkg\System.Private.DataContractSerialization.pkgproj">
+    <ProjectReference Include="..\..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj">
       <Project>{6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}</Project>
       <Name>System.Private.DataContractSerialization</Name>
       <KeepProjectReference>true</KeepProjectReference>
@@ -34,7 +34,7 @@
       <Project>{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}</Project>
       <Name>System.Runtime.Serialization.Primitives</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\System.Xml.XmlSerializer\src\System.Xml.XmlSerializer.csproj">
+    <ProjectReference Include="..\src\System.Xml.XmlSerializer.csproj">
       <Project>{D62A6082-5229-4845-8BE9-75753E08C65A}</Project>
       <Name>System.Xml.XmlSerializer</Name>
       <KeepProjectReference>true</KeepProjectReference>