Skip to content

Commit b9a96d8

Browse files
authored
Merge some metadata classes (#753)
1 parent b0cb614 commit b9a96d8

File tree

10 files changed

+24
-1973
lines changed

10 files changed

+24
-1973
lines changed

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,18 @@
246246
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SignatureVerificationCache.cs">
247247
<Link>Microsoft\Data\SqlClient\SignatureVerificationCache.cs</Link>
248248
</Compile>
249+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\TdsValueSetter.cs">
250+
<Link>Microsoft\Data\SqlClient\TdsValueSetter.cs</Link>
251+
</Compile>
252+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\TdsParameterSetter.cs">
253+
<Link>Microsoft\Data\SqlClient\TdsParameterSetter.cs</Link>
254+
</Compile>
255+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs">
256+
<Link>Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs</Link>
257+
</Compile>
258+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiRecordBuffer.cs">
259+
<Link>Microsoft\Data\SqlClient\Server\SmiRecordBuffer.cs</Link>
260+
</Compile>
249261
</ItemGroup>
250262
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard' OR '$(TargetGroup)' == 'netcoreapp' OR '$(IsUAPAssembly)' == 'true'">
251263
<Compile Include="Microsoft.Data.SqlClient.TypeForwards.cs" />
@@ -287,7 +299,6 @@
287299
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventSink_Default.cs" />
288300
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaData.cs" />
289301
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs" />
290-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiRecordBuffer.cs" />
291302
<Compile Include="Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs" />
292303
<Compile Include="Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs" />
293304
<Compile Include="Microsoft\Data\SqlClient\Server\SqlDataRecord.cs" />
@@ -401,15 +412,12 @@
401412
<Compile Include="Microsoft\Data\SqlClient\SqlUdtInfo.cs" />
402413
<Compile Include="Microsoft\Data\SqlClient\SqlUtil.cs" />
403414
<Compile Include="Microsoft\Data\SqlClient\TdsEnums.cs" />
404-
<Compile Include="Microsoft\Data\SqlClient\TdsParameterSetter.cs" />
405415
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
406416
<Compile Include="Microsoft\Data\SqlClient\TdsParser.RegisterEncoding.cs" />
407417
<Compile Include="Microsoft\Data\SqlClient\TdsParserHelperClasses.cs" />
408418
<Compile Include="Microsoft\Data\SqlClient\TdsParserSessionPool.cs" />
409419
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObject.cs" />
410420
<Compile Include="Microsoft\Data\SqlClient\TdsParserStaticMethods.cs" />
411-
<Compile Include="Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs" />
412-
<Compile Include="Microsoft\Data\SqlClient\TdsValueSetter.cs" />
413421
<Compile Include="$(CommonPath)\Microsoft\Data\Common\SQLResource.cs">
414422
<Link>Microsoft\Data\SQLTypes\SQLResource.cs</Link>
415423
</Compile>

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,18 @@
298298
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SignatureVerificationCache.cs">
299299
<Link>Microsoft\Data\SqlClient\SignatureVerificationCache.cs</Link>
300300
</Compile>
301+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\TdsValueSetter.cs">
302+
<Link>Microsoft\Data\SqlClient\TdsValueSetter.cs</Link>
303+
</Compile>
304+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\TdsParameterSetter.cs">
305+
<Link>Microsoft\Data\SqlClient\TdsParameterSetter.cs</Link>
306+
</Compile>
307+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs">
308+
<Link>Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs</Link>
309+
</Compile>
310+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiRecordBuffer.cs">
311+
<Link>Microsoft\Data\SqlClient\Server\SmiRecordBuffer.cs</Link>
312+
</Compile>
301313
</ItemGroup>
302314
<ItemGroup>
303315
<Compile Include="Microsoft\Data\Interop\SNINativeManagedWrapperX64.cs" />
@@ -383,15 +395,12 @@
383395
<Compile Include="Microsoft\Data\SqlClient\SqlUdtInfo.cs" />
384396
<Compile Include="Microsoft\Data\SqlClient\SqlUtil.cs" />
385397
<Compile Include="Microsoft\Data\SqlClient\TdsEnums.cs" />
386-
<Compile Include="Microsoft\Data\SqlClient\TdsParameterSetter.cs" />
387398
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
388399
<Compile Include="Microsoft\Data\SqlClient\TdsParserHelperClasses.cs" />
389400
<Compile Include="Microsoft\Data\SqlClient\TdsParserSafeHandles.cs" />
390401
<Compile Include="Microsoft\Data\SqlClient\TdsParserSessionPool.cs" />
391402
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObject.cs" />
392403
<Compile Include="Microsoft\Data\SqlClient\TdsParserStaticMethods.cs" />
393-
<Compile Include="Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs" />
394-
<Compile Include="Microsoft\Data\SqlClient\TdsValueSetter.cs" />
395404
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStreamChars.cs" />
396405
<Compile Include="Microsoft\Data\SqlTypes\SqlStreamChars.cs" />
397406
<Compile Include="Microsoft\Data\Common\NativeMethods.cs" />
@@ -442,7 +451,6 @@
442451
<Compile Include="Microsoft\Data\SqlClient\Server\SmiLink.cs" />
443452
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaData.cs" />
444453
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs" />
445-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiRecordBuffer.cs" />
446454
<Compile Include="Microsoft\Data\SqlClient\Server\SmiRequestExecutor.cs" />
447455
<Compile Include="Microsoft\Data\SqlClient\Server\SmiStream.cs" />
448456
<Compile Include="Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs" />

0 commit comments

Comments
 (0)