From c5532b2ac8947d562aa55388d622bbb04c5b69d8 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Fri, 19 Jun 2026 12:42:58 -0300
Subject: [PATCH] Rename STRONG_NAME_SIGNING to ASSEMBLY_SIGNING and related
terminology
Rename the conditional-compilation constant from STRONG_NAME_SIGNING to
ASSEMBLY_SIGNING and align comments, log messages, and documentation from
"strong name" to "assembly signing" terminology across the shared build
configuration, SqlClient source, and tests.
---
build.proj | 6 +++---
eng/pipelines/ci/package/sqlclient-package.yml | 2 +-
eng/pipelines/onebranch/steps/build-buildproj-step.yml | 2 +-
src/Directory.Build.props | 6 +++---
...Client.AlwaysEncrypted.AzureKeyVaultProvider.csproj | 2 +-
.../Abstractions/src/Abstractions.csproj | 2 +-
.../src/SqlAuthenticationProvider.Internal.cs | 10 +++++-----
.../Abstractions/test/Abstractions.Test.csproj | 2 +-
.../notsupported/Microsoft.Data.SqlClient.csproj | 2 +-
.../ref/Microsoft.Data.SqlClient.csproj | 2 +-
.../src/Microsoft.Data.SqlClient.csproj | 2 +-
.../Data/SqlClient/SqlAuthenticationProviderManager.cs | 6 +++---
.../Common/Microsoft.Data.SqlClient.TestCommon.csproj | 2 +-
.../tests/FunctionalTests/SqlDataRecordTest.cs | 2 +-
.../ManualTests/SQL/UdtTest/SqlServerTypesTest.cs | 8 ++++----
.../Microsoft.Data.SqlClient.UnitTests.csproj | 2 +-
.../Microsoft.Data.SqlClient.TestUtilities.csproj | 2 +-
17 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/build.proj b/build.proj
index 9875098aa0..a37b83d9fd 100644
--- a/build.proj
+++ b/build.proj
@@ -247,8 +247,8 @@
$(TestFilters)&category!=signed
diff --git a/eng/pipelines/ci/package/sqlclient-package.yml b/eng/pipelines/ci/package/sqlclient-package.yml
index 72c65b364e..244993c23d 100644
--- a/eng/pipelines/ci/package/sqlclient-package.yml
+++ b/eng/pipelines/ci/package/sqlclient-package.yml
@@ -11,7 +11,7 @@
# - On pushes to GitHub main and ADO internal/main (batched)
# - Nightly at 00:00 UTC on both branches
#
-# On internal/main the strong-name signing key is downloaded and used to sign assemblies during the
+# On internal/main the assembly signing key is downloaded and used to sign assemblies during the
# build.
#
# GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO CI. We distinguish the two via
diff --git a/eng/pipelines/onebranch/steps/build-buildproj-step.yml b/eng/pipelines/onebranch/steps/build-buildproj-step.yml
index 4b18be369b..dcb66f6f15 100644
--- a/eng/pipelines/onebranch/steps/build-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/build-buildproj-step.yml
@@ -7,7 +7,7 @@
# This collection of steps to build a project via the build.proj. This will execute the "Build*"
# target in build.proj, where * is the packageShortName provided in the parameters.
#
-# Note: This differs from the pr/ci build-buildproj-step.yml in that it always strong-name signs
+# Note: This differs from the pr/ci build-buildproj-step.yml in that it always signs
# the assemblies, it only builds in package reference mode, and as such allows for version
# parameters to be provided.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index b3e0663fd3..7982e8f785 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -106,15 +106,15 @@
low
-
+
-
+
true
$(SigningKeyPath)
- $(DefineConstants);STRONG_NAME_SIGNING
+ $(DefineConstants);ASSEMBLY_SIGNING
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
index 203aabd1f5..9604565837 100644
--- a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
@@ -22,7 +22,7 @@
$(AkvProviderPackageVersion)
-
+
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj
index 0957180637..9eac7f6ecf 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj
@@ -32,7 +32,7 @@
$(AbstractionsPackageVersion)
-
+
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/SqlAuthenticationProvider.Internal.cs b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/SqlAuthenticationProvider.Internal.cs
index 693206261e..399e41927e 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/SqlAuthenticationProvider.Internal.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/SqlAuthenticationProvider.Internal.cs
@@ -46,15 +46,15 @@ static Internal()
{
// Try to load the SqlClient assembly.
- #if STRONG_NAME_SIGNING
+ #if ASSEMBLY_SIGNING
// The expected public key token of the SqlClient assembly, used to avoid invoking
- // APIs from imposter assemblies. This is the same token used by all assemblies in
- // this repository when strong-name signed.
+ // APIs from imposter assemblies. This is the public key token of the assembly
+ // signing key used for all of our driver assemblies.
byte[] expectedPublicKeyToken =
[ 0x23, 0xec, 0x7f, 0xc2, 0xd6, 0xea, 0xa4, 0xa5 ];
- // When strong-name signing is enabled, build a fully-qualified AssemblyName that
+ // When assembly signing is enabled, build a fully-qualified AssemblyName that
// includes the expected public key token.
Log($"Attempting to load SqlClient assembly={assemblyName} with " +
"expected public key token=" +
@@ -87,7 +87,7 @@ static Internal()
#else
- // Strong-name signing is disabled, so we cannot verify the public key token.
+ // Assembly signing is disabled, so we cannot verify the public key token.
Log($"Loading SqlClient assembly={assemblyName} without strong-name identity " +
"verification; ensure this assembly is from a trusted source");
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj
index 8a80c24a51..7ab085560e 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj
@@ -15,7 +15,7 @@
true
-
+
true
diff --git a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
index a9474613e6..d1c65d6add 100644
--- a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
@@ -83,7 +83,7 @@
$(SqlClientPackageVersion)
-
+
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
index 43aca3f1c1..7976d967fb 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
@@ -28,7 +28,7 @@
-
+
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 06eaf9e914..71e9c80215 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -60,7 +60,7 @@
$(SqlClientPackageVersion)
-
+
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs
index 4c77fbe8df..59a58b1e2a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs
@@ -61,9 +61,9 @@ static SqlAuthenticationProviderManager()
try
{
// Try to load our Azure extension.
- #if STRONG_NAME_SIGNING
+ #if ASSEMBLY_SIGNING
- // When strong-name signing is enabled, build a fully-qualified AssemblyName
+ // When assembly signing is enabled, build a fully-qualified AssemblyName
// that includes the expected public key token.
SqlClientEventSource.Log.TryTraceEvent(
@@ -109,7 +109,7 @@ static SqlAuthenticationProviderManager()
SqlClientEventSource.Log.TryTraceEvent(
nameof(SqlAuthenticationProviderManager) +
$": Attempting to load Azure extension assembly={azureAssemblyName} without " +
- "strong name verification; ensure this assembly is from a trusted source");
+ "strong-name identity verification; ensure this assembly is from a trusted source");
var assembly = Assembly.Load(azureAssemblyName);
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
index 67c5250748..aac951b190 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
@@ -14,7 +14,7 @@
false
-
+
true
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs
index b051f2cc26..6c31e23bd3 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs
@@ -334,7 +334,7 @@ public void GetChar_ThrowsNotSupported()
[Theory]
#if NETFRAMEWORK
- [Trait("Category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
+ [Trait("Category", "signed")] // Requires a signed Microsoft.SqlServer.Server assembly
#endif
[MemberData(
nameof(GetUdtTypeTestData.Get),
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
index 712d1ec2c6..911f2fbc58 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
@@ -37,7 +37,7 @@ public static class SqlServerTypesTest
// Synapse: Parse error at line: 1, column: 48: Incorrect syntax near 'hierarchyid'.
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
#if NETFRAMEWORK
- [Trait("Category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
+ [Trait("Category", "signed")] // Requires a signed Microsoft.SqlServer.Server assembly
#endif
public static void GetSchemaTableTest()
{
@@ -66,7 +66,7 @@ public static void GetSchemaTableTest()
// Synapse: Parse error at line: 1, column: 48: Incorrect syntax near 'hierarchyid'.
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
#if NETFRAMEWORK
- [Trait("Category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
+ [Trait("Category", "signed")] // Requires a signed Microsoft.SqlServer.Server assembly
#endif
public static void GetValueTest()
{
@@ -227,7 +227,7 @@ void ActAndAssert(int index, string expectedHexString)
// Synapse: Parse error at line: 1, column: 41: Incorrect syntax near 'hierarchyid'.
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
#if NETFRAMEWORK
- [Trait("Category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
+ [Trait("Category", "signed")] // Requires a signed Microsoft.SqlServer.Server assembly
#endif
public static void TestUdtSchemaMetadata()
{
@@ -384,7 +384,7 @@ private static string GetUdtName(Type udtClrType)
// Synapse: Parse error at line: 1, column: 8: Incorrect syntax near 'geometry'.
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
#if NETFRAMEWORK
- [Trait("Category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
+ [Trait("Category", "signed")] // Requires a signed Microsoft.SqlServer.Server assembly
#endif
public static void TestSqlServerTypesInsertAndRead()
{
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
index e09e49c967..cd95155822 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
@@ -36,7 +36,7 @@
-
+
true
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
index 05444fd022..3d4f6c41d7 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
@@ -3,7 +3,7 @@
netstandard2.0
-
+
true