From 5cfbb69c71a1f7a72151d3d57a61505941732d26 Mon Sep 17 00:00:00 2001
From: Anipik <anirudhagnihotry098@gmail.com>
Date: Thu, 12 Aug 2021 11:41:58 -0700
Subject: [PATCH 1/2] added packaging for sqlClient

---
 .../packageIndex.json                         | 23 +++++++++++--------
 .../Microsoft.Windows.Compatibility.pkgproj   |  4 ++--
 .../Directory.Build.props                     |  4 ++--
 src/packages.builds                           |  6 +++++
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index 74627f751bea..f6fc9922c566 100644
--- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/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"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj b/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
index 614d9ee7d813..b64a727a5fd8 100644
--- a/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
+++ b/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" />
diff --git a/src/System.Data.SqlClient/Directory.Build.props b/src/System.Data.SqlClient/Directory.Build.props
index 464d3590683d..6b0d3505dc9e 100644
--- a/src/System.Data.SqlClient/Directory.Build.props
+++ b/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>
diff --git a/src/packages.builds b/src/packages.builds
index 55f7886509ec..32bce478c4de 100644
--- a/src/packages.builds
+++ b/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>

From c11604de4e4018adc894b243f14f07ea11b33cb3 Mon Sep 17 00:00:00 2001
From: Anipik <anirudhagnihotry098@gmail.com>
Date: Thu, 12 Aug 2021 16:18:09 -0700
Subject: [PATCH 2/2] adding rifs for debian11 and alpine3.14

---
 eng/Packaging.props                           |   2 +-
 .../runtime.compatibility.json                | 115 ++++++++++++++++++
 pkg/Microsoft.NETCore.Platforms/runtime.json  |  46 +++++++
 .../runtimeGroups.props                       |   4 +-
 .../packageIndex.json                         |   5 +-
 src/packages.builds                           |   3 +
 6 files changed, 170 insertions(+), 5 deletions(-)

diff --git a/eng/Packaging.props b/eng/Packaging.props
index 8d6020a87cb1..1764d8fd2c23 100644
--- a/eng/Packaging.props
+++ b/eng/Packaging.props
@@ -27,7 +27,7 @@
     <PackageVersion Condition="'$(PackageVersion)' == ''">4.7.0</PackageVersion>
     <!-- major.minor.release version of the platforms package we're currently building
          Pre-release will be appended during build -->
-    <PlatformPackageVersion>3.1.7</PlatformPackageVersion>
+    <PlatformPackageVersion>3.1.8</PlatformPackageVersion>
     <SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
     <SkipGenerationCheck>true</SkipGenerationCheck>
     <!-- The index check here is used to determine if the assembly is containted in a stable package version.
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index da7345623e66..2ffaa3454f6a 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -177,6 +177,53 @@
     "any",
     "base"
   ],
