Fixing packages of S.Runtime, S.R.S.Primitives and S.R.S.Formatters

dotnet · Aug 15, 2016 · 17aa557 · 17aa557
1 parent 90be359
commit 17aa557
Show file tree

Hide file tree

Showing 36 changed files with 167 additions and 57 deletions.
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
@@ -1 +1 @@
-1.0.26-prerelease-00629-09
+1.0.26-prerelease-00708-05
diff --git a/...time/src/System/NonSerializedAttribute.cs → ...mmon/src/System/NonSerializedAttribute.cs b/...time/src/System/NonSerializedAttribute.cs → ...mmon/src/System/NonSerializedAttribute.cs
diff --git a/...Serialization/IDeserializationCallback.cs → ...Serialization/IDeserializationCallback.cs b/...Serialization/IDeserializationCallback.cs → ...Serialization/IDeserializationCallback.cs
diff --git a/...time/Serialization/IFormatterConverter.cs → ...time/Serialization/IFormatterConverter.cs b/...time/Serialization/IFormatterConverter.cs → ...time/Serialization/IFormatterConverter.cs
diff --git a/...Runtime/Serialization/IObjectReference.cs → ...Runtime/Serialization/IObjectReference.cs b/...Runtime/Serialization/IObjectReference.cs → ...Runtime/Serialization/IObjectReference.cs
diff --git a/...em/Runtime/Serialization/ISerializable.cs → ...em/Runtime/Serialization/ISerializable.cs b/...em/Runtime/Serialization/ISerializable.cs → ...em/Runtime/Serialization/ISerializable.cs
diff --git a/.../Serialization/OnDeserializedAttribute.cs → .../Serialization/OnDeserializedAttribute.cs b/.../Serialization/OnDeserializedAttribute.cs → .../Serialization/OnDeserializedAttribute.cs
diff --git a/...Serialization/OnDeserializingAttribute.cs → ...Serialization/OnDeserializingAttribute.cs b/...Serialization/OnDeserializingAttribute.cs → ...Serialization/OnDeserializingAttribute.cs
diff --git a/...me/Serialization/OnSerializedAttribute.cs → ...me/Serialization/OnSerializedAttribute.cs b/...me/Serialization/OnSerializedAttribute.cs → ...me/Serialization/OnSerializedAttribute.cs
diff --git a/...e/Serialization/OnSerializingAttribute.cs → ...e/Serialization/OnSerializingAttribute.cs b/...e/Serialization/OnSerializingAttribute.cs → ...e/Serialization/OnSerializingAttribute.cs
diff --git a/...e/Serialization/OptionalFieldAttribute.cs → ...e/Serialization/OptionalFieldAttribute.cs b/...e/Serialization/OptionalFieldAttribute.cs → ...e/Serialization/OptionalFieldAttribute.cs
diff --git a/...e/Serialization/SerializationException.cs → ...e/Serialization/SerializationException.cs b/...e/Serialization/SerializationException.cs → ...e/Serialization/SerializationException.cs
diff --git a/...untime/Serialization/SerializationInfo.cs → ...untime/Serialization/SerializationInfo.cs b/...untime/Serialization/SerializationInfo.cs → ...untime/Serialization/SerializationInfo.cs
diff --git a/...ialization/SerializationInfoEnumerator.cs → ...ialization/SerializationInfoEnumerator.cs b/...ialization/SerializationInfoEnumerator.cs → ...ialization/SerializationInfoEnumerator.cs
diff --git a/...Runtime/Serialization/StreamingContext.cs → ...Runtime/Serialization/StreamingContext.cs b/...Runtime/Serialization/StreamingContext.cs → ...Runtime/Serialization/StreamingContext.cs
diff --git a/...ntime/src/System/SerializableAttribute.cs → ...ommon/src/System/SerializableAttribute.cs b/...ntime/src/System/SerializableAttribute.cs → ...ommon/src/System/SerializableAttribute.cs
diff --git a/src/System.Data.Common/pkg/ValidationSuppression.txt b/src/System.Data.Common/pkg/ValidationSuppression.txt
@@ -1 +1,2 @@
-PermitImplementation=.NETCore,Version=v4.5;WindowsPhone,Version=v8.0
+PermitImplementation=.NETCore,Version=v4.5;WindowsPhone,Version=v8.0
+SuppressNETStandardInference=.NETCore,Version=v4.5;WindowsPhone,Version=v8.0
diff --git a/src/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj b/src/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj
@@ -27,12 +27,9 @@
   <ItemGroup Condition="'$(UseContractReferences)' == ''" >
     <ProjectReference Include="..\..\src\System.Private.Xml.csproj" />
     <ProjectReference Include="..\..\..\System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj" />
