From 6f981efc1e7454a2ad00f8c4a5448e15aa9c709d Mon Sep 17 00:00:00 2001 From: "Javad Rahnama (SIMBA TECHNOLOGIES INC)" Date: Thu, 11 Apr 2024 14:33:33 -0700 Subject: [PATCH 01/10] Change | Updating Azure.Identity version to 1.11.0 Addresses the issue mentioned at #2460 --- tools/props/Versions.props | 4 ++-- tools/specs/Microsoft.Data.SqlClient.nuspec | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/props/Versions.props b/tools/props/Versions.props index 222ad1c1e6..92dac9ab99 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -27,8 +27,8 @@ - 1.10.3 - 4.56.0 + 1.11.0 + 4.60.1 7.5.0 7.5.0 4.5.1 diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec index c2c4353999..678c714550 100644 --- a/tools/specs/Microsoft.Data.SqlClient.nuspec +++ b/tools/specs/Microsoft.Data.SqlClient.nuspec @@ -29,8 +29,8 @@ When using NuGet 3.x this package requires at least version 3.4. - - + + @@ -40,8 +40,8 @@ When using NuGet 3.x this package requires at least version 3.4. - - + + @@ -50,8 +50,8 @@ When using NuGet 3.x this package requires at least version 3.4. - - + + @@ -60,8 +60,8 @@ When using NuGet 3.x this package requires at least version 3.4. - - + + @@ -78,8 +78,8 @@ When using NuGet 3.x this package requires at least version 3.4. - - + + From cbeb61459daac70e125e08d429477e700ef5cceb Mon Sep 17 00:00:00 2001 From: "Javad Rahnama (SIMBA TECHNOLOGIES INC)" Date: Thu, 11 Apr 2024 16:19:00 -0700 Subject: [PATCH 02/10] updating azure.core --- tools/props/Versions.props | 2 +- ...SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/props/Versions.props b/tools/props/Versions.props index 92dac9ab99..9bc09b61bc 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -55,7 +55,7 @@ - [1.35.0,2.0.0) + [1.38.0,2.0.0) [4.4.0,5.0.0) 6.0.1 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 6c2ea69cbf..bc3a12fb52 100644 --- a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec +++ b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec @@ -26,25 +26,25 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti - + - + - + - + From 5faba7b81bda4cb7587e7e19566a316942663b02 Mon Sep 17 00:00:00 2001 From: "Javad Rahnama (SIMBA TECHNOLOGIES INC)" Date: Thu, 11 Apr 2024 19:16:59 -0700 Subject: [PATCH 03/10] updating to a range of versions --- tools/props/Versions.props | 10 ++--- tools/props/VersionsNet8OrLater.props | 6 +-- tools/specs/Microsoft.Data.SqlClient.nuspec | 50 ++++++++++----------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/tools/props/Versions.props b/tools/props/Versions.props index 9bc09b61bc..6cac70fbd6 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -27,10 +27,10 @@ - 1.11.0 - 4.60.1 - 7.5.0 - 7.5.0 + [1.11.0,2.0.0) + [4.60.1,5.0.0) + [7.5.0,8.0.0) + [7.5.0,8.0.0) 4.5.1 6.0.0 8.0.0 @@ -39,7 +39,7 @@ 5.0.0 5.2.0 - 6.0.1 + [6.0.1,7.0.0) 1.0.0 6.0.1 6.0.0 diff --git a/tools/props/VersionsNet8OrLater.props b/tools/props/VersionsNet8OrLater.props index 2c203223bd..fe5625ea5c 100644 --- a/tools/props/VersionsNet8OrLater.props +++ b/tools/props/VersionsNet8OrLater.props @@ -2,9 +2,9 @@ - 8.0.0 - 8.0.0 - 8.0.0 + [8.0.0,9.0.0) + [8.0.0,9.0.0) + [8.0.0,9.0.0) 9.0.0-beta.24157.1 2.6.3 diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec index 678c714550..aa0879ed6e 100644 --- a/tools/specs/Microsoft.Data.SqlClient.nuspec +++ b/tools/specs/Microsoft.Data.SqlClient.nuspec @@ -29,45 +29,45 @@ When using NuGet 3.x this package requires at least version 3.4. - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + @@ -78,13 +78,13 @@ When using NuGet 3.x this package requires at least version 3.4. - - - - + + + + - + From c24366e525651db190e4c60ec6a6141b6de1d388 Mon Sep 17 00:00:00 2001 From: "Javad Rahnama (SIMBA TECHNOLOGIES INC)" Date: Mon, 15 Apr 2024 08:49:41 -0700 Subject: [PATCH 04/10] Revert using a range of versions. --- tools/props/Versions.props | 14 +++--- tools/specs/Microsoft.Data.SqlClient.nuspec | 50 ++++++++++----------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/tools/props/Versions.props b/tools/props/Versions.props index 6cac70fbd6..722cd4e78c 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -27,10 +27,10 @@ - [1.11.0,2.0.0) - [4.60.1,5.0.0) - [7.5.0,8.0.0) - [7.5.0,8.0.0) + 1.11.0 + 4.60.1 + 7.5.0 + 7.5.0 4.5.1 6.0.0 8.0.0 @@ -39,7 +39,7 @@ 5.0.0 5.2.0 - [6.0.1,7.0.0) + 6.0.1 1.0.0 6.0.1 6.0.0 @@ -55,8 +55,8 @@ - [1.38.0,2.0.0) - [4.4.0,5.0.0) + 1.38.0 + 4.4.0 6.0.1 diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec index aa0879ed6e..678c714550 100644 --- a/tools/specs/Microsoft.Data.SqlClient.nuspec +++ b/tools/specs/Microsoft.Data.SqlClient.nuspec @@ -29,45 +29,45 @@ When using NuGet 3.x this package requires at least version 3.4. - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + @@ -78,13 +78,13 @@ When using NuGet 3.x this package requires at least version 3.4. - - - - + + + + - + From d593389409a7f4cecfc69ec8d29862c53fe3c5f7 Mon Sep 17 00:00:00 2001 From: "Javad Rahnama (SIMBA TECHNOLOGIES INC)" Date: Mon, 15 Apr 2024 08:51:12 -0700 Subject: [PATCH 05/10] Revert net8 version props --- tools/props/VersionsNet8OrLater.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/props/VersionsNet8OrLater.props b/tools/props/VersionsNet8OrLater.props index fe5625ea5c..2c203223bd 100644 --- a/tools/props/VersionsNet8OrLater.props +++ b/tools/props/VersionsNet8OrLater.props @@ -2,9 +2,9 @@ - [8.0.0,9.0.0) - [8.0.0,9.0.0) - [8.0.0,9.0.0) + 8.0.0 + 8.0.0 + 8.0.0 9.0.0-beta.24157.1 2.6.3 From cc636aa2806173353dd914799bc7a03da0017cfe Mon Sep 17 00:00:00 2001 From: "Javad Rahnama (SIMBA TECHNOLOGIES INC)" Date: Tue, 16 Apr 2024 17:02:04 -0700 Subject: [PATCH 06/10] Upgrading Azure.Identity to v1.11.1 --- tools/props/Versions.props | 4 ++-- tools/specs/Microsoft.Data.SqlClient.nuspec | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/props/Versions.props b/tools/props/Versions.props index 722cd4e78c..75f6e14f95 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -27,8 +27,8 @@ - 1.11.0 - 4.60.1 + 1.11.1 + 4.60.3 7.5.0 7.5.0 4.5.1 diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec index 678c714550..54db729218 100644 --- a/tools/specs/Microsoft.Data.SqlClient.nuspec +++ b/tools/specs/Microsoft.Data.SqlClient.nuspec @@ -29,8 +29,8 @@ When using NuGet 3.x this package requires at least version 3.4. - - + + @@ -40,8 +40,8 @@ When using NuGet 3.x this package requires at least version 3.4. - - + + @@ -50,8 +50,8 @@ When using NuGet 3.x this package requires at least version 3.4. - - + + @@ -60,8 +60,8 @@ When using NuGet 3.x this package requires at least version 3.4. - - + + @@ -78,8 +78,8 @@ When using NuGet 3.x this package requires at least version 3.4. - - + + From c2082b9ac722b85502dba8a1a0cfd227a06a747a Mon Sep 17 00:00:00 2001 From: Javad Rahnama Date: Thu, 25 Apr 2024 14:55:48 -0700 Subject: [PATCH 07/10] Apply suggestions from code review Co-authored-by: DavoudEshtehari <61173489+DavoudEshtehari@users.noreply.github.com> --- ...SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 bc3a12fb52..484a2f0729 100644 --- a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec +++ b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec @@ -26,25 +26,25 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti - + - + - + - + From d67479ed9c98ebdb1e244c58a73409ac515f71df Mon Sep 17 00:00:00 2001 From: "Javad Rahnama (SIMBA TECHNOLOGIES INC)" Date: Thu, 25 Apr 2024 15:16:09 -0700 Subject: [PATCH 08/10] Review comments --- tools/props/Versions.props | 2 +- ...SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/props/Versions.props b/tools/props/Versions.props index 75f6e14f95..91a3e2ae1f 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -55,7 +55,7 @@ - 1.38.0 + [1.38.0,2.0.0) 4.4.0 6.0.1 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 484a2f0729..bc3a12fb52 100644 --- a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec +++ b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec @@ -26,25 +26,25 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti - + - + - + - + From d5352131f9ceb9fc116165170b0a57efe2810d23 Mon Sep 17 00:00:00 2001 From: "Javad Rahnama (SIMBA TECHNOLOGIES INC)" Date: Thu, 25 Apr 2024 15:18:44 -0700 Subject: [PATCH 09/10] commit --- tools/props/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/props/Versions.props b/tools/props/Versions.props index 91a3e2ae1f..a03d675ce5 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -56,7 +56,7 @@ [1.38.0,2.0.0) - 4.4.0 + [4.5.0,5.0.0) 6.0.1 From ca8612641deae723b299fca1cdd49a084b4203f2 Mon Sep 17 00:00:00 2001 From: "Javad Rahnama (SIMBA TECHNOLOGIES INC)" Date: Thu, 25 Apr 2024 23:56:46 -0700 Subject: [PATCH 10/10] update Azure.Identity to 1.11.2 --- tools/props/Versions.props | 2 +- tools/specs/Microsoft.Data.SqlClient.nuspec | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/props/Versions.props b/tools/props/Versions.props index a03d675ce5..f0695ec8fc 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -27,7 +27,7 @@ - 1.11.1 + 1.11.2 4.60.3 7.5.0 7.5.0 diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec index 54db729218..ca4d10abf7 100644 --- a/tools/specs/Microsoft.Data.SqlClient.nuspec +++ b/tools/specs/Microsoft.Data.SqlClient.nuspec @@ -29,7 +29,7 @@ When using NuGet 3.x this package requires at least version 3.4. - + @@ -40,7 +40,7 @@ When using NuGet 3.x this package requires at least version 3.4. - + @@ -50,7 +50,7 @@ When using NuGet 3.x this package requires at least version 3.4. - + @@ -60,7 +60,7 @@ When using NuGet 3.x this package requires at least version 3.4. - + @@ -78,7 +78,7 @@ When using NuGet 3.x this package requires at least version 3.4. - +