Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb7fa2da

Browse files
authored
Merge branch 'main' into tests/common-project-fixtures
2 parents87a461c +e649a7c commitb7fa2da

File tree

37 files changed

+490
-266
lines changed

37 files changed

+490
-266
lines changed

‎eng/pipelines/common/templates/steps/update-nuget-config-local-feed-step.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,12 @@ steps:
6767
$parent_xpath = '/Project/ItemGroup/PackageReference[@Include="Microsoft.Data.SqlClient"]'
6868
$node = $Doc.SelectSingleNode($parent_xpath)
6969
70-
if($node -ne $null){
71-
$node.Version="${{parameters.nugetPackageVersion }}"
72-
}
73-
else{
70+
if($node -eq $null){
7471
$packagerefnode = $doc.createelement("packagereference")
7572
$value = $doc.selectsinglenode('/project/itemgroup/projectreference')
7673
$attrinclude = $doc.createattribute("include")
7774
$attrinclude.value = "microsoft.data.sqlclient"
78-
$attrversion = $doc.createattribute("version")
79-
$attrversion.value = "${{parameters.nugetPackageVersion }}"
8075
$packagerefnode.attributes.append($attrinclude)
81-
$packagerefnode.attributes.append($attrversion)
8276
$parentNode.AppendChild($packageRefNode)
8377
}
8478

‎src/Directory.Build.props

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
2727
</PropertyGroup>
2828
<ItemGroupCondition="$(BuildForRelease) == 'true'">
29-
<SourceRootInclude="$(MSBuildThisFileDirectory)/"/>
30-
<EmbeddedFilesInclude="$(GeneratedAssemblyInfoFile)"/>
29+
<SourceRootInclude="$(MSBuildThisFileDirectory)/"/>
30+
<EmbeddedFilesInclude="$(GeneratedAssemblyInfoFile)"/>
3131
</ItemGroup>
3232
<PropertyGroupCondition="$(Configuration.Contains('Debug'))">
3333
<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
@@ -69,7 +69,7 @@
6969
<PropertyGroupCondition="'$(BuildSimulator)' == 'true'">
7070
<DefineConstants>$(DefineConstants);ENCLAVE_SIMULATOR</DefineConstants>
7171
</PropertyGroup>
72-
72+
7373
<!-- NuGet Audit Settings-->
7474
<PropertyGroupCondition="'$(TF_BUILD)' == 'true'">
7575
<!--
@@ -100,11 +100,10 @@
100100

101101
<!-- Provides Version properties-->
102102
<ImportProject="$(ToolsDir)props\Versions.props" />
103-
<ImportCondition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))"Project="$(ToolsDir)props\VersionsNet9OrLater.props" />
104103
<!-- Provides Tool properties-->
105104
<ImportProject="$(ToolsDir)props\Tools.props" />
106105
<!-- Provides Build properties-->
107-
<ImportProject="$(ToolsDir)props\AssemblyInfo.props" />
106+
<ImportProject="$(ToolsDir)props\AssemblyInfo.props" />
108107
<ImportProject="$(ToolsDir)props\AssemblyRef.props" />
109108
<ImportProject="$(ToolsDir)targets\RepositoryInfo.targets" />
110109