-    <ProjectReference Include="..\..\..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj" />
-    <ProjectReference Include="..\..\..\System.Runtime.Serialization.Primitives\src\System.Runtime.Serialization.Primitives.csproj" />
-    <ProjectReference Include="..\..\..\System.Xml.XmlSerializer\src\System.Xml.XmlSerializer.csproj" />
-    <ProjectReference Include="..\..\..\System.Xml.ReaderWriter\src\System.Xml.ReaderWriter.csproj" />
-    <ProjectReference Include="..\..\..\System.Xml.XmlDocument\src\System.Xml.XmlDocument.csproj" />
-    <ProjectReference Include="..\..\..\System.Xml.XDocument\src\System.Xml.XDocument.csproj" />
+    <ProjectReference Include="..\..\..\System.Private.DataContractSerialization\pkg\System.Private.DataContractSerialization.pkgproj" />
+    <ProjectReference Include="..\..\..\System.Runtime.Serialization.Primitives\pkg\System.Runtime.Serialization.Primitives.pkgproj" />
+    <ProjectReference Include="..\..\..\Microsoft.Win32.Registry\pkg\Microsoft.Win32.Registry.pkgproj" />
   </ItemGroup>
   <ItemGroup>
     <None Include="project.json" />

diff --git a/...stem.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.pkgproj b/...stem.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.pkgproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>  
     <ProjectReference Include="..\ref\System.Runtime.Serialization.Formatters.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Runtime.Serialization.Formatters.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />

diff --git a/...ystem.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj b/...ystem.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj
@@ -4,14 +4,15 @@
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>netstandard1.5</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.7</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Serialization.Formatters.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="project.json" />
+    <!-- ToDo: Remove this project references as they should go in project.json instead once the packages are pushed. -->
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.Runtime.Serialization.Primitives\ref\System.Runtime.Serialization.Primitives.csproj" />
   </ItemGroup>

