From e57c497d35f46d17ba8bff29c8eb3d6c9841a3ad Mon Sep 17 00:00:00 2001
From: JRahnama <v-jarahn@microsoft.com>
Date: Mon, 29 Jan 2024 16:51:57 -0800
Subject: [PATCH 1/2] Updating AKV dependencies

---
 tools/props/VersionsNet8OrLater.props         |  2 ++
 ...waysEncrypted.AzureKeyVaultProvider.nuspec | 20 +++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tools/props/VersionsNet8OrLater.props b/tools/props/VersionsNet8OrLater.props
index cbc10bb875..56c5fae2c6 100644
--- a/tools/props/VersionsNet8OrLater.props
+++ b/tools/props/VersionsNet8OrLater.props
@@ -4,5 +4,7 @@
   <PropertyGroup>
     <SystemConfigurationConfigurationManagerVersion>8.0.0</SystemConfigurationConfigurationManagerVersion>
     <SystemRuntimeCachingVersion>8.0.0</SystemRuntimeCachingVersion>
+    <SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>8.0.0</MicrosoftExtensionsCachingMemoryVersion>
   </PropertyGroup>
 </Project>
diff --git a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
index 3bd1c26bbf..a3e4cf9dfc 100644
--- a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
+++ b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
@@ -25,31 +25,31 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
     <tags>sqlclient microsoft.data.sqlclient azurekeyvaultprovider akvprovider alwaysencrypted</tags>
     <dependencies>
       <group targetFramework="net462">
-        <dependency id="Microsoft.Data.SqlClient" version="5.1.2" />
+        <dependency id="Microsoft.Data.SqlClient" version="5.1.5" />
         <dependency id="Azure.Core" version="[1.35.0,2.0.0)" />
         <dependency id="System.Text.Encodings.Web" version="6.0.0" />
-        <dependency id="Azure.Security.KeyVault.Keys" version="[4.4.0,5.0.0)" />
+        <dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.1" />
       </group>
       <group targetFramework="net8.0">
-        <dependency id="Microsoft.Data.SqlClient" version="5.1.2" />
+        <dependency id="Microsoft.Data.SqlClient" version="5.1.5" />
         <dependency id="Azure.Core" version="[1.35.0,2.0.0)" />
-        <dependency id="System.Text.Encodings.Web" version="6.0.0" />
-        <dependency id="Azure.Security.KeyVault.Keys" version="[4.4.0,5.0.0)" />
-        <dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.1" />
+        <dependency id="System.Text.Encodings.Web" version="8.0.0" />
+        <dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
+        <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.0" />
       </group>
       <group targetFramework="net6.0">
-        <dependency id="Microsoft.Data.SqlClient" version="5.1.2" />
+        <dependency id="Microsoft.Data.SqlClient" version="5.1.5" />
         <dependency id="Azure.Core" version="[1.35.0,2.0.0)" />
         <dependency id="System.Text.Encodings.Web" version="6.0.0" />
-        <dependency id="Azure.Security.KeyVault.Keys" version="[4.4.0,5.0.0)" />
+        <dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.1" />
       </group>
       <group targetFramework="netstandard2.0">
-        <dependency id="Microsoft.Data.SqlClient" version="5.1.2" />
+        <dependency id="Microsoft.Data.SqlClient" version="5.1.5" />
         <dependency id="Azure.Core" version="[1.35.0,2.0.0)" />
         <dependency id="System.Text.Encodings.Web" version="6.0.0" />
-        <dependency id="Azure.Security.KeyVault.Keys" version="[4.4.0,5.0.0)" />
+        <dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.1" />
       </group>
     </dependencies>

From 815750e53f3272f7bbf6fca823b78ee1797a655c Mon Sep 17 00:00:00 2001
From: JRahnama <v-jarahn@microsoft.com>
Date: Tue, 30 Jan 2024 13:49:50 -0800
Subject: [PATCH 2/2] taking System.text.encodings.web out of direct
 dependencies

---
 tools/props/VersionsNet8OrLater.props                         | 1 -
 ...ata.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/tools/props/VersionsNet8OrLater.props b/tools/props/VersionsNet8OrLater.props
index 56c5fae2c6..a5e1f52bb4 100644
--- a/tools/props/VersionsNet8OrLater.props
+++ b/tools/props/VersionsNet8OrLater.props
@@ -4,7 +4,6 @@
   <PropertyGroup>
     <SystemConfigurationConfigurationManagerVersion>8.0.0</SystemConfigurationConfigurationManagerVersion>
     <SystemRuntimeCachingVersion>8.0.0</SystemRuntimeCachingVersion>
-    <SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
     <MicrosoftExtensionsCachingMemoryVersion>8.0.0</MicrosoftExtensionsCachingMemoryVersion>
   </PropertyGroup>
 </Project>
diff --git a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
index a3e4cf9dfc..65b3eb152c 100644
--- a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
+++ b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
@@ -27,28 +27,24 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
       <group targetFramework="net462">
         <dependency id="Microsoft.Data.SqlClient" version="5.1.5" />
         <dependency id="Azure.Core" version="[1.35.0,2.0.0)" />
-        <dependency id="System.Text.Encodings.Web" version="6.0.0" />
         <dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.1" />
       </group>
       <group targetFramework="net8.0">
         <dependency id="Microsoft.Data.SqlClient" version="5.1.5" />
         <dependency id="Azure.Core" version="[1.35.0,2.0.0)" />
-        <dependency id="System.Text.Encodings.Web" version="8.0.0" />
         <dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.0" />
       </group>
       <group targetFramework="net6.0">
         <dependency id="Microsoft.Data.SqlClient" version="5.1.5" />
         <dependency id="Azure.Core" version="[1.35.0,2.0.0)" />
-        <dependency id="System.Text.Encodings.Web" version="6.0.0" />
         <dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.1" />
       </group>
       <group targetFramework="netstandard2.0">
         <dependency id="Microsoft.Data.SqlClient" version="5.1.5" />
         <dependency id="Azure.Core" version="[1.35.0,2.0.0)" />
-        <dependency id="System.Text.Encodings.Web" version="6.0.0" />
         <dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.1" />
       </group>