From 7aebf45737714e5fa2b1e8e7d3193b78f0d27da3 Mon Sep 17 00:00:00 2001
From: Kaur-Parminder <v-parkaur@microsoft.com>
Date: Mon, 7 Mar 2022 09:49:11 -0800
Subject: [PATCH 1/3] SNI Update

SNI Update
---
 tools/props/Versions.props                  | 6 +++---
 tools/specs/Microsoft.Data.SqlClient.nuspec | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index 44002cbbae..d58b93e218 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -6,7 +6,7 @@
     <!-- Should only be changed in future when a non-backwards compatible driver is released. -->
     <!-- Future Assembly Version values shall be Major.Minor.0.0; e.g. 4.0.0.0 -->
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
-    <NugetPackageVersion Condition="'$(NugetPackageVersion)' == ''">5.0.0-dev</NugetPackageVersion>
+    <NugetPackageVersion Condition="'$(NugetPackageVersion)' == ''">5.0.0-preview1.22062.1</NugetPackageVersion>
     <Version>$(NugetPackageVersion)</Version>
   </PropertyGroup>
   <PropertyGroup>
@@ -20,7 +20,7 @@
   </PropertyGroup>
   <!-- NetFx project dependencies -->
   <PropertyGroup>
-    <MicrosoftDataSqlClientSniVersion>4.0.0</MicrosoftDataSqlClientSniVersion>    
+    <MicrosoftDataSqlClientSniVersion>5.0.0-preview1.22062.1</MicrosoftDataSqlClientSniVersion>    
     <SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion>
     <SystemSecurityCryptographyPrimitivesVersion>4.3.0</SystemSecurityCryptographyPrimitivesVersion>
   </PropertyGroup>
@@ -38,7 +38,7 @@
   <!-- NetCore project dependencies -->
   <PropertyGroup>
     <MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
-    <MicrosoftDataSqlClientSNIRuntimeVersion>4.0.0</MicrosoftDataSqlClientSNIRuntimeVersion>
+    <MicrosoftDataSqlClientSNIRuntimeVersion>5.0.0-preview1.22062.1</MicrosoftDataSqlClientSNIRuntimeVersion>
     <SystemConfigurationConfigurationManagerVersion>5.0.0</SystemConfigurationConfigurationManagerVersion>
     <SystemDiagnosticsDiagnosticSourceVersion>5.0.0</SystemDiagnosticsDiagnosticSourceVersion>
     <SystemDiagnosticsPerformanceCounterVersion>5.0.0</SystemDiagnosticsPerformanceCounterVersion>
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index 750ee2f48a..7f5ed91f43 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -28,7 +28,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
     <tags>sqlclient microsoft.data.sqlclient</tags>
     <dependencies>
       <group targetFramework="net461">
-        <dependency id="Microsoft.Data.SqlClient.SNI" version="4.0.0" />
+        <dependency id="Microsoft.Data.SqlClient.SNI" version="5.0.0-preview1.22062.1" />
         <dependency id="Azure.Identity" version="1.3.0" />
         <dependency id="Microsoft.Identity.Client" version="4.22.0" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.8.0" />
@@ -42,7 +42,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
         <dependency id="System.Text.Encodings.Web" version="4.7.2" />
       </group>
       <group targetFramework="netcoreapp3.1">
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="4.0.0" exclude="Compile" />
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.0.0-preview1.22062.1" exclude="Compile" />
         <dependency id="Azure.Identity" version="1.3.0" />
         <dependency id="Microsoft.Identity.Client" version="4.22.0" exclude="Compile"/>
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" />
@@ -60,7 +60,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
         <dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
       </group>
       <group targetFramework="netstandard2.0">
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="4.0.0" exclude="Compile" />
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.0.0-preview1.22062.1" exclude="Compile" />
         <dependency id="Azure.Identity" version="1.3.0" />
         <dependency id="Microsoft.Identity.Client" version="4.22.0" exclude="Compile"/>
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" />
@@ -78,7 +78,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
         <dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
       </group>
       <group targetFramework="netstandard2.1">
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="4.0.0" exclude="Compile" />
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.0.0-preview1.22062.1" exclude="Compile" />
         <dependency id="Azure.Identity" version="1.3.0" />
         <dependency id="Microsoft.Identity.Client" version="4.22.0" exclude="Compile"/>
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" />