‎src/Directory.Packages.props

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
<!-- NetFx project dependencies-->
7+
<ItemGroup>
8+
<PackageVersionInclude="Microsoft.Data.SqlClient.SNI"Version="6.0.2" />
9+
<PackageVersionInclude="System.Buffers"Version="4.5.1" />
10+
<PackageVersionInclude="System.Memory"Version="4.5.5" />
11+
<PackageVersionInclude="System.Text.Encodings.Web"Version="8.0.0" />
12+
<PackageVersionInclude="System.Text.Json"Version="8.0.5" />
13+
<PackageVersionInclude="System.Data.Common"Version="4.3.0" />
14+
</ItemGroup>
15+
<!-- NetFx and NetCore project dependencies-->
16+
<ItemGroup>
17+
<PackageVersionInclude="Azure.Identity"Version="1.13.2" />
18+
<PackageVersionInclude="Microsoft.IdentityModel.JsonWebTokens"Version="7.7.1" />
19+
<PackageVersionInclude="Microsoft.IdentityModel.Protocols.OpenIdConnect"Version="7.7.1" />
20+
<PackageVersionInclude="System.Runtime.InteropServices.RuntimeInformation"Version="4.3.0" />
21+
</ItemGroup>
22+
<!-- NetCore project dependencies-->
23+
<ItemGroup>
24+
<PackageVersionInclude="Microsoft.Data.SqlClient.SNI.runtime"Version="6.0.2" />
25+
<PackageVersionInclude="Microsoft.SqlServer.Server"Version="1.0.0" />
26+
</ItemGroup>
27+
<!-- AKV Provider project dependencies-->
28+
<ItemGroup>
29+
<PackageVersionInclude="Azure.Core"Version="[1.44.1,2.0.0)" />
30+
<PackageVersionInclude="Azure.Security.KeyVault.Keys"Version="[4.7.0,5.0.0)" />
31+
</ItemGroup>
32+
<!-- Test Project Dependencies-->
33+
<ItemGroup>
34+
<PackageVersionInclude="BenchmarkDotNet"Version="0.14.0" />
35+
<PackageVersionInclude="Microsoft.DotNet.PlatformAbstractions"Version="3.1.6" />
36+
<PackageVersionInclude="Microsoft.DotNet.RemoteExecutor"Version="10.0.0-beta.25164.6" />
37+
<PackageVersionInclude="Microsoft.DotNet.XUnitExtensions"Version="10.0.0-beta.25164.6" />
38+
<PackageVersionInclude="Microsoft.NET.Test.Sdk"Version="17.11.1" />
39+
<PackageVersionInclude="Microsoft.SqlServer.SqlManagementObjects"Version="172.76.0" />
40+
<PackageVersionInclude="Microsoft.SqlServer.Types"Version="160.1000.6" />
41+
<PackageVersionInclude="Microsoft.VisualStudio.Azure.Containers.Tools.Targets"Version="1.19.5" />
42+
<PackageVersionInclude="Microsoft.Win32.Registry"Version="5.0.0" />
43+
<PackageVersionInclude="Newtonsoft.Json"Version="13.0.3" />
44+
<PackageVersionInclude="System.Data.Odbc"Version="8.0.1" />
45+
<PackageVersionInclude="System.Security.Principal.Windows"Version="5.0.0" />
46+
<PackageVersionInclude="System.ServiceProcess.ServiceController"Version="8.0.1" />
47+
<PackageVersionInclude="System.Text.Encoding.CodePages"Version="6.0.0" />
48+
<PackageVersionInclude="xunit"Version="2.9.2" />
49+
<PackageVersionInclude="xunit.runner.visualstudio"Version="2.8.2" />
50+
<PackageVersionInclude="xunit.runner.console"Version="2.9.2" />
51+
</ItemGroup>
52+
53+
<!-- Target framework specific dependencies-->
54+
<ItemGroupCondition="'$(TargetFramework)' == 'net9.0'">
55+
<PackageVersionInclude="Microsoft.Bcl.Cryptography"Version="9.0.5" />
56+
<PackageVersionInclude="Microsoft.Extensions.Caching.Memory"Version="9.0.5" />
57+
<PackageVersionInclude="System.Security.Cryptography.Pkcs"Version="9.0.5" />
58+
<PackageVersionInclude="System.Configuration.ConfigurationManager"Version="9.0.5" />
59+
<PackageVersionInclude="Microsoft.Extensions.Hosting"Version="9.0.5" />
60+
</ItemGroup>
61+
<ItemGroupCondition="'$(TargetFramework)' != 'net9.0'">
62+
<PackageVersionInclude="Microsoft.Bcl.Cryptography"Version="8.0.0" />
63+
<PackageVersionInclude="Microsoft.Extensions.Caching.Memory"Version="8.0.1" />
64+
<PackageVersionInclude="System.Security.Cryptography.Pkcs"Version="8.0.1" />
65+
<PackageVersionInclude="System.Configuration.ConfigurationManager"Version="8.0.1" />
66+
<PackageVersionInclude="Microsoft.Extensions.Hosting"Version="8.0.1" />
67+
</ItemGroup>
68+
</Project>

