From abce12f654b9dd08a5c5b67f6318667265c61457 Mon Sep 17 00:00:00 2001 From: Javad Rahnama Date: Mon, 29 Jul 2024 10:30:59 -0700 Subject: [PATCH 1/2] [5.2] Fix | Enable source link translation (#2718) --- src/Directory.Build.props | 20 ++++++++++++++ tools/targets/RepositoryInfo.targets | 40 ++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 tools/targets/RepositoryInfo.targets diff --git a/src/Directory.Build.props b/src/Directory.Build.props index afcf503118..d492de4b07 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -67,6 +67,24 @@ $(DefineConstants);ENCLAVE_SIMULATOR + + + portable + true + false + true + true + false + + + true + + + + + + + @@ -74,4 +92,6 @@ + + diff --git a/tools/targets/RepositoryInfo.targets b/tools/targets/RepositoryInfo.targets new file mode 100644 index 0000000000..dec4f95206 --- /dev/null +++ b/tools/targets/RepositoryInfo.targets @@ -0,0 +1,40 @@ + + + + + + false + false + false + + + + + + + + <_TranslateUrlPattern>https://[^/]+/ADO.Net/_git/([^/-]+)-(.+) + <_TranslateUrlReplacement>https://github.com/dotnet/SqlClient + + + + + + $([System.Text.RegularExpressions.Regex]::Replace($(ScmRepositoryUrl), $(_TranslateUrlPattern), $(_TranslateUrlReplacement))) + + + + + + + $([System.Text.RegularExpressions.Regex]::Replace(%(SourceRoot.ScmRepositoryUrl), + $(_TranslateUrlPattern), $(_TranslateUrlReplacement))) + + + + + From 076838837bf585e7849d720c1b96419dadc6400d Mon Sep 17 00:00:00 2001 From: JRahnama Date: Fri, 16 Aug 2024 10:42:57 -0700 Subject: [PATCH 2/2] commit --- src/Directory.Build.props | 7 +------ ....SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj | 1 - .../netcore/src/Microsoft.Data.SqlClient.csproj | 1 - .../netfx/src/Microsoft.Data.SqlClient.csproj | 1 - .../Microsoft.SqlServer.Server.csproj | 3 --- tools/props/Versions.props | 1 - 6 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index d492de4b07..fffaabb889 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -78,12 +78,7 @@ true - - - - - - + diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj b/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj index 3f2267451e..52ffd81109 100644 --- a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj +++ b/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj @@ -22,7 +22,6 @@ - diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj index 08af099e22..59e6b8fbed 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -981,7 +981,6 @@ - diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj index 1a8063169c..2e7d8f086e 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj @@ -717,7 +717,6 @@ - $(SystemTextEncodingsWebVersion) diff --git a/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj b/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj index dafc9a4dbe..2808094a25 100644 --- a/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj +++ b/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj @@ -40,9 +40,6 @@ Strings.Designer.cs - - - diff --git a/tools/props/Versions.props b/tools/props/Versions.props index f6abe583f4..203f23b361 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -33,7 +33,6 @@ 6.35.0 4.5.1 6.0.0 - 1.1.0