From e7931b534e06d5eae68421c3eb5d7e52ee19d6e0 Mon Sep 17 00:00:00 2001
From: Kaur-Parminder <v-parkaur@microsoft.com>
Date: Mon, 7 Mar 2022 10:11:45 -0800
Subject: [PATCH 2/3] Revert "SNI Update"

This reverts commit 7aebf45737714e5fa2b1e8e7d3193b78f0d27da3.
---
 tools/props/Versions.props                  | 6 +++---
 tools/specs/Microsoft.Data.SqlClient.nuspec | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index d58b93e218..44002cbbae 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -6,7 +6,7 @@
     <!-- Should only be changed in future when a non-backwards compatible driver is released. -->
     <!-- Future Assembly Version values shall be Major.Minor.0.0; e.g. 4.0.0.0 -->
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
-    <NugetPackageVersion Condition="'$(NugetPackageVersion)' == ''">5.0.0-preview1.22062.1</NugetPackageVersion>
+    <NugetPackageVersion Condition="'$(NugetPackageVersion)' == ''">5.0.0-dev</NugetPackageVersion>
     <Version>$(NugetPackageVersion)</Version>
   </PropertyGroup>
   <PropertyGroup>
@@ -20,7 +20,7 @@
   </PropertyGroup>
   <!-- NetFx project dependencies -->
   <PropertyGroup>
-    <MicrosoftDataSqlClientSniVersion>5.0.0-preview1.22062.1</MicrosoftDataSqlClientSniVersion>    
+    <MicrosoftDataSqlClientSniVersion>4.0.0</MicrosoftDataSqlClientSniVersion>    
     <SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion>
     <SystemSecurityCryptographyPrimitivesVersion>4.3.0</SystemSecurityCryptographyPrimitivesVersion>
   </PropertyGroup>
@@ -38,7 +38,7 @@
   <!-- NetCore project dependencies -->
   <PropertyGroup>
     <MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
-    <MicrosoftDataSqlClientSNIRuntimeVersion>5.0.0-preview1.22062.1</MicrosoftDataSqlClientSNIRuntimeVersion>
+    <MicrosoftDataSqlClientSNIRuntimeVersion>4.0.0</MicrosoftDataSqlClientSNIRuntimeVersion>
     <SystemConfigurationConfigurationManagerVersion>5.0.0</SystemConfigurationConfigurationManagerVersion>
     <SystemDiagnosticsDiagnosticSourceVersion>5.0.0</SystemDiagnosticsDiagnosticSourceVersion>
     <SystemDiagnosticsPerformanceCounterVersion>5.0.0</SystemDiagnosticsPerformanceCounterVersion>
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index 7f5ed91f43..750ee2f48a 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -28,7 +28,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
     <tags>sqlclient microsoft.data.sqlclient</tags>
     <dependencies>
       <group targetFramework="net461">
-        <dependency id="Microsoft.Data.SqlClient.SNI" version="5.0.0-preview1.22062.1" />
+        <dependency id="Microsoft.Data.SqlClient.SNI" version="4.0.0" />
         <dependency id="Azure.Identity" version="1.3.0" />
         <dependency id="Microsoft.Identity.Client" version="4.22.0" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.8.0" />
@@ -42,7 +42,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
         <dependency id="System.Text.Encodings.Web" version="4.7.2" />
       </group>
       <group targetFramework="netcoreapp3.1">
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.0.0-preview1.22062.1" exclude="Compile" />
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="4.0.0" exclude="Compile" />
         <dependency id="Azure.Identity" version="1.3.0" />
         <dependency id="Microsoft.Identity.Client" version="4.22.0" exclude="Compile"/>
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" />
@@ -60,7 +60,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
         <dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
       </group>
       <group targetFramework="netstandard2.0">
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.0.0-preview1.22062.1" exclude="Compile" />
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="4.0.0" exclude="Compile" />
         <dependency id="Azure.Identity" version="1.3.0" />
         <dependency id="Microsoft.Identity.Client" version="4.22.0" exclude="Compile"/>
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" />
@@ -78,7 +78,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
         <dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
       </group>
       <group targetFramework="netstandard2.1">
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.0.0-preview1.22062.1" exclude="Compile" />
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="4.0.0" exclude="Compile" />
         <dependency id="Azure.Identity" version="1.3.0" />
         <dependency id="Microsoft.Identity.Client" version="4.22.0" exclude="Compile"/>
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" />