‎src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1717
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1818
</PropertyGroup>
19-
<!--Generating Strong Name-->
19+
<!--Generating Strong Name-->
2020
<PropertyGroupCondition="'$(CDP_BUILD_TYPE)'=='Official'">
2121
<SignAssembly>true</SignAssembly>
2222
<KeyFile>$(SigningKeyPath)</KeyFile>
@@ -30,16 +30,16 @@
3030
<ItemGroup>
3131
<EmbeddedFilesInclude="$(GeneratedAssemblyInfoFile)" />
3232
<EmbeddedFilesInclude="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
33-
</ItemGroup>
33+
</ItemGroup>
3434
<ItemGroup>
3535
<ProjectReferenceCondition="'$(TargetGroup)'=='netcoreapp' AND !$(ReferenceType.Contains('Package'))"Include="$(NetCoreSource)src\Microsoft.Data.SqlClient.csproj" />
3636
<ProjectReferenceCondition="'$(TargetGroup)'=='netfx' AND !$(ReferenceType.Contains('Package'))"Include="$(NetFxSource)src\Microsoft.Data.SqlClient.csproj" />
37-
<PackageReferenceCondition="$(ReferenceType.Contains('Package'))"Include="Microsoft.Data.SqlClient"Version="$(TestMicrosoftDataSqlClientVersion)"/>
37+
<PackageReferenceCondition="$(ReferenceType.Contains('Package'))"Include="Microsoft.Data.SqlClient" />
3838
</ItemGroup>
3939
<ItemGroup>
40-
<PackageReferenceInclude="Azure.Core"Version="$(AzureCoreVersion)"/>
41-
<PackageReferenceInclude="System.Text.Encodings.Web"Version="$(SystemTextEncodingsWebVersion)"/>
42-
<PackageReferenceInclude="Azure.Security.KeyVault.Keys"Version="$(AzureSecurityKeyVaultKeysVersion)"/>
43-
<PackageReferenceInclude="Microsoft.Extensions.Caching.Memory"Version="$(MicrosoftExtensionsCachingMemoryVersion)"/>
40+
<PackageReferenceInclude="Azure.Core" />
41+
<PackageReferenceInclude="System.Text.Encodings.Web" />
42+
<PackageReferenceInclude="Azure.Security.KeyVault.Keys" />
43+
<PackageReferenceInclude="Microsoft.Extensions.Caching.Memory" />
4444
</ItemGroup>
4545
</Project>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<ImportProject="..\..\Directory.Packages.props" />
3+
<ItemGroupCondition="$(ReferenceType) == 'Package'">
4+
<PackageVersionInclude="Microsoft.Data.SqlClient"Version="$(TestMicrosoftDataSqlClientVersion)" />
5+
</ItemGroup>
6+
</Project>

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<PropertyGroupCondition="$(CDP_BUILD_TYPE)!=Official">
2323
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
2424
</PropertyGroup>
25-
25+
2626
<ItemGroup>
2727
<CompileInclude="Microsoft.Data.SqlClient.cs" />
2828
<CompileInclude="Microsoft.Data.SqlClient.Manual.cs" />
@@ -32,17 +32,17 @@
3232
<CompileInclude="..\..\ref\Microsoft.Data.SqlClient.Batch.NetCoreApp.cs" />
3333
</ItemGroup>
3434
<ItemGroup>
35-
<PackageReferenceInclude="Microsoft.Data.SqlClient.SNI.runtime"Version="$(MicrosoftDataSqlClientSNIRuntimeVersion)"/>
36-
<PackageReferenceInclude="Microsoft.Extensions.Caching.Memory"Version="$(MicrosoftExtensionsCachingMemoryVersion)"/>
37-
<PackageReferenceInclude="Microsoft.SqlServer.Server"Version="$(MicrosoftSqlServerServerVersion)"/>
38-
<PackageReferenceInclude="Azure.Identity"Version="$(AzureIdentityVersion)"/>
39-
<PackageReferenceInclude="Microsoft.IdentityModel.Protocols.OpenIdConnect"Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)"/>
40-
<PackageReferenceInclude="Microsoft.IdentityModel.JsonWebTokens"Version="$(MicrosoftIdentityModelJsonWebTokensVersion)"/>
41-
<PackageReferenceInclude="System.Configuration.ConfigurationManager"Version="$(SystemConfigurationConfigurationManagerVersion)"/>
42-
<PackageReferenceInclude="System.Security.Cryptography.Pkcs"Version="$(SystemSecurityCryptographyPkcsVersion)"/>
43-
<PackageReferenceInclude="Microsoft.Bcl.Cryptography"Version="$(MicrosoftBclCryptographyVersion)"/>
35+
<PackageReferenceInclude="Microsoft.Data.SqlClient.SNI.runtime" />
36+
<PackageReferenceInclude="Microsoft.Extensions.Caching.Memory" />
37+
<PackageReferenceInclude="Microsoft.SqlServer.Server" />
38+
<PackageReferenceInclude="Azure.Identity" />
39+
<PackageReferenceInclude="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
40+
<PackageReferenceInclude="Microsoft.IdentityModel.JsonWebTokens" />
41+
<PackageReferenceInclude="System.Configuration.ConfigurationManager" />
42+
<PackageReferenceInclude="System.Security.Cryptography.Pkcs" />
43+
<PackageReferenceInclude="Microsoft.Bcl.Cryptography" />
4444
</ItemGroup>
45-
45+
4646
<ImportProject="$(ToolsDir)targets\ResolveContract.targets"Condition="'$(OSGroup)' == 'AnyOS' AND '$(TargetGroup)' != 'netcoreapp'" />
4747
<ImportProject="$(ToolsDir)targets\NotSupported.targets"Condition="'$(OSGroup)' == 'AnyOS' AND '$(TargetGroup)' != 'netcoreapp'" />
4848
<!-- Trim docs for intellisense for ref folder (netcore/netstandard) but not when building for lib folder (only netstandard is built for lib from here)-->

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

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1818
<Product>Core $(BaseProduct)</Product>
1919
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
20-
<NoWarn>$(NoWarn);IL2026;IL2057;IL2072;IL2075</NoWarn>
20+
<NoWarn>$(NoWarn);IL2026;IL2057;IL2072;IL2075</NoWarn>
2121
<RootNamespace />
2222
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
2323
</PropertyGroup>
@@ -39,7 +39,7 @@
3939
<ItemGroup>
4040
<EmbeddedFilesInclude="$(GeneratedAssemblyInfoFile)" />
4141
<EmbeddedFilesInclude="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
42-
</ItemGroup>
42+
</ItemGroup>
4343
<!-- Contains common items shared between Unix and Windows-->
4444
<ItemGroupCondition="'$(OSGroup)' != 'AnyOS'">
4545
<CompileInclude="$(CommonSourceRoot)\Interop\Common\Sni\SniErrors.cs">
@@ -188,7 +188,7 @@
188188
</Compile>
189189
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs">
190190
<Link>Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs</Link>
191-
</Compile>
191+
</Compile>
192192
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ApplicationIntent.cs">
193193
<Link>Microsoft\Data\SqlClient\ApplicationIntent.cs</Link>
194194
</Compile>
@@ -608,7 +608,7 @@
608608
</Compile>
609609
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDbColumn.cs">
610610
<Link>Microsoft\Data\SqlClient\SqlDbColumn.cs</Link>
611-
</Compile>
611+
</Compile>
612612
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs">
613613
<Link>Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs</Link>
614614
</Compile>
@@ -818,7 +818,6 @@
818818
<CompileInclude="Microsoft\Data\SqlClient\TdsParserStateObjectManaged.cs" />
819819
<CompileInclude="Microsoft.Data.SqlClient.TypeForwards.cs" />
820820
</ItemGroup>
821-
822821
<!-- Windows only-->
823822
<ItemGroupCondition="'$(TargetsWindows)' == 'true'">
824823
<CompileInclude="$(CommonSourceRoot)\Interop\Windows\Handles\SafeLibraryHandle.netcore.cs">
@@ -965,11 +964,9 @@
965964
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.Windows.cs">
966965
<Link>Microsoft\Data\SqlTypes\SqlFileStream.Windows.cs</Link>
967966
</Compile>
968-
969967
<CompileInclude="Microsoft\Data\SqlClient\TdsParser.Windows.cs" />
970968
<CompileInclude="Microsoft\Data\SqlClient\TdsParserStateObjectNative.cs" />
971969
</ItemGroup>
972-
973970
<!-- Unix only-->
974971
<ItemGroupCondition="'$(TargetsUnix)' == 'true'">
975972
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.Unix.cs">
@@ -1008,10 +1005,8 @@
10081005
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.netcore.Unix.cs">
10091006
<Link>Microsoft\Data\SqlTypes\SqlFileStream.netcore.Unix.cs</Link>
10101007
</Compile>
1011-
10121008
<CompileInclude="Microsoft\Data\SqlClient\TdsParser.Unix.cs" />
10131009
</ItemGroup>
1014-
10151010
<!-- Resources-->
10161011
<ItemGroup>
10171012
<CompileInclude="$(CommonSourceRoot)Resources\StringsHelper.cs">
@@ -1039,20 +1034,19 @@
10391034
<Link>Resources\Microsoft.Data.SqlClient.SqlMetaData.xml</Link>
10401035
</EmbeddedResource>
10411036
</ItemGroup>
1042-
10431037
<!-- Package References Etc-->
10441038
<ItemGroup>
1045-
<PackageReferenceInclude="Microsoft.Data.SqlClient.SNI.runtime"Version="$(MicrosoftDataSqlClientSNIRuntimeVersion)"/>
1046-
<PackageReferenceInclude="Microsoft.Extensions.Caching.Memory"Version="$(MicrosoftExtensionsCachingMemoryVersion)"/>
1039+
<PackageReferenceInclude="Microsoft.Data.SqlClient.SNI.runtime" />
1040+
<PackageReferenceInclude="Microsoft.Extensions.Caching.Memory" />
10471041
<!-- Enable the project reference for debugging purposes.-->
10481042
<!-- <ProjectReference Include="$(SqlServerSourceCode)\Microsoft.SqlServer.Server.csproj" />-->
1049-
<PackageReferenceInclude="Microsoft.SqlServer.Server"Version="$(MicrosoftSqlServerServerVersion)"/>
1050-
<PackageReferenceInclude="Azure.Identity"Version="$(AzureIdentityVersion)"/>
1051-
<PackageReferenceInclude="Microsoft.IdentityModel.Protocols.OpenIdConnect"Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)"/>
1052-
<PackageReferenceInclude="Microsoft.IdentityModel.JsonWebTokens"Version="$(MicrosoftIdentityModelJsonWebTokensVersion)"/>
1053-
<PackageReferenceInclude="System.Configuration.ConfigurationManager"Version="$(SystemConfigurationConfigurationManagerVersion)"/>
1054-
<PackageReferenceInclude="System.Security.Cryptography.Pkcs"Version="$(SystemSecurityCryptographyPkcsVersion)"/>
1055-
<PackageReferenceInclude="Microsoft.Bcl.Cryptography"Version="$(MicrosoftBclCryptographyVersion)"/>
1043+
<PackageReferenceInclude="Microsoft.SqlServer.Server" />
1044+
<PackageReferenceInclude="Azure.Identity" />
1045+
<PackageReferenceInclude="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
1046+
<PackageReferenceInclude="Microsoft.IdentityModel.JsonWebTokens" />
1047+
<PackageReferenceInclude="System.Configuration.ConfigurationManager" />
1048+
<PackageReferenceInclude="System.Security.Cryptography.Pkcs" />
1049+
<PackageReferenceInclude="Microsoft.Bcl.Cryptography" />
10561050
</ItemGroup>
10571051
<ImportProject="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
10581052
<ImportProject="$(ToolsDir)targets\ResolveContract.targets"Condition="'$(OSGroup)' == 'AnyOS'" />

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2813,7 +2813,7 @@ private TdsOperationStatus TryProcessEnvChange(int tokenLength, TdsParserStateOb
28132813
// UTF8 collation
28142814
if (env._newCollation.IsUTF8)
28152815
{
2816-
_defaultEncoding =Encoding.UTF8;
2816+
_defaultEncoding =s_utf8EncodingWithoutBom;
28172817
}
28182818
else
28192819
{
@@ -4324,7 +4324,7 @@ internal TdsOperationStatus TryProcessReturnValue(int length,
43244324

43254325
if (rec.collation.IsUTF8)
43264326
{ // UTF8 collation
4327-
rec.encoding =Encoding.UTF8;
4327+
rec.encoding =s_utf8EncodingWithoutBom;
43284328
}
43294329
else
43304330
{
@@ -5181,7 +5181,7 @@ private TdsOperationStatus TryProcessTypeInfo(TdsParserStateObject stateObj, Sql
51815181

51825182
if (col.collation.IsUTF8)
51835183
{ // UTF8 collation
5184-
col.encoding =Encoding.UTF8;
5184+
col.encoding =s_utf8EncodingWithoutBom;
51855185
}
51865186
else
51875187
{
@@ -5986,7 +5986,7 @@ private TdsOperationStatus TryReadSqlStringValue(SqlBuffer value, byte type, int
59865986
break;
59875987

59885988
case TdsEnums.SQLJSON:
5989-
encoding =Encoding.UTF8;
5989+
encoding =s_utf8EncodingWithoutBom;
59905990
string jsonStringValue;
59915991
result = stateObj.TryReadStringWithEncoding(length, encoding, isPlp, out jsonStringValue);
59925992
if (result != TdsOperationStatus.Done)
@@ -11052,7 +11052,7 @@ internal Task WriteBulkCopyValue(object value, SqlMetaDataPriv metadata, TdsPars
1105211052
// Replace encoding if it is UTF8
1105311053
if (metadata.collation.IsUTF8)
1105411054
{
11055-
_defaultEncoding =Encoding.UTF8;
11055+
_defaultEncoding =s_utf8EncodingWithoutBom;
1105611056
}
1105711057

1105811058
_defaultCollation = metadata.collation;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp