Skip to content

Revert "Rebase with main" #2694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepaksa1 merged 1 commit into from
Jul 22, 2024
Merged

Revert "Rebase with main" #2694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,6 @@
<TargetGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))'=='.NETCoreApp'">netcoreapp</TargetGroup>
<Platforms>AnyCPU;x64;x86</Platforms>
</PropertyGroup>
<!--Generating Strong Name-->
<PropertyGroup Condition="$(CDP_BUILD_TYPE)==Official">
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<KeyFile>$(SigningKeyPath)</KeyFile>
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition="$(CDP_BUILD_TYPE)!=Official">
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
<Compile Include="Microsoft.Data.SqlClient.cs" />
<Compile Include="Microsoft.Data.SqlClient.Manual.cs" />
Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,12 @@
<RootNamespace />
</PropertyGroup>
<!--Generating Strong Name-->
<PropertyGroup Condition="$(CDP_BUILD_TYPE)==Official">
<PropertyGroup Condition="$(SigningKeyPath) != ''">
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<KeyFile>$(SigningKeyPath)</KeyFile>
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition="$(CDP_BUILD_TYPE)!=Official">
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
</PropertyGroup>
Expand Down
10 changes: 0 additions & 10 deletions src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,6 @@
<DocumentationFile>$(OutputPath)\Microsoft.Data.SqlClient.xml</DocumentationFile>
<Product>Framework $(BaseProduct)</Product>
<Configurations>Debug;Release;</Configurations>
</PropertyGroup>
<!--Generating Strong Name-->
<PropertyGroup Condition="$(CDP_BUILD_TYPE)==Official">
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<KeyFile>$(SigningKeyPath)</KeyFile>
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition="$(CDP_BUILD_TYPE)!=Official">
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Compile Include="Microsoft.Data.SqlClient.cs" />
Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,12 @@
<DefineConstants>$(DefineConstants);NETFRAMEWORK;</DefineConstants>
</PropertyGroup>
<!--Generating Strong Name-->
<PropertyGroup Condition="$(CDP_BUILD_TYPE)==Official">
<PropertyGroup Condition="$(SigningKeyPath) != ''">
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<KeyFile>$(SigningKeyPath)</KeyFile>
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition="$(CDP_BUILD_TYPE)!=Official">
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
</PropertyGroup>
<!-- Override debugtype=portable in Directory.Build.props for netfx -->
<PropertyGroup>
<DebugType>full</DebugType>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4738,6 +4738,6 @@
<value>Das Zertifikat ist während der Überprüfung des Zertifikats nicht verfügbar.</value>
</data>
<data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
<value>Das vom Server bereitgestellte Zertifikat stimmt nicht mit dem Zertifikat überein, das über die ServerCertificate-Option bereitgestellt wurde.</value>
<value>The certificate provided by the server does not match the certificate provided by the ServerCertificate option.</value>
</data>
</root>
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4738,6 +4738,6 @@
<value>El certificado no está disponible al validar el certificado.</value>
</data>
<data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
<value>El certificado proporcionado por el servidor no coincide con el certificado proporcionado por la opción ServerCertificate.</value>
<value>The certificate provided by the server does not match the certificate provided by the ServerCertificate option.</value>
</data>
</root>
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4738,6 +4738,6 @@
<value>Certificat non disponible lors de sa validation.</value>
</data>
<data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
<value>Le certificat fourni par le serveur ne correspond pas au certificat fourni par l’option ServerCertificate.</value>
<value>The certificate provided by the server does not match the certificate provided by the ServerCertificate option.</value>
</data>
</root>
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4738,6 +4738,6 @@
<value>인증서의 유효성을 검사하는 동안에는 인증서를 사용할 수 없습니다.</value>
</data>
<data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
<value>서버에서 제공하는 인증서가 ServerCertificate 옵션에서 제공하는 인증서와 일치하지 않습니다.</value>
<value>The certificate provided by the server does not match the certificate provided by the ServerCertificate option.</value>
</data>
</root>
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4738,6 +4738,6 @@
<value>Сертификат недоступен при проверке сертификата.</value>
</data>
<data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
<value>Сертификат, предоставленный сервером, не совпадает с сертификатом, указанным в параметре ServerCertificate.</value>
<value>The certificate provided by the server does not match the certificate provided by the ServerCertificate option.</value>
</data>
</root>
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4738,6 +4738,6 @@
<value>验证证书时证书不可用。</value>
</data>
<data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
<value>服务器提供的证书与 ServerCertificate 选项提供的证书不匹配。</value>
<value>The certificate provided by the server does not match the certificate provided by the ServerCertificate option.</value>
</data>
</root>
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4738,6 +4738,6 @@
<value>驗證在進行憑證驗證時無法使用。</value>
</data>
<data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
<value>伺服器提供的憑證不符合 ServerCertificate 選項所提供的憑證。</value>
<value>The certificate provided by the server does not match the certificate provided by the ServerCertificate option.</value>
</data>
</root>