From ff1d0060b73dba55ed8b2fb54995f1a719ba785f Mon Sep 17 00:00:00 2001
From: Parminder Kaur <v-parkaur@microsoft.com>
Date: Fri, 13 Jan 2023 14:50:59 -0800
Subject: [PATCH 3/3] Update DNI version tp 5.1.0

---
 tools/props/Versions.props                  | 4 ++--
 tools/specs/Microsoft.Data.SqlClient.nuspec | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index 706275f08d..8732774055 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -20,7 +20,7 @@
   </PropertyGroup>
   <!-- NetFx project dependencies -->
   <PropertyGroup>
-    <MicrosoftDataSqlClientSniVersion>5.1.0-preview2.22311.2</MicrosoftDataSqlClientSniVersion>
+    <MicrosoftDataSqlClientSniVersion>5.1.0</MicrosoftDataSqlClientSniVersion>
   </PropertyGroup>
   <!-- NetFx and NetCore project dependencies -->
   <PropertyGroup>
@@ -35,7 +35,7 @@
   <!-- NetCore project dependencies -->
   <PropertyGroup>
     <MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
-    <MicrosoftDataSqlClientSNIRuntimeVersion>5.1.0-preview2.22311.2</MicrosoftDataSqlClientSNIRuntimeVersion>
+    <MicrosoftDataSqlClientSNIRuntimeVersion>5.1.0</MicrosoftDataSqlClientSNIRuntimeVersion>
     <SystemConfigurationConfigurationManagerVersion>6.0.1</SystemConfigurationConfigurationManagerVersion>
     <MicrosoftSqlServerServerVersion>1.0.0</MicrosoftSqlServerServerVersion>
     <SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion>
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index ced32c24e0..0c56f9f8c4 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -28,7 +28,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
     <tags>sqlclient microsoft.data.sqlclient</tags>
     <dependencies>
       <group targetFramework="net462">
-        <dependency id="Microsoft.Data.SqlClient.SNI" version="5.1.0-preview2.22311.2" />
+        <dependency id="Microsoft.Data.SqlClient.SNI" version="5.1.0" />
         <dependency id="Azure.Identity" version="1.7.0" />
         <dependency id="Microsoft.Identity.Client" version="4.47.2" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.24.0" />
@@ -39,7 +39,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
         <dependency id="System.Text.Encodings.Web" version="6.0.0" />
       </group>
       <group targetFramework="net6.0">
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.1.0-preview2.22311.2" exclude="Compile" />
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.1.0" exclude="Compile" />
         <dependency id="Azure.Identity" version="1.7.0" />
         <dependency id="Microsoft.Identity.Client" version="4.47.2" exclude="Compile"/>
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.24.0" />
@@ -54,7 +54,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
         <dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
       </group>
       <group targetFramework="netstandard2.0">
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.1.0-preview2.22311.2" exclude="Compile" />
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.1.0" exclude="Compile" />
         <dependency id="Azure.Identity" version="1.7.0" />
         <dependency id="Microsoft.Identity.Client" version="4.47.2" exclude="Compile"/>
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.24.0" />
@@ -71,7 +71,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
         <dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
       </group>
       <group targetFramework="netstandard2.1">
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.1.0-preview2.22311.2" exclude="Compile" />
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.1.0" exclude="Compile" />
         <dependency id="Azure.Identity" version="1.7.0" />
         <dependency id="Microsoft.Identity.Client" version="4.47.2" exclude="Compile"/>
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.24.0" />