Skip to content

Commit 5e94302

Browse files
Wraith2Wraith2
authored
Merge more shared files (#618)
1 parent 26e9bb6 commit 5e94302

24 files changed

+143
-419
lines changed

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

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@
6060
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationTimeoutRetryHelper.cs">
6161
<Link>Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationTimeoutRetryHelper.cs</Link>
6262
</Compile>
63+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ApplicationIntent.cs">
64+
<Link>Microsoft\Data\SqlClient\ApplicationIntent.cs</Link>
65+
</Compile>
6366
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationProvider.cs">
6467
<Link>Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationProvider.cs</Link>
6568
</Compile>
@@ -72,6 +75,24 @@
7275
<Compile Include="..\..\src\Microsoft\Data\SqlClient\OnChangedEventHandler.cs">
7376
<Link>Microsoft\Data\SqlClient\OnChangedEventHandler.cs</Link>
7477
</Compile>
78+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ParameterPeekAheadValue.cs">
79+
<Link>Microsoft\Data\SqlClient\ParameterPeekAheadValue.cs</Link>
80+
</Compile>
81+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\PoolBlockingPeriod.cs">
82+
<Link>Microsoft\Data\SqlClient\PoolBlockingPeriod.cs</Link>
83+
</Compile>
84+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\RowsCopiedEventArgs.cs">
85+
<Link>Microsoft\Data\SqlClient\RowsCopiedEventArgs.cs</Link>
86+
</Compile>
87+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs">
88+
<Link>Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs</Link>
89+
</Compile>
90+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SortOrder.cs">
91+
<Link>Microsoft\Data\SqlClient\SortOrder.cs</Link>
92+
</Compile>
93+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlAuthenticationToken.cs">
94+
<Link>Microsoft\Data\SqlClient\SqlAuthenticationToken.cs</Link>
95+
</Compile>
7596
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Algorithm.cs">
7697
<Link>Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Algorithm.cs</Link>
7798
</Compile>
@@ -93,6 +114,9 @@
93114
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlAuthenticationProvider.cs">
94115
<Link>Microsoft\Data\SqlClient\SqlAuthenticationProvider.cs</Link>
95116
</Compile>
117+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs">
118+
<Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs</Link>
119+
</Compile>
96120
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlBulkCopyOptions.cs">
97121
<Link>Microsoft\Data\SqlClient\SqlBulkCopyOptions.cs</Link>
98122
</Compile>
@@ -102,9 +126,15 @@
102126
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs">
103127
<Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs</Link>
104128
</Compile>
129+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs">
130+
<Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs</Link>
131+
</Compile>
105132
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactory.cs">
106133
<Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactory.cs</Link>
107134
</Compile>
135+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactoryList.cs">
136+
<Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactoryList.cs</Link>
137+
</Compile>
108138
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEncryptionType.cs">
109139
<Link>Microsoft\Data\SqlClient\SqlClientEncryptionType.cs</Link>
110140
</Compile>
@@ -166,7 +196,6 @@
166196
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionString.NetCoreApp.cs" />
167197
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionStringBuilder.NetCoreApp.cs" />
168198
<Compile Include="Microsoft\Data\SqlClient\SqlDiagnosticListener.NetCoreApp.cs" />
169-
<Compile Include="Microsoft\Data\SqlClient\PoolBlockingPeriod.cs" />
170199
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.NetCoreApp.cs" />
171200
<Compile Include="Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.NetCoreApp.cs" />
172201
<Compile Include="Microsoft\Data\SqlClient\EnclaveDelegate.NetCoreApp.cs" />
@@ -266,7 +295,6 @@
266295
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs" />
267296
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs" />
268297
<Compile Include="Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.cs" />
269-
<Compile Include="Microsoft\Data\SqlClient\SqlAuthenticationToken.cs" />
270298
<Compile Include="Microsoft\Data\SqlClient\Server\InvalidUdtException.cs" />
271299
<Compile Include="Microsoft\Data\SqlClient\Server\SqlFunctionAttribute.cs" />
272300
<Compile Include="Microsoft\Data\SqlClient\Server\SqlMetaData.cs" />
@@ -275,15 +303,9 @@
275303
<Compile Include="Microsoft\Data\SqlClient\Server\SqlSer.cs" />
276304
<Compile Include="Microsoft\Data\SqlClient\Server\SqlUserDefinedAggregateAttribute.cs" />
277305
<Compile Include="Microsoft\Data\SqlClient\Server\SqlUserDefinedTypeAttribute.cs" />
278-
<Compile Include="Microsoft\Data\SqlClient\ApplicationIntent.cs" />
279306
<Compile Include="Microsoft\Data\SqlClient\LocalDBAPI.cs" />
280-
<Compile Include="Microsoft\Data\SqlClient\ParameterPeekAheadValue.cs" />
281-
<Compile Include="Microsoft\Data\SqlClient\RowsCopiedEventArgs.cs" />
282-
<Compile Include="Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs" />
283-
<Compile Include="Microsoft\Data\SqlClient\SortOrder.cs" />
284307
<Compile Include="Microsoft\Data\SqlClient\SqlBuffer.cs" />
285308
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
286-
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs" />
287309
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs" />
288310
<Compile Include="Microsoft\Data\SqlClient\SqlCachedBuffer.cs" />
289311
<Compile Include="Microsoft\Data\SqlClient\SqlClientDiagnosticListenerExtensions.cs" />
@@ -366,10 +388,8 @@
366388
<Compile Include="Interop\SNINativeMethodWrapper.Common.cs" />
367389
<Compile Include="Microsoft\Data\SqlClient\SqlCredential.cs" />
368390
<Compile Include="Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs" />
369-
<Compile Include="Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs" />
370391
<Compile Include="Microsoft\Data\SqlClient\SqlSecurityUtility.cs" />
371392
<Compile Include="Microsoft\Data\SqlClient\SignatureVerificationCache.cs" />
372-
<Compile Include="Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactoryList.cs" />
373393
<Compile Include="Microsoft\Data\SqlClient\EnclavePackage.cs" />
374394
<Compile Include="Microsoft\Data\SqlClient\SqlEnclaveSession.cs" />
375395
<Compile Include="Microsoft\Data\SqlClient\SqlQueryMetadataCache.cs" />

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

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

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

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

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

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

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

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

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

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@
7171
<DebugType>Pdbonly</DebugType>
7272
<Optimize>True</Optimize>
7373
</PropertyGroup>
74+
<PropertyGroup>
75+
<DefineConstants>$(DefineConstants);NETFRAMEWORK;</DefineConstants>
76+
</PropertyGroup>
7477
<ItemGroup>
7578
<Reference Include="System" />
7679
<Reference Include="System.Configuration" />
@@ -114,6 +117,9 @@
114117
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationTimeoutRetryHelper.cs">
115118
<Link>Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationTimeoutRetryHelper.cs</Link>
116119
</Compile>
120+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ApplicationIntent.cs">
121+
<Link>Microsoft\Data\SqlClient\ApplicationIntent.cs</Link>
122+
</Compile>
117123
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationProvider.cs">
118124
<Link>Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationProvider.cs</Link>
119125
</Compile>
@@ -126,6 +132,24 @@
126132
<Compile Include="..\..\src\Microsoft\Data\SqlClient\OnChangedEventHandler.cs">
127133
<Link>Microsoft\Data\SqlClient\OnChangedEventHandler.cs</Link>
128134
</Compile>
135+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ParameterPeekAheadValue.cs">
136+
<Link>Microsoft\Data\SqlClient\ParameterPeekAheadValue.cs</Link>
137+
</Compile>
138+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\PoolBlockingPeriod.cs">
139+
<Link>Microsoft\Data\SqlClient\PoolBlockingPeriod.cs</Link>
140+
</Compile>
141+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\RowsCopiedEventArgs.cs">
142+
<Link>Microsoft\Data\SqlClient\RowsCopiedEventArgs.cs</Link>
143+
</Compile>
144+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs">
145+
<Link>Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs</Link>
146+
</Compile>
147+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SortOrder.cs">
148+
<Link>Microsoft\Data\SqlClient\SortOrder.cs</Link>
149+
</Compile>
150+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlAuthenticationToken.cs">
151+
<Link>Microsoft\Data\SqlClient\SqlAuthenticationToken.cs</Link>
152+
</Compile>
129153
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Algorithm.cs">
130154
<Link>Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Algorithm.cs</Link>
131155
</Compile>
@@ -147,6 +171,9 @@
147171
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlAuthenticationProvider.cs">
148172
<Link>Microsoft\Data\SqlClient\SqlAuthenticationProvider.cs</Link>
149173
</Compile>
174+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs">
175+
<Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs</Link>
176+
</Compile>
150177
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlBulkCopyOptions.cs">
151178
<Link>Microsoft\Data\SqlClient\SqlBulkCopyOptions.cs</Link>
152179
</Compile>
@@ -156,9 +183,15 @@
156183
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs">
157184
<Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs</Link>
158185
</Compile>
186+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs">
187+
<Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs</Link>
188+
</Compile>
159189
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactory.cs">
160190
<Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactory.cs</Link>
161191
</Compile>
192+
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactoryList.cs">
193+
<Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactoryList.cs</Link>
194+
</Compile>
162195
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEncryptionType.cs">
163196
<Link>Microsoft\Data\SqlClient\SqlClientEncryptionType.cs</Link>
164197
</Compile>
@@ -212,7 +245,6 @@
212245
<Compile Include="Microsoft\Data\SqlClient\AlwaysEncryptedAttestationException.cs" />
213246
<Compile Include="Microsoft\Data\SqlClient\AlwaysEncryptedEnclaveProviderUtils.cs" />
214247
<Compile Include="Microsoft\Data\SqlClient\AppContextDefaultValues.Defaults.cs" />
215-
<Compile Include="Microsoft\Data\SqlClient\ApplicationIntent.cs" />
216248
<Compile Include="Microsoft\Data\SqlClient\assemblycache.cs" />
217249
<Compile Include="Microsoft\Data\SqlClient\AzureAttestationBasedEnclaveProvider.cs" />
218250
<Compile Include="Microsoft\Data\SqlClient\EnclaveDelegate.cs" />
@@ -221,8 +253,6 @@
221253
<Compile Include="Microsoft\Data\SqlClient\LocalAppContextSwitches.cs" />
222254
<Compile Include="Microsoft\Data\SqlClient\LocalDBAPI.cs" />
223255
<Compile Include="Microsoft\Data\SqlClient\LocalDBConfig.cs" />
224-
<Compile Include="Microsoft\Data\SqlClient\ParameterPeekAheadValue.cs" />
225-
<Compile Include="Microsoft\Data\SqlClient\PoolBlockingPeriod.cs" />
226256
<Compile Include="Microsoft\Data\SqlClient\AssemblyRef.cs" />
227257
<Compile Include="Microsoft\Data\SqlClient\Server\InvalidUdtException.cs" />
228258
<Compile Include="Microsoft\Data\SqlClient\Server\SqlDataRecord.cs" />
@@ -232,26 +262,19 @@
232262
<Compile Include="Microsoft\Data\SqlClient\Server\SqlUserDefinedAggregateAttribute.cs" />
233263
<Compile Include="Microsoft\Data\SqlClient\Server\SqlUserDefinedTypeAttribute.cs" />
234264
<Compile Include="Microsoft\Data\SqlClient\Server\TriggerAction.cs" />
235-
<Compile Include="Microsoft\Data\SqlClient\SortOrder.cs" />
236265
<Compile Include="Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProvider.cs" />
237266
<Compile Include="Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProviderBase.cs" />
238267
<Compile Include="Microsoft\Data\SqlTypes\SqlFileStream.cs" />
239268
<Compile Include="Microsoft\Data\SqlTypes\UnsafeNativeMethods.cs" />
240269
<Compile Include="Resources\ResCategoryAttribute.cs" />
241270
<Compile Include="Resources\ResDescriptionAttribute.cs" />
242-
<Compile Include="Microsoft\Data\SqlClient\RowsCopiedEventArgs.cs" />
243-
<Compile Include="Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs" />
244271
<Compile Include="Microsoft\Data\SqlClient\SignatureVerificationCache.cs" />
245272
<Compile Include="Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.cs" />
246-
<Compile Include="Microsoft\Data\SqlClient\SqlAuthenticationToken.cs" />
247273
<Compile Include="Microsoft\Data\SqlClient\SqlBuffer.cs" />
248274
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
249-
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs" />
250275
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs" />
251276
<Compile Include="Microsoft\Data\SqlClient\SqlCachedBuffer.cs" />
252277
<Compile Include="Microsoft\Data\SqlClient\SqlCertificateCallbacks.cs" />
253-
<Compile Include="Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs" />
254-
<Compile Include="Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactoryList.cs" />
255278
<Compile Include="Microsoft\Data\SqlClient\SqlClientFactory.cs" />
256279
<Compile Include="Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs" />
257280
<Compile Include="Microsoft\Data\SqlClient\SqlClientOriginalAddressInfo.cs" />

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

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

0 commit comments

Comments
 (0)