Skip to content

Commit db21ad0

Browse files
Wraith2Wraith2
authored
Merge some netcore and netfx files (#871)
1 parent fc234f3 commit db21ad0

26 files changed

+3279
-6479
lines changed

‎src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/BasicFieldNameLookup.cs‎

Lines changed: 0 additions & 142 deletions
This file was deleted.

‎src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/FieldNameLookup.cs‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

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

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
</PropertyGroup>
3535
<!-- Contains common items shared between NetFx and NetCore -->
3636
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND '$(TargetsWindows)' == 'true'">
37-
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEventSource.Windows.cs">
38-
<Link>Microsoft\Data\SqlClient\SqlClientEventSource.Windows.cs</Link>
39-
</Compile>
37+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEventSource.Windows.cs">
38+
<Link>Microsoft\Data\SqlClient\SqlClientEventSource.Windows.cs</Link>
39+
</Compile>
4040
</ItemGroup>
4141
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS'">
4242
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEventSource.cs">
@@ -57,6 +57,9 @@
5757
<Compile Include="..\..\src\Microsoft\Data\Common\MultipartIdentifier.cs">
5858
<Link>Microsoft\Data\Common\MultipartIdentifier.cs</Link>
5959
</Compile>
60+
<Compile Include="..\..\src\Microsoft\Data\Common\NameValuePair.cs">
61+
<Link>Microsoft\Data\Common\NameValuePair.cs</Link>
62+
</Compile>
6063
<Compile Include="..\..\src\Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs">
6164
<Link>Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs</Link>
6265
</Compile>
@@ -75,12 +78,18 @@
7578
<Compile Include="..\..\src\Microsoft\Data\ProviderBase\DbConnectionPoolAuthenticationContextKey.cs">
7679
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolAuthenticationContextKey.cs</Link>
7780
</Compile>
81+
<Compile Include="..\..\src\Microsoft\Data\ProviderBase\FieldNameLookup.cs">
82+
<Link>Microsoft\Data\ProviderBase\FieldNameLookup.cs</Link>
83+
</Compile>
7884
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationTimeoutRetryHelper.cs">
7985
<Link>Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationTimeoutRetryHelper.cs</Link>
8086
</Compile>
8187
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ApplicationIntent.cs">
8288
<Link>Microsoft\Data\SqlClient\ApplicationIntent.cs</Link>
8389
</Compile>
90+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\AssemblyRef.cs">
91+
<Link>Microsoft\Data\SqlClient\AssemblyRef.cs</Link>
92+
</Compile>
8493
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationProvider.cs">
8594
<Link>Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationProvider.cs</Link>
8695
</Compile>
@@ -138,6 +147,9 @@
138147
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SqlUserDefinedAggregateAttribute.cs">
139148
<Link>Microsoft\Data\SqlClient\Server\SqlUserDefinedAggregateAttribute.cs</Link>
140149
</Compile>
150+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiMetaData.cs">
151+
<Link>Microsoft\Data\SqlClient\Server\SmiMetaData.cs</Link>
152+
</Compile>
141153
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
142154
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
143155
</Compile>
@@ -222,6 +234,9 @@
222234
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlNotificationType.cs">
223235
<Link>Microsoft\Data\SqlClient\SqlNotificationType.cs</Link>
224236
</Compile>
237+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlParameterCollection.cs">
238+
<Link>Microsoft\Data\SqlClient\SqlParameterCollection.cs</Link>
239+
</Compile>
225240
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlRowUpdatedEvent.cs">
226241
<Link>Microsoft\Data\SqlClient\SqlRowUpdatedEvent.cs</Link>
227242
</Compile>
@@ -283,7 +298,7 @@
283298
<Link>Microsoft\Data\SqlClient\Reliability\SqlRetryLogicBase.cs</Link>
284299
</Compile>
285300
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBaseProvider.cs">
286-
<Link>Microsoft\Data\SqlClient\Reliability\SqlRetryLogicBaseProvider.cs</Link>
301+
<Link>Microsoft\Data\SqlClient\Reliability\SqlRetryLogicBaseProvider.cs</Link>
287302
</Compile>
288303
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicProvider.cs">
289304
<Link>Microsoft\Data\SqlClient\Reliability\SqlRetryLogicProvider.cs</Link>
@@ -300,22 +315,25 @@
300315
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlUtil.cs">
301316
<Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
302317
</Compile>
318+
<Compile Include="..\..\src\Resources\ResCategoryAttribute.cs">
319+
<Link>Resources\ResCategoryAttribute.cs</Link>
320+
</Compile>
303321
</ItemGroup>
304322
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard' OR '$(TargetGroup)' == 'netcoreapp' OR '$(IsUAPAssembly)' == 'true'">
305323
<Compile Include="Microsoft.Data.SqlClient.TypeForwards.cs" />
306324
</ItemGroup>
307325
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND '$(TargetGroup)' == 'netstandard' AND '$(TargetFramework)' == 'netstandard2.0'">
308326
<Compile Include="Microsoft\Data\SqlClient\EnclaveDelegate.NetStandard.cs" />
309327
</ItemGroup>
310-
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND '$(TargetGroup)' == 'netstandard'">
311-
<Compile Include="Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.NetStandard.cs" />
312-
<Compile Include="Microsoft\Data\SqlClient\SqlDiagnosticListener.NetStandard.cs" />
313-
<Compile Include="Microsoft\Data\SqlClient\SqlDelegatedTransaction.NetStandard.cs" />
314-
<Compile Include="Microsoft\Data\SqlClient\TdsParser.NetStandard.cs" />
328+
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND '$(TargetGroup)' == 'netstandard'">
329+
<Compile Include="Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.NetStandard.cs" />
330+
<Compile Include="Microsoft\Data\SqlClient\SqlDiagnosticListener.NetStandard.cs" />
331+
<Compile Include="Microsoft\Data\SqlClient\SqlDelegatedTransaction.NetStandard.cs" />
332+
<Compile Include="Microsoft\Data\SqlClient\TdsParser.NetStandard.cs" />
315333
<Compile Include="Microsoft\Data\SqlClient\SNI\SslOverTdsStream.NetStandard.cs" />
316334
<Compile Include="Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.NetStandard.cs" />
317-
</ItemGroup>
318-
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND '$(TargetFramework)' != 'netstandard2.0'">
335+
</ItemGroup>
336+
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND '$(TargetFramework)' != 'netstandard2.0'">
319337
<Compile Include="..\..\src\Microsoft\Data\SqlClient\AlwaysEncryptedAttestationException.cs">
320338
<Link>Microsoft\Data\SqlClient\AlwaysEncryptedAttestationException.cs</Link>
321339
</Compile>
@@ -339,7 +357,7 @@
339357
<Link>Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProvider.cs</Link>
340358
</Compile>
341359
<Compile Include="Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProviderBase.cs" />
342-
</ItemGroup>
360+
</ItemGroup>
343361
<!-- netcoreapp 3.1 & netstandard 2.1 and above -->
344362
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND '$(TargetFramework)' != 'netcoreapp2.1' AND '$(TargetFramework)' != 'netstandard2.0'">
345363
<Compile Include="Microsoft\Data\SqlClient\SqlClientEventSource.NetCoreApp.cs" />
@@ -372,7 +390,6 @@
372390
<Compile Include="Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs" />
373391
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventSink.cs" />
374392
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventSink_Default.cs" />
375-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaData.cs" />
376393
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs" />
377394
<Compile Include="Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs" />
378395
<Compile Include="Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs" />
@@ -391,15 +408,6 @@
391408
<Link>Microsoft\Data\Common\DbConnectionOptions.Common.cs</Link>
392409
</Compile>
393410
<Compile Include="Microsoft\Data\Common\DbConnectionStringCommon.cs" />
394-
<Compile Include="$(CommonPath)\Microsoft\Data\Common\FieldNameLookup.cs">
395-
<Link>Microsoft\Data\Common\FieldNameLookup.cs</Link>
396-
</Compile>
397-
<Compile Include="$(CommonPath)\Microsoft\Data\Common\BasicFieldNameLookup.cs">
398-
<Link>Microsoft\Data\Common\BasicFieldNameLookup.cs</Link>
399-
</Compile>
400-
<Compile Include="$(CommonPath)\Microsoft\Data\Common\NameValuePair.cs">
401-
<Link>Microsoft\Data\Common\NameValuePair.cs</Link>
402-
</Compile>
403411
<Compile Include="$(CommonPath)\Microsoft\Data\ProviderBase\DbConnectionInternal.cs">
404412
<Link>Common\Microsoft\Data\ProviderBase\DbConnectionInternal.cs</Link>
405413
</Compile>
@@ -475,9 +483,6 @@
475483
<Compile Include="Microsoft\Data\SqlClient\SqlMetadataFactory.cs" />
476484
<Compile Include="Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs" />
477485
<Compile Include="Microsoft\Data\SqlClient\SqlParameter.cs" />
478-
<Compile Include="Microsoft\Data\SqlClient\SqlParameterCollection.cs" />
479-
<Compile Include="Microsoft\Data\SqlClient\SqlParameterCollectionHelper.cs" />
480-
<Compile Include="Microsoft\Data\SqlClient\SqlParameterHelper.cs" />
481486
<Compile Include="Microsoft\Data\SqlClient\SqlReferenceCollection.cs" />
482487
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialStream.cs" />
483488
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReader.cs" />

0 commit comments

Comments
 (0)