Skip to content

Commit 22a4fa6

Browse files
lcheunglcilcheunglci
committed
Merge branch 'main' into MergeShared-SqlInfoMessageEvent
2 parents b591960 + c0fd7d2 commit 22a4fa6

File tree

16 files changed

+472
-1831
lines changed

16 files changed

+472
-1831
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public enum SqlAuthenticationMethod
172172
SqlPassword = 1
173173
}
174174
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlAuthenticationParameters.xml' path='docs/members[@name="SqlAuthenticationParameters"]/SqlAuthenticationParameters/*'/>
175-
public partial class SqlAuthenticationParameters
175+
public class SqlAuthenticationParameters
176176
{
177177
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlAuthenticationParameters.xml' path='docs/members[@name="SqlAuthenticationParameters"]/ctor/*'/>
178178
protected SqlAuthenticationParameters(Microsoft.Data.SqlClient.SqlAuthenticationMethod authenticationMethod, string serverName, string databaseName, string resource, string authority, string userId, string password, System.Guid connectionId, int connectionTimeout) { }

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@
163163
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SqlDataRecord.netcore.cs">
164164
<Link>Microsoft\Data\SqlClient\Server\SqlDataRecord.netcore.cs</Link>
165165
</Compile>
166+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs">
167+
<Link>Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs</Link>
168+
</Compile>
166169
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
167170
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
168171
</Compile>
@@ -265,6 +268,9 @@
265268
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlDependency.cs">
266269
<Link>Microsoft\Data\SqlClient\SqlDependency.cs</Link>
267270
</Compile>
271+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlEnums.cs">
272+
<Link>Microsoft\Data\SqlClient\SqlEnums.cs</Link>
273+
</Compile>
268274
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlErrorCollection.cs">
269275
<Link>Microsoft\Data\SqlClient\SqlErrorCollection.cs</Link>
270276
</Compile>
@@ -503,7 +509,6 @@
503509
</EmbeddedResource>
504510
<Compile Include="Microsoft\Data\SqlClient\AAsyncCallContext.cs" />
505511
<Compile Include="Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs" />
506-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs" />
507512
<Compile Include="Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs" />
508513
<Compile Include="Microsoft\Data\SqlClient\SqlDbColumn.cs" />
509514
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
@@ -556,7 +561,6 @@
556561
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyUtils.cs" />
557562
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.cs" />
558563
<Compile Include="Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs" />
559-
<Compile Include="Microsoft\Data\SqlClient\SqlEnums.cs" />
560564
<Compile Include="Microsoft\Data\SqlClient\SqlError.cs" />
561565
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlEnclaveSession.cs">
562566
<Link>Microsoft\Data\SqlClient\SqlEnclaveSession.cs</Link>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,7 +1246,7 @@ private void GetActualFieldsAndProperties(out List<SmiExtendedMetaData> fields,
12461246
hasDefault = true;
12471247
}
12481248

1249-
sort[i].Order = colMeta.SortOrder;
1249+
sort[i]._order = colMeta.SortOrder;
12501250
if (SortOrder.Unspecified != colMeta.SortOrder)
12511251
{
12521252
// SqlMetaData takes care of checking for negative sort ordinals with specified sort order
@@ -1263,7 +1263,7 @@ private void GetActualFieldsAndProperties(out List<SmiExtendedMetaData> fields,
12631263
throw SQL.DuplicateSortOrdinal(colMeta.SortOrdinal);
12641264
}
12651265

1266-
sort[i].SortOrdinal = colMeta.SortOrdinal;
1266+
sort[i]._sortOrdinal = colMeta.SortOrdinal;
12671267
sortOrdinalSpecified[colMeta.SortOrdinal] = true;
12681268
if (colMeta.SortOrdinal > maxSortOrdinal)
12691269
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10124,11 +10124,11 @@ private void WriteTvpOrderUnique(SmiExtendedMetaData metaData, TdsParserStateObj
1012410124
// Add appropriate SortOrder flag
1012510125
byte flags = 0;
1012610126
SmiOrderProperty.SmiColumnOrder columnOrder = orderProperty[i];
10127-
if (SortOrder.Ascending == columnOrder.Order)
10127+
if (SortOrder.Ascending == columnOrder._order)
1012810128
{
1012910129
flags = TdsEnums.TVP_ORDERASC_FLAG;
1013010130
}
10131-
else if (SortOrder.Descending == columnOrder.Order)
10131+
else if (SortOrder.Descending == columnOrder._order)
1013210132
{
1013310133
flags = TdsEnums.TVP_ORDERDESC_FLAG;
1013410134
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public enum SqlAuthenticationMethod
128128
SqlPassword = 1
129129
}
130130
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlAuthenticationParameters.xml' path='docs/members[@name="SqlAuthenticationParameters"]/SqlAuthenticationParameters/*'/>
131-
public partial class SqlAuthenticationParameters
131+
public class SqlAuthenticationParameters
132132
{
133133
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlAuthenticationParameters.xml' path='docs/members[@name="SqlAuthenticationParameters"]/ctor/*'/>
134134
protected SqlAuthenticationParameters(Microsoft.Data.SqlClient.SqlAuthenticationMethod authenticationMethod, string serverName, string databaseName, string resource, string authority, string userId, string password, System.Guid connectionId, int connectionTimeout) { }

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,9 @@
240240
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ValueUtilsSmi.netfx.cs">
241241
<Link>Microsoft\Data\SqlClient\Server\ValueUtilsSmi.netfx.cs</Link>
242242
</Compile>
243+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs">
244+
<Link>Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs</Link>
245+
</Compile>
243246
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
244247
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
245248
</Compile>
@@ -354,6 +357,9 @@
354357
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlEnclaveSession.cs">
355358
<Link>Microsoft\Data\SqlClient\SqlEnclaveSession.cs</Link>
356359
</Compile>
360+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlEnums.cs">
361+
<Link>Microsoft\Data\SqlClient\SqlEnums.cs</Link>
362+
</Compile>
357363
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlErrorCollection.cs">
358364
<Link>Microsoft\Data\SqlClient\SqlErrorCollection.cs</Link>
359365
</Compile>
@@ -547,7 +553,6 @@
547553
<Compile Include="Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs" />
548554
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyListener.cs" />
549555
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyUtils.cs" />
550-
<Compile Include="Microsoft\Data\SqlClient\SqlEnums.cs" />
551556
<Compile Include="Microsoft\Data\SqlClient\SqlError.cs" />
552557
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnection.cs" />
553558
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionSmi.cs" />
@@ -604,7 +609,6 @@
604609
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventStream.cs" />
605610
<Compile Include="Microsoft\Data\SqlClient\Server\SmiExecuteType.cs" />
606611
<Compile Include="Microsoft\Data\SqlClient\Server\SmiLink.cs" />
607-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs" />
608612
<Compile Include="Microsoft\Data\SqlClient\Server\SmiRequestExecutor.cs" />
609613
<Compile Include="Microsoft\Data\SqlClient\Server\SmiStream.cs" />
610614
<Compile Include="Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs" />
@@ -687,4 +691,4 @@
687691
<Import Project="$(NetFxSource)tools\targets\GenerateThisAssemblyCs.targets" />
688692
<Import Project="$(NetFxSource)tools\targets\GenerateAssemblyRef.targets" />
689693
<Import Project="$(NetFxSource)tools\targets\GenerateAssemblyInfo.targets" />
690-
</Project>
694+
</Project>

0 commit comments

Comments
 (0)