+  "alpine.3.14": [
+    "alpine.3.14",
+    "alpine.3.13",
+    "alpine.3.12",
+    "alpine.3.11",
+    "alpine.3.10",
+    "alpine.3.9",
+    "alpine.3.8",
+    "alpine.3.7",
+    "alpine.3.6",
+    "alpine",
+    "linux-musl",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "alpine.3.14-x64": [
+    "alpine.3.14-x64",
+    "alpine.3.14",
+    "alpine.3.13-x64",
+    "alpine.3.13",
+    "alpine.3.12-x64",
+    "alpine.3.12",
+    "alpine.3.11-x64",
+    "alpine.3.11",
+    "alpine.3.10-x64",
+    "alpine.3.10",
+    "alpine.3.9-x64",
+    "alpine.3.9",
+    "alpine.3.8-x64",
+    "alpine.3.8",
+    "alpine.3.7-x64",
+    "alpine.3.7",
+    "alpine.3.6-x64",
+    "alpine.3.6",
+    "alpine-x64",
+    "alpine",
+    "linux-musl-x64",
+    "linux-musl",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.6": [
     "alpine.3.6",
     "alpine",
@@ -625,6 +672,74 @@
     "any",
     "base"
   ],
+  "debian.11": [
+    "debian.11",
+    "debian",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "debian.11-arm": [
+    "debian.11-arm",
+    "debian.11",
+    "debian-arm",
+    "debian",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
+  "debian.11-arm64": [
+    "debian.11-arm64",
+    "debian.11",
+    "debian-arm64",
+    "debian",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "debian.11-armel": [
+    "debian.11-armel",
+    "debian.11",
+    "debian-armel",
+    "debian",
+    "linux-armel",
+    "linux",
+    "unix-armel",
+    "unix",
+    "any",
+    "base"
+  ],
+  "debian.11-x64": [
+    "debian.11-x64",
+    "debian.11",
+    "debian-x64",
+    "debian",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "debian.11-x86": [
+    "debian.11-x86",
+    "debian.11",
+    "debian-x86",
+    "debian",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
+  ],
   "debian.8": [
     "debian.8",
     "debian",
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
index 608a034808bd..b860381f59d5 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -55,6 +55,17 @@
         "alpine.3.12-x64"
       ]
     },
+    "alpine.3.14": {
+      "#import": [
+        "alpine.3.13"
+      ]
+    },
+    "alpine.3.14-x64": {
+      "#import": [
+        "alpine.3.14",
+        "alpine.3.13-x64"
+      ]
+    },
     "alpine.3.6": {
       "#import": [
         "alpine"
@@ -286,6 +297,41 @@
         "debian-x86"
       ]
     },
+    "debian.11": {
+      "#import": [
+        "debian"
+      ]
+    },
+    "debian.11-arm": {
+      "#import": [
+        "debian.11",
+        "debian-arm"
+      ]
+    },
+    "debian.11-arm64": {
+      "#import": [
+        "debian.11",
+        "debian-arm64"
+      ]
+    },
+    "debian.11-armel": {
+      "#import": [
+        "debian.11",
+        "debian-armel"
+      ]
+    },
+    "debian.11-x64": {
+      "#import": [
+        "debian.11",
+        "debian-x64"
+      ]
+    },
+    "debian.11-x86": {
+      "#import": [
+        "debian.11",
+        "debian-x86"
+      ]
+    },
     "debian.8": {
       "#import": [
         "debian"
diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index 0e8d06dddd1b..ad0f7c93bbf4 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -16,7 +16,7 @@
     <RuntimeGroup Include="alpine">
       <Parent>linux-musl</Parent>
       <Architectures>x64</Architectures>
-      <Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13</Versions>
+      <Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14</Versions>
     </RuntimeGroup>
 
     <RuntimeGroup Include="android">
@@ -43,7 +43,7 @@
     <RuntimeGroup Include="debian">
       <Parent>linux</Parent>
       <Architectures>x64;x86;arm;armel;arm64</Architectures>
-      <Versions>8;9;10</Versions>
+      <Versions>8;9;10;11</Versions>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>
 
diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index f6fc9922c566..d3b1d81fef40 100644
--- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -201,9 +201,10 @@
         "3.1.4",
         "3.1.5",
         "3.1.6",
-        "3.1.7"
+        "3.1.7",
+        "3.1.8"
       ],
-      "BaselineVersion": "3.1.7",
+      "BaselineVersion": "3.1.8",
       "InboxOn": {}
     },
     "Microsoft.NETCore.Platforms.Future": {
diff --git a/src/packages.builds b/src/packages.builds
index 32bce478c4de..3282a46ee674 100644
--- a/src/packages.builds
+++ b/src/packages.builds
@@ -32,6 +32,9 @@
     <Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Windows.Compatibility\Microsoft.Windows.Compatibility.builds">
       <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
     </Project>
+    <Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.NETCore.Platforms\Microsoft.NETCore.Platforms.builds">
+      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
+    </Project>
   </ItemGroup>
 
   <ItemGroup>