diff --git a/src/System.Runtime.Serialization.Formatters/ref/project.json b/src/System.Runtime.Serialization.Formatters/ref/project.json
@@ -8,9 +8,9 @@
     "System.Runtime.Serialization.Primitives": "4.1.1"
   },
   "frameworks": {
-    "netstandard1.3": {
+    "netstandard1.7": {
       "imports": [
-        "dotnet5.4"
+        "dotnet5.8"
       ]
     }
   }

diff --git a/...ystem.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.builds b/...ystem.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.builds
@@ -4,7 +4,7 @@
   <ItemGroup>
     <Project Include="System.Runtime.Serialization.Formatters.csproj" />
     <Project Include="System.Runtime.Serialization.Formatters.csproj">
-      <TargetGroup>net46</TargetGroup>
+      <TargetGroup>net463</TargetGroup>
     </Project>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />

diff --git a/...ystem.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj b/...ystem.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj
@@ -7,9 +7,9 @@
     <!-- rev'ed to 4.0.1.0 even though 4.0.0.0 never shipped so that we can drop pre-release down to beta -->
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <RootNamespace>System.Runtime.Serialization.Formatters</RootNamespace>
-    <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.4</PackageTargetFramework>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.4</NuGetTargetMoniker>
+    <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.7</PackageTargetFramework>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
@@ -64,8 +64,13 @@
     <Compile Include="System\Runtime\Serialization\Formatters\Binary\BinaryObjectWriter.cs" />
     <Compile Include="System\Runtime\Serialization\Formatters\Binary\BinaryParser.cs" />
     <Compile Include="System\Runtime\Serialization\Formatters\Binary\BinaryUtilClasses.cs" />
-    <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
-    <ProjectReference Include="..\..\System.Runtime.Serialization.Primitives\ref\System.Runtime.Serialization.Primitives.csproj" />
+    <!-- ToDo: remove these P2P references once they are pushed -->
+    <ProjectReference Include="../../System.Runtime/pkg/System.Runtime.pkgproj">
+        <Name>System.Runtime</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.pkgproj">
+        <Name>System.Runtime.Serialization.Primitives</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="project.json" />

diff --git a/src/System.Runtime.Serialization.Formatters/src/project.json b/src/System.Runtime.Serialization.Formatters/src/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "netstandard1.4": {
+    "netstandard1.7": {
       "dependencies": {
         "Microsoft.NETCore.Platforms": "1.0.1",
         "System.Collections": "4.0.10",
@@ -14,14 +14,15 @@
         "System.Runtime": "4.0.20",
         "System.Runtime.Extensions": "4.0.10",
         "System.Runtime.Serialization.Primitives": "4.2.0-beta-devapi-24415-01",
+        "System.Globalization": "4.0.12-beta-devapi-24415-01",
         "System.Text.Encoding.Extensions": "4.0.10",
         "System.Threading": "4.0.10"
       },
       "imports": [
-        "dotnet5.5"
+        "dotnet5.8"
       ]
     },
-    "net46": {
+    "net463": {
       "dependencies": {
         "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
       }

diff --git a/...ntime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.builds b/...ntime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.builds
@@ -2,9 +2,11 @@
 <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.Formatters.Tests.csproj"/>
     <Project Include="System.Runtime.Serialization.Formatters.Tests.csproj">
-      <TestTFMs>net46</TestTFMs>
+    	<TestTFMs>netcoreapp1.1</TestTFMs>
+    </Project>
+    <Project Include="System.Runtime.Serialization.Formatters.Tests.csproj">
+      <TestTFMs>net463</TestTFMs>
       <OSGroup>Windows_NT</OSGroup>
     </Project>
   </ItemGroup>

diff --git a/...ntime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj b/...ntime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
@@ -9,7 +9,7 @@
     <AssemblyName>System.Runtime.Serialization.Formatters.Tests</AssemblyName>
     <RootNamespace>System.Runtime.Serialization.Formatters.Tests</RootNamespace>
     <IncludePerformanceTests>true</IncludePerformanceTests>
-    <NugetTargetMoniker>.NETStandard,Version=v1.5</NugetTargetMoniker>
+    <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />

diff --git a/src/System.Runtime.Serialization.Formatters/tests/project.json b/src/System.Runtime.Serialization.Formatters/tests/project.json
@@ -21,11 +21,9 @@
     "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0037"
   },
   "frameworks": {
-    "netstandard1.5": {}
+    "netstandard1.7": {}
   },
   "supports": {
-    "coreFx.Test.netcoreapp1.0": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
+    "coreFx.Test.netcoreapp1.1": {}
   }
 }
diff --git a/...stem.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.pkgproj b/...stem.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.pkgproj
@@ -5,8 +5,11 @@
     <ProjectReference Include="..\ref\4.0.0\System.Runtime.Serialization.Primitives.depproj">
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
+    <ProjectReference Include="..\ref\4.1.1\System.Runtime.Serialization.Primitives.depproj">
+      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+    </ProjectReference>
     <ProjectReference Include="..\ref\System.Runtime.Serialization.Primitives.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Runtime.Serialization.Primitives.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />

diff --git a/...untime.Serialization.Primitives/ref/4.1.1/System.Runtime.Serialization.Primitives.depproj b/...untime.Serialization.Primitives/ref/4.1.1/System.Runtime.Serialization.Primitives.depproj
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <OutputType>Library</OutputType>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+</Project>
diff --git a/src/System.Runtime.Serialization.Primitives/ref/4.1.1/project.json b/src/System.Runtime.Serialization.Primitives/ref/4.1.1/project.json
@@ -0,0 +1,12 @@
+{
+  "dependencies": {
+    "System.Runtime.Serialization.Primitives": "4.1.1"
+  },
+  "frameworks": {
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
+  }
+}
diff --git a/...ystem.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj b/...ystem.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj
@@ -4,14 +4,15 @@
   <PropertyGroup>
     <AssemblyVersion>4.2.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.7</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Serialization.Primitives.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="project.json" />
+    <!-- ToDo: Remove this P2P reference once the required types are pushed in system.runtime -->
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />

diff --git a/src/System.Runtime.Serialization.Primitives/ref/project.json b/src/System.Runtime.Serialization.Primitives/ref/project.json
@@ -1,11 +1,10 @@
 {
   "dependencies": {
-    "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "netstandard1.3": {
+    "netstandard1.7": {
       "imports": [
-        "dotnet5.4"
+        "dotnet5.8"
       ]
     }
   }

diff --git a/...ystem.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.builds b/...ystem.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.builds
@@ -3,9 +3,15 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <Project Include="System.Runtime.Serialization.Primitives.csproj" />
+    <Project Include="System.Runtime.Serialization.Primitives.csproj">
+      <TargetGroup>netstandard1.3</TargetGroup>
+    </Project>
     <Project Include="System.Runtime.Serialization.Primitives.csproj">
       <TargetGroup>net46</TargetGroup>
     </Project>
+    <Project Include="System.Runtime.Serialization.Primitives.csproj">
+      <TargetGroup>net463</TargetGroup>
+    </Project>
     <!-- System.Runtime.Serialization.Primitives needs to be build for netcore50 because it needs to have the reflection block enabled
     By default, all assemblies that are built for netcore50 or netcore50aot have the reflection block enabled. -->
     <Project Include="System.Runtime.Serialization.Primitives.csproj">

diff --git a/...ystem.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/...ystem.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
@@ -4,15 +4,17 @@
   <PropertyGroup>
     <AssemblyName>System.Runtime.Serialization.Primitives</AssemblyName>
     <AssemblyVersion>4.2.0.0</AssemblyVersion>
+    <AssemblyVersion Condition="'$(TargetGroup)'=='netstandard1.3' Or '$(TargetGroup)'=='net46' Or '$(TargetGroup)'=='netcore50aot'">4.1.1.0</AssemblyVersion>
+    <ContractProject Condition="'$(AssemblyVersion)'=='4.1.1.0'">../ref/4.1.1/System.Runtime.Serialization.Primitives.depproj</ContractProject>
     <RootNamespace>System.Runtime.Serialization.Primitives</RootNamespace>
     <NoWarn>$(NoWarn);1634;1691;649</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <FileAlignment>512</FileAlignment>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ProjectGuid>{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}</ProjectGuid>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">netstandard1.3</PackageTargetFramework>
-    <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">netstandard1.7</PackageTargetFramework>
+    <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46' Or '$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -21,11 +23,33 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aot_Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aot_Release|AnyCPU'" />
-  <ItemGroup Condition="'$(TargetGroup)'!='net46'">
-    <Compile Include=".\**\*.cs" />
-    <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
+  <ItemGroup Condition="'$(TargetGroup)'!='net46' And '$(TargetGroup)'!='net463'">
+    <Compile Include="System\Runtime\Serialization\CollectionDataContractAttribute.cs" />
+    <Compile Include="System\Runtime\Serialization\ContractNamespaceAttribute.cs" />
+    <Compile Include="System\Runtime\Serialization\DataContractAttribute.cs" />
+    <Compile Include="System\Runtime\Serialization\DataMemberAttribute.cs" />
+    <Compile Include="System\Runtime\Serialization\EnumMemberAttribute.cs" />
+    <Compile Include="System\Runtime\Serialization\IgnoreDataMemberAttribute.cs" />
+    <Compile Include="System\Runtime\Serialization\InvalidDataContractException.cs" />
+    <Compile Include="System\Runtime\Serialization\ISerializationSurrogateProvider.cs" />
+    <Compile Include="System\Runtime\Serialization\KnownTypeAttribute.cs" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetGroup)'=='netstandard1.3' Or '$(TargetGroup)'=='netcore50aot'">
+    <Compile Include="$(CommonPath)\System\Runtime\Serialization\OnDeserializedAttribute.cs" />
+    <Compile Include="$(CommonPath)\System\Runtime\Serialization\OnDeserializingAttribute.cs" />
+    <Compile Include="$(CommonPath)\System\Runtime\Serialization\OnSerializedAttribute.cs" />
+    <Compile Include="$(CommonPath)\System\Runtime\Serialization\OnSerializingAttribute.cs" />
+    <Compile Include="$(CommonPath)\System\Runtime\Serialization\SerializationException.cs" />
+    <Compile Include="$(CommonPath)\System\Runtime\Serialization\StreamingContext.cs" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetGroup)'==''">
+    <!-- ToDo: Remove this dependency once System.Runtime is published. -->
+    <ProjectReference Include="..\..\System.Runtime\pkg\System.Runtime.pkgproj">
+      <Name>System.Runtime</Name>
+    </ProjectReference>
+    <Compile Include="System.Runtime.Serialization.Primitives.TypeForwards.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)'=='net46'">
+  <ItemGroup Condition="'$(TargetGroup)'=='net46' Or '$(TargetGroup)'=='net463'">
     <TargetingPackReference Include="mscorlib" />
     <TargetingPackReference Include="System.Runtime.Serialization" />
     <Compile Include="System\Runtime\Serialization\ISerializationSurrogateProvider.cs" />

diff --git a/src/System.Runtime.Serialization.Primitives/src/project.json b/src/System.Runtime.Serialization.Primitives/src/project.json
@@ -10,6 +10,16 @@
         "dotnet5.4"
       ]
     },
+    "netstandard1.7": {
+      "dependencies": {
+        "System.Runtime": "4.0.20",
+        "System.Resources.ResourceManager": "4.0.0",
+        "System.Threading.Tasks": "4.0.10"
+      },
+      "imports": [
+        "dotnet5.8"
+      ]
+    },
     "netcore50": {
       "dependencies": {
         "Microsoft.NETCore.Platforms": "1.0.1",
@@ -23,6 +33,11 @@
       "dependencies": {
         "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
       }
+    },
+    "net463": {
+      "dependencies": {
+        "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
+      }
     }
   }
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1.0.26-prerelease-00629-09
		1.0.26-prerelease-00708-05