From 38679394cc29a9f3c3180eafe3e92230f994e56e Mon Sep 17 00:00:00 2001 From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com> Date: Wed, 16 Apr 2025 15:21:07 -0300 Subject: [PATCH 1/3] - Addressing Dependabot alert #13: https://github.com/dotnet/SqlClient/security/dependabot/13 --- tools/props/Versions.props | 2 +- tools/props/VersionsNet8OrLater.props | 2 +- ...SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/props/Versions.props b/tools/props/Versions.props index d447d2dcb0..1576a8a7ce 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -57,7 +57,7 @@ [1.38.0,2.0.0) [4.5.0,5.0.0) - 6.0.1 + 6.0.3 diff --git a/tools/props/VersionsNet8OrLater.props b/tools/props/VersionsNet8OrLater.props index a5e1f52bb4..d3c94e6c39 100644 --- a/tools/props/VersionsNet8OrLater.props +++ b/tools/props/VersionsNet8OrLater.props @@ -4,6 +4,6 @@ 8.0.0 8.0.0 - 8.0.0 + 8.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 33be2b3409..622ea71136 100644 --- a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec +++ b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec @@ -28,25 +28,25 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti - + - + - + - + From 73c0374447dafb6fff5fd3445f829bf652c546b8 Mon Sep 17 00:00:00 2001 From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com> Date: Thu, 17 Apr 2025 07:54:24 -0300 Subject: [PATCH 2/3] Fixed MDS version in AKV .nuspec. --- ...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 622ea71136..5ea52f3a89 100644 --- a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec +++ b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec @@ -25,25 +25,25 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti sqlclient microsoft.data.sqlclient azurekeyvaultprovider akvprovider alwaysencrypted - + - + - + - + From f820037035efcba7f4987c83d2220a65bc19c0b1 Mon Sep 17 00:00:00 2001 From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com> Date: Thu, 17 Apr 2025 14:47:20 -0300 Subject: [PATCH 3/3] Added TSAUpload bug workaround to TSA options config. --- .config/tsaoptions.json | 2 +- eng/pipelines/dotnet-sqlclient-signing-pipeline.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/tsaoptions.json b/.config/tsaoptions.json index c9e3a2cfb6..077ef21c76 100644 --- a/.config/tsaoptions.json +++ b/.config/tsaoptions.json @@ -7,7 +7,7 @@ "repositoryName": "SqlClient", "codebaseName": "SqlClient", "allTools": true, - "template": "MSDATA_RevolutionR", + "template": "MSDATA_RevolutionR_Overloaded0", "language": "csharp", "includePathPatterns": "src/Microsoft.Data.SqlClient/*, src/Microsoft.SqlServer.Server/*, tools/*", "excludePathPatterns": "src/Microsoft.Data.SqlClient/tests/*" diff --git a/eng/pipelines/dotnet-sqlclient-signing-pipeline.yml b/eng/pipelines/dotnet-sqlclient-signing-pipeline.yml index ed00b63a34..64dbcc2573 100644 --- a/eng/pipelines/dotnet-sqlclient-signing-pipeline.yml +++ b/eng/pipelines/dotnet-sqlclient-signing-pipeline.yml @@ -46,7 +46,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time - name: MDS_PackageRef_Version displayName: 'MDS package version of AKV Provider (build AKV)' type: string - default: 5.1.5 + default: 5.2.2 - name: CurrentNetFxVersion displayName: 'Lowest supported .NET Framework version (MDS validation)'