Skip to content

Commit f7313f8

Browse files
author
SqlClient Azure DevOps
committed
Merge in 'main' changes
2 parents be5fba2 + e3cf414 commit f7313f8

17 files changed

+44
-19
lines changed

‎eng/pipelines/common/templates/steps/build-all-configurations-signed-dlls-step.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ steps:
3636
inputs:
3737
solution: '**/build.proj'
3838
configuration: '${{parameters.Configuration }}'
39-
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAllConfigurations -p:GenerateNuget=false -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk'
39+
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAllConfigurations -p:GenerateNuget=false -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk -p:DisableSourceLinkTranslation=false'
4040

4141
- ${{ if eq(parameters.product, 'AKV') }}:
4242
- task: MSBuild@1
4343
displayName: 'BuildAKVNetFx using build.proj'
4444
inputs:
4545
solution: '**/build.proj'
4646
configuration: '${{parameters.Configuration }}'
47-
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetFx -p:NugetPackageVersion=${{parameters.nugetPackageRefVersion }} -p:ReferenceType=Package -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk'
47+
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetFx -p:NugetPackageVersion=${{parameters.nugetPackageRefVersion }} -p:ReferenceType=Package -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk -p:DisableSourceLinkTranslation=false'
4848

4949
- task: MSBuild@1
5050
displayName: 'BuildAKVNetCoreAllOS using build.proj'
5151
inputs:
5252
solution: '**/build.proj'
5353
configuration: '${{parameters.Configuration }}'
54-
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetCoreAllOS -p:NugetPackageVersion=${{parameters.nugetPackageRefVersion }} -p:ReferenceType=Package -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk'
54+
msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetCoreAllOS -p:NugetPackageVersion=${{parameters.nugetPackageRefVersion }} -p:ReferenceType=Package -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk -p:DisableSourceLinkTranslation=false'

‎eng/pipelines/dotnet-sqlclient-ci-core.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,8 @@ stages:
380380
operatingSystem: Mac
381381
configProperties:
382382
# config.json properties
383-
TCPConnectionString: $(AZURE_DB_TCP_CONN_STRING)
384-
NPConnectionString: $(AZURE_DB_NP_CONN_STRING)
383+
TCPConnectionString: $(AZURE_DB_SP_TCP_CONN_STRING)
384+
NPConnectionString: $(AZURE_DB_SP_NP_CONN_STRING)
385385
SupportsIntegratedSecurity: false
386386
ManagedIdentitySupported: false
387387
LocalDbAppName: $(LocalDbAppName)

‎src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<!--Generating Strong Name-->
1414
<PropertyGroup Condition="$(CDP_BUILD_TYPE)==Official">
1515
<SignAssembly>true</SignAssembly>
16-
<DelaySign>true</DelaySign>
1716
<KeyFile>$(SigningKeyPath)</KeyFile>
1817
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
1918
</PropertyGroup>

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<!--Generating Strong Name-->
2424
<PropertyGroup Condition="$(CDP_BUILD_TYPE)==Official">
2525
<SignAssembly>true</SignAssembly>
26-
<DelaySign>true</DelaySign>
2726
<KeyFile>$(SigningKeyPath)</KeyFile>
2827
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
2928
</PropertyGroup>
@@ -625,6 +624,9 @@
625624
<Compile Include="$(CommonSourceRoot)System\Diagnostics\CodeAnalysis.cs">
626625
<Link>Common\System\Diagnostics\CodeAnalysis.cs</Link>
627626
</Compile>
627+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlDbTypeExtensions.cs">
628+
<Link>Microsoft\Data\SqlDbTypeExtensions.cs</Link>
629+
</Compile>
628630

629631
<Compile Include="Interop\SNINativeMethodWrapper.Common.cs" />
630632
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />

‎src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<!--Generating Strong Name-->
1212
<PropertyGroup Condition="$(CDP_BUILD_TYPE)==Official">
1313
<SignAssembly>true</SignAssembly>
14-
<DelaySign>true</DelaySign>
1514
<KeyFile>$(SigningKeyPath)</KeyFile>
1615
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
1716
</PropertyGroup>

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<!--Generating Strong Name-->
2222
<PropertyGroup Condition="$(CDP_BUILD_TYPE)==Official">
2323
<SignAssembly>true</SignAssembly>
24-
<DelaySign>true</DelaySign>
2524
<KeyFile>$(SigningKeyPath)</KeyFile>
2625
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
2726
</PropertyGroup>
@@ -646,6 +645,9 @@
646645
<Compile Include="$(CommonSourceRoot)\Microsoft\Data\ProviderBase\DbReferenceCollection.cs">
647646
<Link>Microsoft\Data\ProviderBase\DbReferenceCollection.cs</Link>
648647
</Compile>
648+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlDbTypeExtensions.cs">
649+
<Link>Microsoft\Data\SqlDbTypeExtensions.cs</Link>
650+
</Compile>
649651
</ItemGroup>
650652
<ItemGroup>
651653
<Compile Include="Common\src\Microsoft\Data\Common\NameValuePermission.cs" />

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlDbTypeExtensions.cs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
using System.Data;
6+
7+
namespace Microsoft.Data
8+
{
9+
/// <summary>
10+
/// Extensions for SqlDbType enum to enable its usage.
11+
/// </summary>
12+
public static class SqlDbTypeExtensions
13+
{
14+
/// <summary>
15+
/// Represents the JSON Data type in SQL Server.
16+
/// </summary>
17+
#if NET9_0_OR_GREATER
18+
public const SqlDbType Json = SqlDbType.Json;
19+
#else
20+
public const SqlDbType Json = (SqlDbType)35;
21+
#endif
22+
}
23+
}

‎src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4738,6 +4738,6 @@
47384738
<value>Das Zertifikat ist während der Überprüfung des Zertifikats nicht verfügbar.</value>
47394739
</data>
47404740
<data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
4741-
<value>The certificate provided by the server does not match the certificate provided by the ServerCertificate option.</value>
4741+
<value>Das vom Server bereitgestellte Zertifikat stimmt nicht mit dem Zertifikat überein, das über die ServerCertificate-Option bereitgestellt wurde.</value>
47424742
</data>
47434743
</root>

‎src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4738,6 +4738,6 @@
47384738
<value>El certificado no está disponible al validar el certificado.</value>
47394739
</data>
47404740
<data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
4741-
<value>The certificate provided by the server does not match the certificate provided by the ServerCertificate option.</value>
4741+
<value>El certificado proporcionado por el servidor no coincide con el certificado proporcionado por la opción ServerCertificate.</value>
47424742
</data>
47434743
</root>

‎src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4738,6 +4738,6 @@
47384738
<value>Certificat non disponible lors de sa validation.</value>
47394739
</data>
47404740
<data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
4741-
<value>The certificate provided by the server does not match the certificate provided by the ServerCertificate option.</value>
4741+
<value>Le certificat fourni par le serveur ne correspond pas au certificat fourni par l’option ServerCertificate.</value>
47424742
</data>
47434743
</root>

0 commit comments

Comments
 (0)