Merge in 'release/3.1' changes

pkg/Microsoft.Private.PackageBaseline/packageIndex.json

@@ -424,9 +424,10 @@
         "2.1.0",
         "3.0.0",
         "3.1.0",
-        "3.1.1"
+        "3.1.1",
+        "3.1.2"
       ],
-      "BaselineVersion": "3.1.0",
+      "BaselineVersion": "3.1.2",
       "InboxOn": {}
     },
     "Microsoft.Windows.Compatibility.Shims": {
@@ -650,10 +651,6 @@
       ],
       "InboxOn": {}
     },
-    "runtime.win-x64.Microsoft.Private.CoreFx.NETCoreApp": {
-      "BaselineVersion": "4.7.0",
-      "InboxOn": {}
-    },
     "runtime.win7-x64.runtime.native.System.Data.SqlClient.sni": {
       "StableVersions": [
         "4.0.1",
@@ -670,6 +667,10 @@
       "BaselineVersion": "4.3.0",
       "InboxOn": {}
     },
+    "runtime.win-x64.Microsoft.Private.CoreFx.NETCoreApp": {
+      "BaselineVersion": "4.7.0",
+      "InboxOn": {}
+    },
     "SMDiagnostics": {
       "InboxOn": {
         "monoandroid10": "Any"
@@ -1544,9 +1545,10 @@
         "4.7.0",
         "4.8.0",
         "4.8.1",
-        "4.8.2"
+        "4.8.2",
+        "4.8.3"
       ],
-      "BaselineVersion": "4.8.0",
+      "BaselineVersion": "4.8.3",
       "InboxOn": {
         "net461": "4.1.0.0",
         "monoandroid10": "Any",
@@ -1569,7 +1571,8 @@
         "4.6.0.0": "4.7.0",
         "4.6.1.0": "4.8.0",
         "4.6.1.1": "4.8.1",
-        "4.6.1.2": "4.8.2"
+        "4.6.1.2": "4.8.2",
+        "4.6.1.3": "4.8.3"
       }
     },
     "System.Data.SqlXml": {
@@ -6649,4 +6652,4 @@
       "System.Xml.XDocument"
     ]
   }
-}
+}

pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <!-- We use the PackageVersion property defined in Packaging.props for the Prerelease packages which are using it to be built --> 
     <_PreReleasePackageVersion>$(PackageVersion)</_PreReleasePackageVersion> 
-    <PackageVersion>3.1.1</PackageVersion>
+    <PackageVersion>3.1.2</PackageVersion>
     <ServiceModelVersion>4.7.0</ServiceModelVersion>
     <!-- We don't need to harvest the stable packages to build this -->
     <HarvestStablePackage>false</HarvestStablePackage>
@@ -30,7 +30,7 @@
     <PrereleaseLibraryPackage Include="System.Data.OleDb" />
     <PrereleaseLibraryPackage Include="System.Data.SqlClient"> 
       <!-- SQL client defines its own version, higher than rest of master --> 
-      <Version>4.8.2</Version>
+      <Version>4.8.3</Version>
     </PrereleaseLibraryPackage>
     <PrereleaseLibraryPackage Include="System.Drawing.Common" />
     <PrereleaseLibraryPackage Include="System.Diagnostics.EventLog" />

src/System.Data.SqlClient/Directory.Build.props

@@ -2,8 +2,8 @@
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <!-- Must be kept in sync with pkg\Microsoft.Windows.Compatibility\Microsoft.Windows.Compatibility.pkgproj -->
-    <PackageVersion>4.8.2</PackageVersion>
-    <AssemblyVersion>4.6.1.2</AssemblyVersion>
+    <PackageVersion>4.8.3</PackageVersion>
+    <AssemblyVersion>4.6.1.3</AssemblyVersion>
     <!-- Downgrade the Assembly Version to match RTM in order to have System.Data shim to still 
     typeforward to RTM version instead of servicing version -->
     <AssemblyVersion Condition="'$(TargetGroup)' == 'netcoreapp'">4.6.1.0</AssemblyVersion>

src/packages.builds

@@ -26,6 +26,12 @@
       <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
     </Project>
     <!-- add specific builds / pkgproj's here to include in servicing builds -->
+    <Project Include="$(MSBuildThisFileDirectory)System.Data.SqlClient\pkg\System.Data.SqlClient.pkgproj">
+      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
+    </Project>
+    <Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Windows.Compatibility\Microsoft.Windows.Compatibility.builds">
+      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
+    </Project>
   </ItemGroup>
 
   <ItemGroup>