Skip to content

Commit e1ec908

Browse files
Wraith2Wraith2
authored
Move equal files to shared source (#625)
1 parent 5e94302 commit e1ec908

29 files changed

+199
-1501
lines changed

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

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
<Compile Include="..\..\src\Microsoft\Data\ProviderBase\DbConnectionPoolProviderInfo.cs">
4949
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolProviderInfo.cs</Link>
5050
</Compile>
51+
<Compile Include="..\..\src\Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs">
52+
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs</Link>
53+
</Compile>
5154
<Compile Include="..\..\src\Microsoft\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs">
5255
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs</Link>
5356
</Compile>
@@ -66,9 +69,45 @@
6669
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationProvider.cs">
6770
<Link>Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationProvider.cs</Link>
6871
</Compile>
72+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs">
73+
<Link>Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs</Link>
74+
</Compile>
6975
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\IBinarySerialize.cs">
7076
<Link>Microsoft\Data\SqlClient\Server\IBinarySerialize.cs</Link>
7177
</Compile>
78+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ITypedGetters.cs">
79+
<Link>Microsoft\Data\SqlClient\Server\ITypedGetters.cs</Link>
80+
</Compile>
81+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ITypedGettersV3.cs">
82+
<Link>Microsoft\Data\SqlClient\Server\ITypedGettersV3.cs</Link>
83+
</Compile>
84+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ITypedSetters.cs">
85+
<Link>Microsoft\Data\SqlClient\Server\ITypedSetters.cs</Link>
86+
</Compile>
87+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ITypedSettersV3.cs">
88+
<Link>Microsoft\Data\SqlClient\Server\ITypedSettersV3.cs</Link>
89+
</Compile>
90+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\MemoryRecordBuffer.cs">
91+
<Link>Microsoft\Data\SqlClient\Server\MemoryRecordBuffer.cs</Link>
92+
</Compile>
93+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiGettersStream.cs">
94+
<Link>Microsoft\Data\SqlClient\Server\SmiGettersStream.cs</Link>
95+
</Compile>
96+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiSettersStream.cs">
97+
<Link>Microsoft\Data\SqlClient\Server\SmiSettersStream.cs</Link>
98+
</Compile>
99+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs">
100+
<Link>Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs</Link>
101+
</Compile>
102+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SqlFunctionAttribute.cs">
103+
<Link>Microsoft\Data\SqlClient\Server\SqlFunctionAttribute.cs</Link>
104+
</Compile>
105+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SqlMethodAttribute.cs">
106+
<Link>Microsoft\Data\SqlClient\Server\SqlMethodAttribute.cs</Link>
107+
</Compile>
108+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SqlUserDefinedTypeAttribute.cs">
109+
<Link>Microsoft\Data\SqlClient\Server\SqlUserDefinedTypeAttribute.cs</Link>
110+
</Compile>
72111
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
73112
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
74113
</Compile>
@@ -217,23 +256,14 @@
217256
<Compile Include="Microsoft\Data\SqlClient\TdsParser.NetStandard.cs" />
218257
</ItemGroup>
219258
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS'">
220-
<Compile Include="Microsoft\Data\SqlClient\Server\ITypedGetters.cs" />
221-
<Compile Include="Microsoft\Data\SqlClient\Server\ITypedGettersV3.cs" />
222-
<Compile Include="Microsoft\Data\SqlClient\Server\ITypedSetters.cs" />
223-
<Compile Include="Microsoft\Data\SqlClient\Server\ITypedSettersV3.cs" />
224-
<Compile Include="Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs" />
225-
<Compile Include="Microsoft\Data\SqlClient\Server\MemoryRecordBuffer.cs" />
226259
<Compile Include="Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs" />
227260
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventSink.cs" />
228261
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventSink_Default.cs" />
229-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiGettersStream.cs" />
230262
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaData.cs" />
231263
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs" />
232264
<Compile Include="Microsoft\Data\SqlClient\Server\SmiRecordBuffer.cs" />
233-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiSettersStream.cs" />
234265
<Compile Include="Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs" />
235266
<Compile Include="Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs" />
236-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs" />
237267
<Compile Include="Microsoft\Data\SqlClient\Server\SqlDataRecord.cs" />
238268
<Compile Include="Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs" />
239269
<Compile Include="Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs" />
@@ -293,16 +323,12 @@
293323
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionInternal.cs" />
294324
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPool.cs" />
295325
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs" />
296-
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs" />
297326
<Compile Include="Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.cs" />
298327
<Compile Include="Microsoft\Data\SqlClient\Server\InvalidUdtException.cs" />
299-
<Compile Include="Microsoft\Data\SqlClient\Server\SqlFunctionAttribute.cs" />
300328
<Compile Include="Microsoft\Data\SqlClient\Server\SqlMetaData.cs" />
301-
<Compile Include="Microsoft\Data\SqlClient\Server\SqlMethodAttribute.cs" />
302329
<Compile Include="Microsoft\Data\SqlClient\Server\SqlNorm.cs" />
303330
<Compile Include="Microsoft\Data\SqlClient\Server\SqlSer.cs" />
304331
<Compile Include="Microsoft\Data\SqlClient\Server\SqlUserDefinedAggregateAttribute.cs" />
305-
<Compile Include="Microsoft\Data\SqlClient\Server\SqlUserDefinedTypeAttribute.cs" />
306332
<Compile Include="Microsoft\Data\SqlClient\LocalDBAPI.cs" />
307333
<Compile Include="Microsoft\Data\SqlClient\SqlBuffer.cs" />
308334
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/Server/SqlFunctionAttribute.cs‎

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

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

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@
105105
<Compile Include="..\..\src\Microsoft\Data\ProviderBase\DbConnectionPoolProviderInfo.cs">
106106
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolProviderInfo.cs</Link>
107107
</Compile>
108+
<Compile Include="..\..\src\Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs">
109+
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs</Link>
110+
</Compile>
108111
<Compile Include="..\..\src\Microsoft\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs">
109112
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs</Link>
110113
</Compile>
@@ -123,9 +126,45 @@
123126
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationProvider.cs">
124127
<Link>Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationProvider.cs</Link>
125128
</Compile>
129+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs">
130+
<Link>Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs</Link>
131+
</Compile>
126132
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\IBinarySerialize.cs">
127133
<Link>Microsoft\Data\SqlClient\Server\IBinarySerialize.cs</Link>
128134
</Compile>
135+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ITypedGetters.cs">
136+
<Link>Microsoft\Data\SqlClient\Server\ITypedGetters.cs</Link>
137+
</Compile>
138+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ITypedGettersV3.cs">
139+
<Link>Microsoft\Data\SqlClient\Server\ITypedGettersV3.cs</Link>
140+
</Compile>
141+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ITypedSetters.cs">
142+
<Link>Microsoft\Data\SqlClient\Server\ITypedSetters.cs</Link>
143+
</Compile>
144+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ITypedSettersV3.cs">
145+
<Link>Microsoft\Data\SqlClient\Server\ITypedSettersV3.cs</Link>
146+
</Compile>
147+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\MemoryRecordBuffer.cs">
148+
<Link>Microsoft\Data\SqlClient\Server\MemoryRecordBuffer.cs</Link>
149+
</Compile>
150+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiGettersStream.cs">
151+
<Link>Microsoft\Data\SqlClient\Server\SmiGettersStream.cs</Link>
152+
</Compile>
153+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiSettersStream.cs">
154+
<Link>Microsoft\Data\SqlClient\Server\SmiSettersStream.cs</Link>
155+
</Compile>
156+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs">
157+
<Link>Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs</Link>
158+
</Compile>
159+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SqlFunctionAttribute.cs">
160+
<Link>Microsoft\Data\SqlClient\Server\SqlFunctionAttribute.cs</Link>
161+
</Compile>
162+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SqlMethodAttribute.cs">
163+
<Link>Microsoft\Data\SqlClient\Server\SqlMethodAttribute.cs</Link>
164+
</Compile>
165+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SqlUserDefinedTypeAttribute.cs">
166+
<Link>Microsoft\Data\SqlClient\Server\SqlUserDefinedTypeAttribute.cs</Link>
167+
</Compile>
129168
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
130169
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
131170
</Compile>
@@ -256,11 +295,8 @@
256295
<Compile Include="Microsoft\Data\SqlClient\AssemblyRef.cs" />
257296
<Compile Include="Microsoft\Data\SqlClient\Server\InvalidUdtException.cs" />
258297
<Compile Include="Microsoft\Data\SqlClient\Server\SqlDataRecord.cs" />
259-
<Compile Include="Microsoft\Data\SqlClient\Server\SqlFunctionAttribute.cs" />
260298
<Compile Include="Microsoft\Data\SqlClient\Server\SqlMetaData.cs" />
261-
<Compile Include="Microsoft\Data\SqlClient\Server\SqlMethodAttribute.cs" />
262299
<Compile Include="Microsoft\Data\SqlClient\Server\SqlUserDefinedAggregateAttribute.cs" />
263-
<Compile Include="Microsoft\Data\SqlClient\Server\SqlUserDefinedTypeAttribute.cs" />
264300
<Compile Include="Microsoft\Data\SqlClient\Server\TriggerAction.cs" />
265301
<Compile Include="Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProvider.cs" />
266302
<Compile Include="Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProviderBase.cs" />
@@ -371,20 +407,13 @@
371407
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolGroup.cs" />
372408
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolCounters.cs" />
373409
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs" />
374-
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs" />
375410
<Compile Include="Microsoft\Data\ProviderBase\DbMetaDataFactory.cs" />
376411
<Compile Include="Microsoft\Data\ProviderBase\SqlParameterCollectionHelper.cs" />
377412
<Compile Include="Microsoft\Data\ProviderBase\SqlParameterHelper.cs" />
378413
<Compile Include="Microsoft\Data\ProviderBase\DbReferenceCollection.cs" />
379414
<Compile Include="Microsoft\Data\ProviderBase\WrappedIUnknown.cs" />
380415
<Compile Include="Microsoft\Data\ProviderBase\TimeoutTimer.cs" />
381416
<Compile Include="Microsoft\Data\RelationshipConverter.cs" />
382-
<Compile Include="Microsoft\Data\SqlClient\Server\ITypedGetters.cs" />
383-
<Compile Include="Microsoft\Data\SqlClient\Server\ITypedGettersV3.cs" />
384-
<Compile Include="Microsoft\Data\SqlClient\Server\ITypedSetters.cs" />
385-
<Compile Include="Microsoft\Data\SqlClient\Server\ITypedSettersV3.cs" />
386-
<Compile Include="Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs" />
387-
<Compile Include="Microsoft\Data\SqlClient\Server\MemoryRecordBuffer.cs" />
388417
<Compile Include="Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs" />
389418
<Compile Include="Microsoft\Data\SqlClient\Server\SmiConnection.cs" />
390419
<Compile Include="Microsoft\Data\SqlClient\Server\SmiContext.cs" />
@@ -394,19 +423,16 @@
394423
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventSink_DeferedProcessing.cs" />
395424
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventStream.cs" />
396425
<Compile Include="Microsoft\Data\SqlClient\Server\SmiExecuteType.cs" />
397-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiGettersStream.cs" />
398426
<Compile Include="Microsoft\Data\SqlClient\Server\SmiLink.cs" />
399427
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaData.cs" />
400428
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs" />
401429
<Compile Include="Microsoft\Data\SqlClient\Server\SmiRecordBuffer.cs" />
402430
<Compile Include="Microsoft\Data\SqlClient\Server\SmiRequestExecutor.cs" />
403-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiSettersStream.cs" />
404431
<Compile Include="Microsoft\Data\SqlClient\Server\SmiStream.cs" />
405432
<Compile Include="Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs" />
406433
<Compile Include="Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs" />
407434
<Compile Include="Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs" />
408435
<Compile Include="Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs" />
409-
<Compile Include="Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs" />
410436
<Compile Include="Microsoft\Data\SqlClient\Server\sqlser.cs" />
411437
<Compile Include="Microsoft\Data\Sql\SqlGenericUtil.cs" />
412438
<Compile Include="Microsoft\Data\SqlClient\Server\sqlnorm.cs" />

0 commit comments

Comments
 (0)