From 77d3c586bed371ccaf9218ce3b24783843f541ad Mon Sep 17 00:00:00 2001 From: Golois Mouelet Date: Thu, 12 Mar 2020 11:52:22 -0400 Subject: [PATCH 01/14] upgraded project to use .net standard2.0 with the Microsoft.Data.SqlClient --- ElasticDatabaseTools.sln | 4 +-- Samples/Dapper/ElasticDapper.csproj | 22 ++++----------- .../EntityFrameworkCodeFirst.csproj | 20 ++++--------- .../EntityFrameworkMultiTenant.csproj | 28 ++++++------------- .../ElasticScaleStarterKit.csproj | 17 ++++------- Samples/ShardSqlCmd/ShardSqlCmd.csproj | 10 +++---- .../InternalHelpers/ApplicationNameHelper.cs | 2 +- ...DatabaseTransientErrorDetectionStrategy.cs | 2 +- .../Implementation/ThrottlingCondition.cs | 2 +- ...ure.SqlDatabase.ElasticScale.Client.csproj | 12 ++++---- .../Properties/AssemblyInfo.cs | 2 +- .../Query/DbCommandExtensions.cs | 2 +- .../Query/LabeledDbDataReader.cs | 2 +- .../Query/MultiShardCommand.cs | 2 +- .../Query/MultiShardConnection.cs | 2 +- .../Query/MultiShardDataReader.cs | 2 +- .../ShardManagement/Shard/IShardProvider.cs | 2 +- .../ShardManagement/Shard/PointMapping.cs | 2 +- .../ShardManagement/Shard/RangeMapping.cs | 2 +- .../ShardManagement/Shard/Shard.cs | 2 +- .../ShardManagement/Shard/ValidationUtils.cs | 2 +- .../ShardManagement/ShardMap/ListShardMap.cs | 2 +- .../ShardManagement/ShardMap/RangeShardMap.cs | 2 +- .../ShardManagement/ShardMap/ShardMap.cs | 2 +- .../ShardManagement/ShardMap/ShardMapUtils.cs | 2 +- .../ShardMapManager/ShardMapManagerFactory.cs | 2 +- .../ShardMapper/BaseShardMapper.cs | 2 +- .../ShardMapper/DefaultShardMapper.cs | 2 +- .../ShardMapper/IShardMapper.cs | 2 +- .../ShardMapper/ListShardMapper.cs | 2 +- .../ShardMapper/RangeShardMapper.cs | 2 +- .../SqlStore/SqlConnectionInfo.cs | 2 +- .../ShardManagement/SqlStore/SqlLocation.cs | 2 +- .../ShardManagement/SqlStore/SqlLogEntry.cs | 2 +- .../ShardManagement/SqlStore/SqlMapping.cs | 2 +- .../ShardManagement/SqlStore/SqlResults.cs | 2 +- .../ShardManagement/SqlStore/SqlSchemaInfo.cs | 2 +- .../ShardManagement/SqlStore/SqlShard.cs | 2 +- .../ShardManagement/SqlStore/SqlShardMap.cs | 2 +- .../SqlStore/SqlShardMapManagerCredentials.cs | 2 +- .../SqlStore/SqlStoreConnection.cs | 2 +- .../SqlStore/SqlStoreConnectionFactory.cs | 2 +- .../SqlStore/SqlStoreTransactionScope.cs | 2 +- .../SqlStore/SqlUserStoreConnection.cs | 2 +- .../Store/IStoreConnectionFactory.cs | 2 +- .../Store/IStoreTransactionScope.cs | 2 +- .../Store/IUserStoreConnection.cs | 2 +- .../ShardManagement/Store/SqlVersion.cs | 2 +- .../StoreOperations/Base/StoreOperation.cs | 2 +- .../Base/StoreOperationLocal.cs | 2 +- .../Recovery/DetachShardGlobalOperation.cs | 2 +- .../ReplaceMappingsGlobalOperation.cs | 2 +- .../AddShardingSchemaInfoGlobalOperation.cs | 2 +- .../FindShardingSchemaInfoGlobalOperation.cs | 2 +- .../GetShardingSchemaInfosGlobalOperation.cs | 2 +- ...RemoveShardingSchemaInfoGlobalOperation.cs | 2 +- ...UpdateShardingSchemaInfoGlobalOperation.cs | 2 +- .../ShardMap/AddShardOperation.cs | 2 +- .../FindShardByLocationGlobalOperation.cs | 2 +- .../ShardMap/GetShardsGlobalOperation.cs | 2 +- .../ShardMap/RemoveShardOperation.cs | 2 +- .../ShardMap/UpdateShardOperation.cs | 2 +- .../AddShardMapGlobalOperation.cs | 2 +- .../FindShardMapByNameGlobalOperation.cs | 2 +- ...etDistinctShardLocationsGlobalOperation.cs | 2 +- .../GetShardMapsGlobalOperation.cs | 2 +- .../LoadShardMapManagerGlobalOperation.cs | 2 +- .../RemoveShardMapGlobalOperation.cs | 2 +- .../CreateShardMapManagerGlobalOperation.cs | 2 +- .../ShardMapper/AddMappingOperation.cs | 2 +- .../FindMappingByIdGlobalOperation.cs | 2 +- .../FindMappingByKeyGlobalOperation.cs | 2 +- .../GetMappingsByRangeGlobalOperation.cs | 2 +- .../LockOrUnLockMappingsGlobalOperation.cs | 2 +- .../ShardMapper/RemoveMappingOperation.cs | 2 +- .../ShardMapper/ReplaceMappingsOperation.cs | 2 +- .../ShardMapper/UpdateMappingOperation.cs | 2 +- .../Upgrade/UpgradeStoreGlobalOperation.cs | 2 +- .../ShardManagement/Utils/SqlUtils.cs | 2 +- ...abase.ElasticScale.ClientTestCommon.csproj | 8 +++--- .../SqlAuthenticationLogin.cs | 2 +- ...tabase.ElasticScale.Query.UnitTests.csproj | 10 +++---- ...e.ElasticScale.Query.UnitTests.csproj.user | 12 ++++++++ .../MockSqlCommand.cs | 2 +- .../MultiShardDataReaderTests.cs | 2 +- .../MultiShardQueryE2ETests.cs | 2 +- .../MultiShardTestUtils.cs | 2 +- .../DateTimeShardMapperTests.cs | 2 +- .../Globals.cs | 2 +- ...sticScale.ShardManagement.UnitTests.csproj | 10 +++---- .../RecoveryManagerTests.cs | 2 +- .../ScenarioTests.cs | 2 +- .../SchemaInfoCollectionTests.cs | 2 +- .../ShardMapFaultHandlingTests.cs | 2 +- .../ShardMapManagerConcurrencyTests.cs | 2 +- .../ShardMapManagerFactoryTests.cs | 2 +- .../ShardMapManagerLoadTests.cs | 2 +- .../ShardMapManagerTests.cs | 2 +- .../ShardMapManagerUpgradeTests.cs | 2 +- .../ShardMapTests.cs | 2 +- .../ShardMapperTests.cs | 2 +- .../ShardRangeTests.cs | 2 +- .../Stubs/StubSqlStoreConnectionFactory.cs | 2 +- 103 files changed, 156 insertions(+), 181 deletions(-) create mode 100644 Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj.user diff --git a/ElasticDatabaseTools.sln b/ElasticDatabaseTools.sln index 8cb16b1..8b388cd 100644 --- a/ElasticDatabaseTools.sln +++ b/ElasticDatabaseTools.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.10 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29709.97 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.SqlDatabase.ElasticScale.Client", "Src\ElasticScale.Client\Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj", "{4C3B3EC4-5702-469E-800E-313FB27A0A2B}" EndProject diff --git a/Samples/Dapper/ElasticDapper.csproj b/Samples/Dapper/ElasticDapper.csproj index 4d9bee3..72a34ab 100644 --- a/Samples/Dapper/ElasticDapper.csproj +++ b/Samples/Dapper/ElasticDapper.csproj @@ -1,27 +1,17 @@ - net451 + netcoreapp3.1 Exe - - - - - - - - - - - - - - - + + + + + diff --git a/Samples/EFCodeFirst/EntityFrameworkCodeFirst.csproj b/Samples/EFCodeFirst/EntityFrameworkCodeFirst.csproj index 0544e87..737260e 100644 --- a/Samples/EFCodeFirst/EntityFrameworkCodeFirst.csproj +++ b/Samples/EFCodeFirst/EntityFrameworkCodeFirst.csproj @@ -1,26 +1,16 @@ - net451 + netcoreapp3.1 Exe - - - - - - - - - - - - - - + + + + diff --git a/Samples/EFMultiTenant/EntityFrameworkMultiTenant.csproj b/Samples/EFMultiTenant/EntityFrameworkMultiTenant.csproj index 108f92a..90db092 100644 --- a/Samples/EFMultiTenant/EntityFrameworkMultiTenant.csproj +++ b/Samples/EFMultiTenant/EntityFrameworkMultiTenant.csproj @@ -1,28 +1,11 @@ - + - net451 + netcoreapp3.1 Exe - - - - - - - - - - - - - - - - - @@ -33,4 +16,11 @@ + + + + + + + diff --git a/Samples/ElasticScaleStarterKit/ElasticScaleStarterKit.csproj b/Samples/ElasticScaleStarterKit/ElasticScaleStarterKit.csproj index 2b01ae9..05ae169 100644 --- a/Samples/ElasticScaleStarterKit/ElasticScaleStarterKit.csproj +++ b/Samples/ElasticScaleStarterKit/ElasticScaleStarterKit.csproj @@ -1,23 +1,16 @@ - net451 + netcoreapp3.1 Exe - - - - - - - - - - - + + + + diff --git a/Samples/ShardSqlCmd/ShardSqlCmd.csproj b/Samples/ShardSqlCmd/ShardSqlCmd.csproj index fbd667e..0609d4b 100644 --- a/Samples/ShardSqlCmd/ShardSqlCmd.csproj +++ b/Samples/ShardSqlCmd/ShardSqlCmd.csproj @@ -1,6 +1,7 @@ - + + - net451 + netcoreapp3.1 Exe @@ -8,13 +9,10 @@ - - - - + diff --git a/Src/ElasticScale.Client/ElasticScale.Common/InternalHelpers/ApplicationNameHelper.cs b/Src/ElasticScale.Client/ElasticScale.Common/InternalHelpers/ApplicationNameHelper.cs index c1cb7b2..82c6936 100644 --- a/Src/ElasticScale.Client/ElasticScale.Common/InternalHelpers/ApplicationNameHelper.cs +++ b/Src/ElasticScale.Client/ElasticScale.Common/InternalHelpers/ApplicationNameHelper.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Data.SqlClient; using System; using System.Collections.Generic; -using System.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/SqlDatabaseTransientErrorDetectionStrategy.cs b/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/SqlDatabaseTransientErrorDetectionStrategy.cs index fd86124..d9c2605 100644 --- a/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/SqlDatabaseTransientErrorDetectionStrategy.cs +++ b/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/SqlDatabaseTransientErrorDetectionStrategy.cs @@ -12,7 +12,7 @@ using System; using System.ComponentModel; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale { diff --git a/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/ThrottlingCondition.cs b/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/ThrottlingCondition.cs index 144dc18..4c91c09 100644 --- a/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/ThrottlingCondition.cs +++ b/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/ThrottlingCondition.cs @@ -12,7 +12,7 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Globalization; using System.Linq; using System.Text; diff --git a/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj b/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj index c34d9b4..4f01dbe 100644 --- a/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj +++ b/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj @@ -7,7 +7,7 @@ en-US 2.4.0-preview1 Microsoft - net451;net46;netstandard2.0 + netstandard2.0 Microsoft;Elastic;Scale;Azure;SQL;DB;Database;Shard;Sharding;Management;Query;azureofficial Added support for SqlConnection.AccessToken. This can be provided by using OpenConnection methods that receive SqlConnectionInfo parameter. Using AccessToken requires .NET 4.6 or higher, or .NET Standard with System.Data.SqlClient 4.6 or higher. http://go.microsoft.com/fwlink/?LinkID=288890 @@ -23,10 +23,6 @@ - - - - True @@ -51,4 +47,10 @@ + + + 1.1.1 + + + diff --git a/Src/ElasticScale.Client/Properties/AssemblyInfo.cs b/Src/ElasticScale.Client/Properties/AssemblyInfo.cs index a9e3fc0..a127e29 100644 --- a/Src/ElasticScale.Client/Properties/AssemblyInfo.cs +++ b/Src/ElasticScale.Client/Properties/AssemblyInfo.cs @@ -16,7 +16,7 @@ [assembly: InternalsVisibleTo("Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007d813b35eaf89b7ae4be8a49086058380e083b58752b0a3a8323157e68b4b0f9fd78d2fe75e9ec253d8bb2225637d4c2393234e0f877bfddd7907eda8293083b7f4dbc664f09f6b62ce74266a4e79002783252559f5b23cfc682eb79b51a5f5d16dca2364413ae563b3ab6db2fc9da3ced11f9eef50421b982dfc3a08cb635a8")] [assembly: InternalsVisibleTo("Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement.UnitTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007d813b35eaf89b7ae4be8a49086058380e083b58752b0a3a8323157e68b4b0f9fd78d2fe75e9ec253d8bb2225637d4c2393234e0f877bfddd7907eda8293083b7f4dbc664f09f6b62ce74266a4e79002783252559f5b23cfc682eb79b51a5f5d16dca2364413ae563b3ab6db2fc9da3ced11f9eef50421b982dfc3a08cb635a8")] -[assembly: CLSCompliant(true)] +//[assembly: CLSCompliant(true)] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1824:MarkAssembliesWithNeutralResourcesLanguage", Justification = "Too many dubious spelling errors.")] diff --git a/Src/ElasticScale.Client/Query/DbCommandExtensions.cs b/Src/ElasticScale.Client/Query/DbCommandExtensions.cs index c5cae04..efffc6b 100644 --- a/Src/ElasticScale.Client/Query/DbCommandExtensions.cs +++ b/Src/ElasticScale.Client/Query/DbCommandExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Data.Common; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Reflection; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/Query/LabeledDbDataReader.cs b/Src/ElasticScale.Client/Query/LabeledDbDataReader.cs index 6718ceb..1f250bf 100644 --- a/Src/ElasticScale.Client/Query/LabeledDbDataReader.cs +++ b/Src/ElasticScale.Client/Query/LabeledDbDataReader.cs @@ -11,7 +11,7 @@ using System; using System.Data.Common; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement; namespace Microsoft.Azure.SqlDatabase.ElasticScale.Query diff --git a/Src/ElasticScale.Client/Query/MultiShardCommand.cs b/Src/ElasticScale.Client/Query/MultiShardCommand.cs index 87f7780..db6bebe 100644 --- a/Src/ElasticScale.Client/Query/MultiShardCommand.cs +++ b/Src/ElasticScale.Client/Query/MultiShardCommand.cs @@ -16,7 +16,7 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Diagnostics.Contracts; using System.IO; diff --git a/Src/ElasticScale.Client/Query/MultiShardConnection.cs b/Src/ElasticScale.Client/Query/MultiShardConnection.cs index 59bdfab..87f655b 100644 --- a/Src/ElasticScale.Client/Query/MultiShardConnection.cs +++ b/Src/ElasticScale.Client/Query/MultiShardConnection.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement; diff --git a/Src/ElasticScale.Client/Query/MultiShardDataReader.cs b/Src/ElasticScale.Client/Query/MultiShardDataReader.cs index 0687ab7..602f68b 100644 --- a/Src/ElasticScale.Client/Query/MultiShardDataReader.cs +++ b/Src/ElasticScale.Client/Query/MultiShardDataReader.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Data.SqlTypes; using System.Diagnostics; using System.Diagnostics.Contracts; diff --git a/Src/ElasticScale.Client/ShardManagement/Shard/IShardProvider.cs b/Src/ElasticScale.Client/ShardManagement/Shard/IShardProvider.cs index 0529d2b..0f85351 100644 --- a/Src/ElasticScale.Client/ShardManagement/Shard/IShardProvider.cs +++ b/Src/ElasticScale.Client/ShardManagement/Shard/IShardProvider.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Threading.Tasks; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/Shard/PointMapping.cs b/Src/ElasticScale.Client/ShardManagement/Shard/PointMapping.cs index 480e276..05ef583 100644 --- a/Src/ElasticScale.Client/ShardManagement/Shard/PointMapping.cs +++ b/Src/ElasticScale.Client/ShardManagement/Shard/PointMapping.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/Shard/RangeMapping.cs b/Src/ElasticScale.Client/ShardManagement/Shard/RangeMapping.cs index 78792b8..dee0614 100644 --- a/Src/ElasticScale.Client/ShardManagement/Shard/RangeMapping.cs +++ b/Src/ElasticScale.Client/ShardManagement/Shard/RangeMapping.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/Shard/Shard.cs b/Src/ElasticScale.Client/ShardManagement/Shard/Shard.cs index 3d99d13..1b75e0e 100644 --- a/Src/ElasticScale.Client/ShardManagement/Shard/Shard.cs +++ b/Src/ElasticScale.Client/ShardManagement/Shard/Shard.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/Shard/ValidationUtils.cs b/Src/ElasticScale.Client/ShardManagement/Shard/ValidationUtils.cs index 00cc6e0..4c2b339 100644 --- a/Src/ElasticScale.Client/ShardManagement/Shard/ValidationUtils.cs +++ b/Src/ElasticScale.Client/ShardManagement/Shard/ValidationUtils.cs @@ -3,7 +3,7 @@ using System; using System.Data; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Data.SqlTypes; using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMap/ListShardMap.cs b/Src/ElasticScale.Client/ShardManagement/ShardMap/ListShardMap.cs index 5d65a4e..c802bfe 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMap/ListShardMap.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMap/ListShardMap.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMap/RangeShardMap.cs b/Src/ElasticScale.Client/ShardManagement/ShardMap/RangeShardMap.cs index 3a1618d..13217c4 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMap/RangeShardMap.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMap/RangeShardMap.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMap.cs b/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMap.cs index 60e7f36..6afdd16 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMap.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMap.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMapUtils.cs b/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMapUtils.cs index 0fca5ad..393cb5f 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMapUtils.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMapUtils.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Globalization; using System.Reflection; diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMapManager/ShardMapManagerFactory.cs b/Src/ElasticScale.Client/ShardManagement/ShardMapManager/ShardMapManagerFactory.cs index 6bd6700..a0e8698 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMapManager/ShardMapManagerFactory.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMapManager/ShardMapManagerFactory.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMapper/BaseShardMapper.cs b/Src/ElasticScale.Client/ShardManagement/ShardMapper/BaseShardMapper.cs index 42ff88e..b71b6be 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMapper/BaseShardMapper.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMapper/BaseShardMapper.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Linq; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMapper/DefaultShardMapper.cs b/Src/ElasticScale.Client/ShardManagement/ShardMapper/DefaultShardMapper.cs index fc467ac..78f7734 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMapper/DefaultShardMapper.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMapper/DefaultShardMapper.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Linq; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMapper/IShardMapper.cs b/Src/ElasticScale.Client/ShardManagement/ShardMapper/IShardMapper.cs index cbc6ced..462c208 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMapper/IShardMapper.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMapper/IShardMapper.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Threading.Tasks; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMapper/ListShardMapper.cs b/Src/ElasticScale.Client/ShardManagement/ShardMapper/ListShardMapper.cs index d538f20..5ec9074 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMapper/ListShardMapper.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMapper/ListShardMapper.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Threading.Tasks; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMapper/RangeShardMapper.cs b/Src/ElasticScale.Client/ShardManagement/ShardMapper/RangeShardMapper.cs index 926b99f..3be0615 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMapper/RangeShardMapper.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMapper/RangeShardMapper.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlConnectionInfo.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlConnectionInfo.cs index 26015ad..a0fdb04 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlConnectionInfo.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlConnectionInfo.cs @@ -3,7 +3,7 @@ using System; using System.Data.Common; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLocation.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLocation.cs index fd7ebde..777ce1e 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLocation.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLocation.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Data.SqlTypes; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLogEntry.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLogEntry.cs index 3184f8d..c6055bc 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLogEntry.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLogEntry.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Data.SqlTypes; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlMapping.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlMapping.cs index 03213d9..a8fab4a 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlMapping.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlMapping.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlResults.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlResults.cs index 54a36c4..626ccc2 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlResults.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlResults.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlSchemaInfo.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlSchemaInfo.cs index d845f5d..7e26b71 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlSchemaInfo.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlSchemaInfo.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Data.SqlTypes; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShard.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShard.cs index 86d2bc8..9c18510 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShard.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShard.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Data.SqlTypes; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMap.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMap.cs index 6027467..f14b573 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMap.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMap.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMapManagerCredentials.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMapManagerCredentials.cs index 973102c..02ae635 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMapManagerCredentials.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMapManagerCredentials.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnection.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnection.cs index ceaf5c7..537103b 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnection.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnection.cs @@ -3,7 +3,7 @@ using System; using System.Data; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Threading.Tasks; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnectionFactory.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnectionFactory.cs index 3c5c99d..bddadae 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnectionFactory.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnectionFactory.cs @@ -3,7 +3,7 @@ namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { - using System.Data.SqlClient; + using Microsoft.Data.SqlClient; /// /// Constructs instance of Sql Store Connection. diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreTransactionScope.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreTransactionScope.cs index 131f3ef..71fc89c 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreTransactionScope.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreTransactionScope.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Data; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Data.SqlTypes; using System.Diagnostics; using System.Text; diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlUserStoreConnection.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlUserStoreConnection.cs index 20cf894..c570dbb 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlUserStoreConnection.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlUserStoreConnection.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Threading.Tasks; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/Store/IStoreConnectionFactory.cs b/Src/ElasticScale.Client/ShardManagement/Store/IStoreConnectionFactory.cs index 44de58b..95dc823 100644 --- a/Src/ElasticScale.Client/ShardManagement/Store/IStoreConnectionFactory.cs +++ b/Src/ElasticScale.Client/ShardManagement/Store/IStoreConnectionFactory.cs @@ -3,7 +3,7 @@ namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { - using System.Data.SqlClient; + using Microsoft.Data.SqlClient; /// /// Factory for store connections. diff --git a/Src/ElasticScale.Client/ShardManagement/Store/IStoreTransactionScope.cs b/Src/ElasticScale.Client/ShardManagement/Store/IStoreTransactionScope.cs index 5eaf0ca..c1b3644 100644 --- a/Src/ElasticScale.Client/ShardManagement/Store/IStoreTransactionScope.cs +++ b/Src/ElasticScale.Client/ShardManagement/Store/IStoreTransactionScope.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Data.SqlTypes; using System.Text; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/Store/IUserStoreConnection.cs b/Src/ElasticScale.Client/ShardManagement/Store/IUserStoreConnection.cs index 33f2594..bad07cd 100644 --- a/Src/ElasticScale.Client/ShardManagement/Store/IUserStoreConnection.cs +++ b/Src/ElasticScale.Client/ShardManagement/Store/IUserStoreConnection.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Threading.Tasks; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/Store/SqlVersion.cs b/Src/ElasticScale.Client/ShardManagement/Store/SqlVersion.cs index 55bc678..0847ed2 100644 --- a/Src/ElasticScale.Client/ShardManagement/Store/SqlVersion.cs +++ b/Src/ElasticScale.Client/ShardManagement/Store/SqlVersion.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Data.SqlTypes; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperation.cs index 8da9913..dde3b07 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperation.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Linq; diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperationLocal.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperationLocal.cs index 2ad5dfe..bf412af 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperationLocal.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperationLocal.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/DetachShardGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/DetachShardGlobalOperation.cs index 1815767..d7db1d1 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/DetachShardGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/DetachShardGlobalOperation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/ReplaceMappingsGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/ReplaceMappingsGlobalOperation.cs index 9c4af26..8b41e74 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/ReplaceMappingsGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/ReplaceMappingsGlobalOperation.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Linq; diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/AddShardingSchemaInfoGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/AddShardingSchemaInfoGlobalOperation.cs index d9c8325..4af3fa9 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/AddShardingSchemaInfoGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/AddShardingSchemaInfoGlobalOperation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/FindShardingSchemaInfoGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/FindShardingSchemaInfoGlobalOperation.cs index b7fe8fc..02d212b 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/FindShardingSchemaInfoGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/FindShardingSchemaInfoGlobalOperation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/GetShardingSchemaInfosGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/GetShardingSchemaInfosGlobalOperation.cs index 587ef48..bd9eecb 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/GetShardingSchemaInfosGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/GetShardingSchemaInfosGlobalOperation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/RemoveShardingSchemaInfoGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/RemoveShardingSchemaInfoGlobalOperation.cs index 088eb2c..3489487 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/RemoveShardingSchemaInfoGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/RemoveShardingSchemaInfoGlobalOperation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/UpdateShardingSchemaInfoGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/UpdateShardingSchemaInfoGlobalOperation.cs index 1443d10..1e4ad80 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/UpdateShardingSchemaInfoGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/UpdateShardingSchemaInfoGlobalOperation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/AddShardOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/AddShardOperation.cs index 9ad9f9f..22ba3bc 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/AddShardOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/AddShardOperation.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/FindShardByLocationGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/FindShardByLocationGlobalOperation.cs index 2183f27..86b1aec 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/FindShardByLocationGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/FindShardByLocationGlobalOperation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/GetShardsGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/GetShardsGlobalOperation.cs index 16d216b..0e923d2 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/GetShardsGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/GetShardsGlobalOperation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/RemoveShardOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/RemoveShardOperation.cs index de9c293..ece6529 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/RemoveShardOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/RemoveShardOperation.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/UpdateShardOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/UpdateShardOperation.cs index 500c885..89075a7 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/UpdateShardOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/UpdateShardOperation.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/AddShardMapGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/AddShardMapGlobalOperation.cs index 889e220..432b341 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/AddShardMapGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/AddShardMapGlobalOperation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/FindShardMapByNameGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/FindShardMapByNameGlobalOperation.cs index 949298a..bcbcd68 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/FindShardMapByNameGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/FindShardMapByNameGlobalOperation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetDistinctShardLocationsGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetDistinctShardLocationsGlobalOperation.cs index 77b2c6d..13b5a37 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetDistinctShardLocationsGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetDistinctShardLocationsGlobalOperation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetShardMapsGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetShardMapsGlobalOperation.cs index 0afc3ff..63908f8 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetShardMapsGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetShardMapsGlobalOperation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/LoadShardMapManagerGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/LoadShardMapManagerGlobalOperation.cs index badcf89..df960ae 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/LoadShardMapManagerGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/LoadShardMapManagerGlobalOperation.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Linq; diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/RemoveShardMapGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/RemoveShardMapGlobalOperation.cs index 7a471fe..8cece4e 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/RemoveShardMapGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/RemoveShardMapGlobalOperation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManagerFactory/CreateShardMapManagerGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManagerFactory/CreateShardMapManagerGlobalOperation.cs index 1ac069a..82552fc 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManagerFactory/CreateShardMapManagerGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManagerFactory/CreateShardMapManagerGlobalOperation.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Diagnostics; diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/AddMappingOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/AddMappingOperation.cs index 87da487..e1d99be 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/AddMappingOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/AddMappingOperation.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByIdGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByIdGlobalOperation.cs index 5fc91ca..ec313f1 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByIdGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByIdGlobalOperation.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByKeyGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByKeyGlobalOperation.cs index 8b63582..91275dd 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByKeyGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByKeyGlobalOperation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/GetMappingsByRangeGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/GetMappingsByRangeGlobalOperation.cs index 2a69228..60032a5 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/GetMappingsByRangeGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/GetMappingsByRangeGlobalOperation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/LockOrUnLockMappingsGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/LockOrUnLockMappingsGlobalOperation.cs index 677612f..df06bed 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/LockOrUnLockMappingsGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/LockOrUnLockMappingsGlobalOperation.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Linq; diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/RemoveMappingOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/RemoveMappingOperation.cs index ca29038..d20e01e 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/RemoveMappingOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/RemoveMappingOperation.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/ReplaceMappingsOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/ReplaceMappingsOperation.cs index 2667fa2..145283f 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/ReplaceMappingsOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/ReplaceMappingsOperation.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Linq; diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/UpdateMappingOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/UpdateMappingOperation.cs index ba7ba33..ad0691f 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/UpdateMappingOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/UpdateMappingOperation.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Upgrade/UpgradeStoreGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Upgrade/UpgradeStoreGlobalOperation.cs index 1f5ea2b..cb321d9 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Upgrade/UpgradeStoreGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Upgrade/UpgradeStoreGlobalOperation.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Linq; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System; diff --git a/Src/ElasticScale.Client/ShardManagement/Utils/SqlUtils.cs b/Src/ElasticScale.Client/ShardManagement/Utils/SqlUtils.cs index 07487f4..5c75409 100644 --- a/Src/ElasticScale.Client/ShardManagement/Utils/SqlUtils.cs +++ b/Src/ElasticScale.Client/ShardManagement/Utils/SqlUtils.cs @@ -5,7 +5,7 @@ using System.Collections; using System.Collections.Generic; using System.Data; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Data.SqlTypes; using System.Diagnostics; using System.IO; diff --git a/Test/ElasticScale.ClientTestCommon/Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj b/Test/ElasticScale.ClientTestCommon/Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj index 07fc952..204f67d 100644 --- a/Test/ElasticScale.ClientTestCommon/Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj +++ b/Test/ElasticScale.ClientTestCommon/Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj @@ -1,13 +1,13 @@ - net451;netstandard2.0 + netstandard2.0 - + - - + + \ No newline at end of file diff --git a/Test/ElasticScale.ClientTestCommon/SqlAuthenticationLogin.cs b/Test/ElasticScale.ClientTestCommon/SqlAuthenticationLogin.cs index 6430ade..c4f67ef 100644 --- a/Test/ElasticScale.ClientTestCommon/SqlAuthenticationLogin.cs +++ b/Test/ElasticScale.ClientTestCommon/SqlAuthenticationLogin.cs @@ -4,7 +4,7 @@ namespace Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon { using System; - using System.Data.SqlClient; + using Microsoft.Data.SqlClient; using System.Diagnostics; /// diff --git a/Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj b/Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj index 7daa778..8e96093 100644 --- a/Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj +++ b/Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj @@ -1,15 +1,15 @@ - net452;netcoreapp2.0 + netcoreapp3.1 false - - - - + + + + diff --git a/Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj.user b/Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj.user new file mode 100644 index 0000000..2cf6cb7 --- /dev/null +++ b/Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj.user @@ -0,0 +1,12 @@ + + + + + + Component + + + Component + + + \ No newline at end of file diff --git a/Test/ElasticScale.Query.UnitTests/MockSqlCommand.cs b/Test/ElasticScale.Query.UnitTests/MockSqlCommand.cs index 79a3917..09cb35a 100644 --- a/Test/ElasticScale.Query.UnitTests/MockSqlCommand.cs +++ b/Test/ElasticScale.Query.UnitTests/MockSqlCommand.cs @@ -7,7 +7,7 @@ using System; using System.Data; using System.Data.Common; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Threading; using System.Threading.Tasks; diff --git a/Test/ElasticScale.Query.UnitTests/MultiShardDataReaderTests.cs b/Test/ElasticScale.Query.UnitTests/MultiShardDataReaderTests.cs index 2e5eeaa..f24e6c5 100644 --- a/Test/ElasticScale.Query.UnitTests/MultiShardDataReaderTests.cs +++ b/Test/ElasticScale.Query.UnitTests/MultiShardDataReaderTests.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; #if NETFRAMEWORK using System.Runtime.Remoting; diff --git a/Test/ElasticScale.Query.UnitTests/MultiShardQueryE2ETests.cs b/Test/ElasticScale.Query.UnitTests/MultiShardQueryE2ETests.cs index 32ee571..fea14a0 100644 --- a/Test/ElasticScale.Query.UnitTests/MultiShardQueryE2ETests.cs +++ b/Test/ElasticScale.Query.UnitTests/MultiShardQueryE2ETests.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Net; using System.Text; diff --git a/Test/ElasticScale.Query.UnitTests/MultiShardTestUtils.cs b/Test/ElasticScale.Query.UnitTests/MultiShardTestUtils.cs index 934c2de..cc71734 100644 --- a/Test/ElasticScale.Query.UnitTests/MultiShardTestUtils.cs +++ b/Test/ElasticScale.Query.UnitTests/MultiShardTestUtils.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Data; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Data.SqlTypes; using System.Security; using System.Text; diff --git a/Test/ElasticScale.ShardManagement.UnitTests/DateTimeShardMapperTests.cs b/Test/ElasticScale.ShardManagement.UnitTests/DateTimeShardMapperTests.cs index 24adea1..cc5f2c7 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/DateTimeShardMapperTests.cs +++ b/Test/ElasticScale.ShardManagement.UnitTests/DateTimeShardMapperTests.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Data; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/Test/ElasticScale.ShardManagement.UnitTests/Globals.cs b/Test/ElasticScale.ShardManagement.UnitTests/Globals.cs index 5a54323..a4d13e6 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/Globals.cs +++ b/Test/ElasticScale.ShardManagement.UnitTests/Globals.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Security; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement.UnitTests diff --git a/Test/ElasticScale.ShardManagement.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement.UnitTests.csproj b/Test/ElasticScale.ShardManagement.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement.UnitTests.csproj index efe3ee6..cef10da 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement.UnitTests.csproj +++ b/Test/ElasticScale.ShardManagement.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement.UnitTests.csproj @@ -1,16 +1,16 @@  - net451;netcoreapp2.0 + netcoreapp3.1 false 0649;$(NoWarn) - - - - + + + + diff --git a/Test/ElasticScale.ShardManagement.UnitTests/RecoveryManagerTests.cs b/Test/ElasticScale.ShardManagement.UnitTests/RecoveryManagerTests.cs index d19f5d1..a4790f2 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/RecoveryManagerTests.cs +++ b/Test/ElasticScale.ShardManagement.UnitTests/RecoveryManagerTests.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement.Recovery; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/Test/ElasticScale.ShardManagement.UnitTests/ScenarioTests.cs b/Test/ElasticScale.ShardManagement.UnitTests/ScenarioTests.cs index a1b171e..c57063b 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/ScenarioTests.cs +++ b/Test/ElasticScale.ShardManagement.UnitTests/ScenarioTests.cs @@ -5,7 +5,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Linq; diff --git a/Test/ElasticScale.ShardManagement.UnitTests/SchemaInfoCollectionTests.cs b/Test/ElasticScale.ShardManagement.UnitTests/SchemaInfoCollectionTests.cs index bbc686f..c92ef2f 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/SchemaInfoCollectionTests.cs +++ b/Test/ElasticScale.ShardManagement.UnitTests/SchemaInfoCollectionTests.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.IO; using System.Linq; using System.Runtime.Serialization; diff --git a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapFaultHandlingTests.cs b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapFaultHandlingTests.cs index 85930ca..bb44605 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapFaultHandlingTests.cs +++ b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapFaultHandlingTests.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Reflection; using Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement.UnitTests.Stubs; diff --git a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerConcurrencyTests.cs b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerConcurrencyTests.cs index 3fcdefc..ec3afd1 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerConcurrencyTests.cs +++ b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerConcurrencyTests.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement; using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Collections.Generic; diff --git a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerFactoryTests.cs b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerFactoryTests.cs index 11c9c52..c39a6f7 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerFactoryTests.cs +++ b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerFactoryTests.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using Microsoft.Azure.SqlDatabase.ElasticScale.Test.Common; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerLoadTests.cs b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerLoadTests.cs index 769417a..e95e55a 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerLoadTests.cs +++ b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerLoadTests.cs @@ -6,7 +6,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Linq; diff --git a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerTests.cs b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerTests.cs index 0b0bd10..e04916f 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerTests.cs +++ b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerTests.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.IO; using System.Runtime.Serialization.Formatters.Binary; using Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement.UnitTests.Stubs; diff --git a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerUpgradeTests.cs b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerUpgradeTests.cs index cd24d4c..34ebe6a 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerUpgradeTests.cs +++ b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapManagerUpgradeTests.cs @@ -4,7 +4,7 @@ using Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement.Recovery; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using Microsoft.Azure.SqlDatabase.ElasticScale.Test.Common; diff --git a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapTests.cs b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapTests.cs index 3502deb..f078ce5 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapTests.cs +++ b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapTests.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement.UnitTests.Stubs; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapperTests.cs b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapperTests.cs index 7e230f2..e05f1a6 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/ShardMapperTests.cs +++ b/Test/ElasticScale.ShardManagement.UnitTests/ShardMapperTests.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; using System.Data; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/Test/ElasticScale.ShardManagement.UnitTests/ShardRangeTests.cs b/Test/ElasticScale.ShardManagement.UnitTests/ShardRangeTests.cs index bc1cb48..74f42c7 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/ShardRangeTests.cs +++ b/Test/ElasticScale.ShardManagement.UnitTests/ShardRangeTests.cs @@ -4,7 +4,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections.Generic; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Linq; using Microsoft.Azure.SqlDatabase.ElasticScale.Test.Common; diff --git a/Test/ElasticScale.ShardManagement.UnitTests/Stubs/StubSqlStoreConnectionFactory.cs b/Test/ElasticScale.ShardManagement.UnitTests/Stubs/StubSqlStoreConnectionFactory.cs index 711ed61..a18a739 100644 --- a/Test/ElasticScale.ShardManagement.UnitTests/Stubs/StubSqlStoreConnectionFactory.cs +++ b/Test/ElasticScale.ShardManagement.UnitTests/Stubs/StubSqlStoreConnectionFactory.cs @@ -3,7 +3,7 @@ using System; using System.Diagnostics; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement.UnitTests.Stubs { From 004982f66c6a4140cfe8adcc4415fb4138f66f1b Mon Sep 17 00:00:00 2001 From: Golois Mouelet Date: Fri, 13 Mar 2020 10:29:32 -0400 Subject: [PATCH 02/14] got feedback from @jaredmoo that we need to support both .net framework and .netstandard --- .../InternalHelpers/ApplicationNameHelper.cs | 6 +++++- .../SqlDatabaseTransientErrorDetectionStrategy.cs | 6 +++++- .../Implementation/ThrottlingCondition.cs | 6 +++++- .../Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj | 6 ++++-- Src/ElasticScale.Client/Query/DbCommandExtensions.cs | 6 +++++- Src/ElasticScale.Client/Query/LabeledDbDataReader.cs | 6 +++++- Src/ElasticScale.Client/Query/MultiShardCommand.cs | 6 +++++- Src/ElasticScale.Client/Query/MultiShardConnection.cs | 6 +++++- Src/ElasticScale.Client/Query/MultiShardDataReader.cs | 6 +++++- .../ShardManagement/Shard/IShardProvider.cs | 6 +++++- .../ShardManagement/Shard/PointMapping.cs | 6 +++++- .../ShardManagement/Shard/RangeMapping.cs | 6 +++++- Src/ElasticScale.Client/ShardManagement/Shard/Shard.cs | 6 +++++- .../ShardManagement/Shard/ValidationUtils.cs | 6 +++++- .../ShardManagement/ShardMap/ListShardMap.cs | 6 +++++- .../ShardManagement/ShardMap/RangeShardMap.cs | 6 +++++- .../ShardManagement/ShardMap/ShardMap.cs | 6 +++++- .../ShardManagement/ShardMap/ShardMapUtils.cs | 6 +++++- .../ShardMapManager/ShardMapManagerFactory.cs | 6 +++++- .../ShardManagement/ShardMapper/BaseShardMapper.cs | 6 +++++- .../ShardManagement/ShardMapper/DefaultShardMapper.cs | 6 +++++- .../ShardManagement/ShardMapper/IShardMapper.cs | 6 +++++- .../ShardManagement/ShardMapper/ListShardMapper.cs | 6 +++++- .../ShardManagement/ShardMapper/RangeShardMapper.cs | 6 +++++- .../ShardManagement/SqlStore/SqlConnectionInfo.cs | 6 +++++- .../ShardManagement/SqlStore/SqlLocation.cs | 6 +++++- .../ShardManagement/SqlStore/SqlLogEntry.cs | 6 +++++- .../ShardManagement/SqlStore/SqlMapping.cs | 6 +++++- .../ShardManagement/SqlStore/SqlResults.cs | 6 +++++- .../ShardManagement/SqlStore/SqlSchemaInfo.cs | 6 +++++- .../ShardManagement/SqlStore/SqlShard.cs | 6 +++++- .../ShardManagement/SqlStore/SqlShardMap.cs | 6 +++++- .../SqlStore/SqlShardMapManagerCredentials.cs | 6 +++++- .../ShardManagement/SqlStore/SqlStoreConnection.cs | 6 +++++- .../ShardManagement/SqlStore/SqlStoreConnectionFactory.cs | 4 ++++ .../ShardManagement/SqlStore/SqlStoreTransactionScope.cs | 6 +++++- .../ShardManagement/SqlStore/SqlUserStoreConnection.cs | 6 +++++- .../ShardManagement/Store/IStoreConnectionFactory.cs | 4 ++++ .../ShardManagement/Store/IStoreTransactionScope.cs | 6 +++++- .../ShardManagement/Store/IUserStoreConnection.cs | 6 +++++- Src/ElasticScale.Client/ShardManagement/Store/SqlVersion.cs | 6 +++++- .../ShardManagement/StoreOperations/Base/StoreOperation.cs | 6 +++++- .../StoreOperations/Base/StoreOperationLocal.cs | 6 +++++- .../StoreOperations/Recovery/DetachShardGlobalOperation.cs | 6 +++++- .../Recovery/ReplaceMappingsGlobalOperation.cs | 6 +++++- .../AddShardingSchemaInfoGlobalOperation.cs | 6 +++++- .../FindShardingSchemaInfoGlobalOperation.cs | 6 +++++- .../GetShardingSchemaInfosGlobalOperation.cs | 6 +++++- .../RemoveShardingSchemaInfoGlobalOperation.cs | 6 +++++- .../UpdateShardingSchemaInfoGlobalOperation.cs | 6 +++++- .../StoreOperations/ShardMap/AddShardOperation.cs | 6 +++++- .../ShardMap/FindShardByLocationGlobalOperation.cs | 6 +++++- .../StoreOperations/ShardMap/GetShardsGlobalOperation.cs | 6 +++++- .../StoreOperations/ShardMap/RemoveShardOperation.cs | 6 +++++- .../StoreOperations/ShardMap/UpdateShardOperation.cs | 6 +++++- .../ShardMapManager/AddShardMapGlobalOperation.cs | 6 +++++- .../ShardMapManager/FindShardMapByNameGlobalOperation.cs | 6 +++++- .../GetDistinctShardLocationsGlobalOperation.cs | 6 +++++- .../ShardMapManager/GetShardMapsGlobalOperation.cs | 6 +++++- .../ShardMapManager/LoadShardMapManagerGlobalOperation.cs | 6 +++++- .../ShardMapManager/RemoveShardMapGlobalOperation.cs | 6 +++++- .../CreateShardMapManagerGlobalOperation.cs | 6 +++++- .../StoreOperations/ShardMapper/AddMappingOperation.cs | 6 +++++- .../ShardMapper/FindMappingByIdGlobalOperation.cs | 6 +++++- .../ShardMapper/FindMappingByKeyGlobalOperation.cs | 6 +++++- .../ShardMapper/GetMappingsByRangeGlobalOperation.cs | 6 +++++- .../ShardMapper/LockOrUnLockMappingsGlobalOperation.cs | 6 +++++- .../StoreOperations/ShardMapper/RemoveMappingOperation.cs | 6 +++++- .../StoreOperations/ShardMapper/ReplaceMappingsOperation.cs | 6 +++++- .../StoreOperations/ShardMapper/UpdateMappingOperation.cs | 6 +++++- .../StoreOperations/Upgrade/UpgradeStoreGlobalOperation.cs | 6 +++++- Src/ElasticScale.Client/ShardManagement/Utils/SqlUtils.cs | 6 +++++- 72 files changed, 357 insertions(+), 71 deletions(-) diff --git a/Src/ElasticScale.Client/ElasticScale.Common/InternalHelpers/ApplicationNameHelper.cs b/Src/ElasticScale.Client/ElasticScale.Common/InternalHelpers/ApplicationNameHelper.cs index 82c6936..a1e124f 100644 --- a/Src/ElasticScale.Client/ElasticScale.Common/InternalHelpers/ApplicationNameHelper.cs +++ b/Src/ElasticScale.Client/ElasticScale.Common/InternalHelpers/ApplicationNameHelper.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System; using System.Collections.Generic; using System.Linq; diff --git a/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/SqlDatabaseTransientErrorDetectionStrategy.cs b/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/SqlDatabaseTransientErrorDetectionStrategy.cs index d9c2605..c03cfa9 100644 --- a/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/SqlDatabaseTransientErrorDetectionStrategy.cs +++ b/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/SqlDatabaseTransientErrorDetectionStrategy.cs @@ -12,7 +12,11 @@ using System; using System.ComponentModel; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale { diff --git a/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/ThrottlingCondition.cs b/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/ThrottlingCondition.cs index 4c91c09..572f0a0 100644 --- a/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/ThrottlingCondition.cs +++ b/Src/ElasticScale.Client/ElasticScale.Common/TransientFaultHandling/Implementation/ThrottlingCondition.cs @@ -12,7 +12,11 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Globalization; using System.Linq; using System.Text; diff --git a/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj b/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj index 4f01dbe..20f64ba 100644 --- a/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj +++ b/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj @@ -7,7 +7,7 @@ en-US 2.4.0-preview1 Microsoft - netstandard2.0 + net451;net46;netstandard2.0 Microsoft;Elastic;Scale;Azure;SQL;DB;Database;Shard;Sharding;Management;Query;azureofficial Added support for SqlConnection.AccessToken. This can be provided by using OpenConnection methods that receive SqlConnectionInfo parameter. Using AccessToken requires .NET 4.6 or higher, or .NET Standard with System.Data.SqlClient 4.6 or higher. http://go.microsoft.com/fwlink/?LinkID=288890 @@ -19,6 +19,8 @@ win;unix Microsoft.Azure.SqlDatabase.ElasticScale + + @@ -47,7 +49,7 @@ - + 1.1.1 diff --git a/Src/ElasticScale.Client/Query/DbCommandExtensions.cs b/Src/ElasticScale.Client/Query/DbCommandExtensions.cs index efffc6b..6a58c25 100644 --- a/Src/ElasticScale.Client/Query/DbCommandExtensions.cs +++ b/Src/ElasticScale.Client/Query/DbCommandExtensions.cs @@ -1,7 +1,11 @@ using System; using System.Collections.Generic; using System.Data.Common; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Linq; using System.Reflection; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/Query/LabeledDbDataReader.cs b/Src/ElasticScale.Client/Query/LabeledDbDataReader.cs index 1f250bf..4bbcc1a 100644 --- a/Src/ElasticScale.Client/Query/LabeledDbDataReader.cs +++ b/Src/ElasticScale.Client/Query/LabeledDbDataReader.cs @@ -11,7 +11,11 @@ using System; using System.Data.Common; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement; namespace Microsoft.Azure.SqlDatabase.ElasticScale.Query diff --git a/Src/ElasticScale.Client/Query/MultiShardCommand.cs b/Src/ElasticScale.Client/Query/MultiShardCommand.cs index db6bebe..545a6e1 100644 --- a/Src/ElasticScale.Client/Query/MultiShardCommand.cs +++ b/Src/ElasticScale.Client/Query/MultiShardCommand.cs @@ -16,7 +16,11 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Diagnostics.Contracts; using System.IO; diff --git a/Src/ElasticScale.Client/Query/MultiShardConnection.cs b/Src/ElasticScale.Client/Query/MultiShardConnection.cs index 87f655b..ba69be9 100644 --- a/Src/ElasticScale.Client/Query/MultiShardConnection.cs +++ b/Src/ElasticScale.Client/Query/MultiShardConnection.cs @@ -12,7 +12,11 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Linq; using Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement; diff --git a/Src/ElasticScale.Client/Query/MultiShardDataReader.cs b/Src/ElasticScale.Client/Query/MultiShardDataReader.cs index 602f68b..f663ea0 100644 --- a/Src/ElasticScale.Client/Query/MultiShardDataReader.cs +++ b/Src/ElasticScale.Client/Query/MultiShardDataReader.cs @@ -17,7 +17,11 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Data.SqlTypes; using System.Diagnostics; using System.Diagnostics.Contracts; diff --git a/Src/ElasticScale.Client/ShardManagement/Shard/IShardProvider.cs b/Src/ElasticScale.Client/ShardManagement/Shard/IShardProvider.cs index 0f85351..b6a3722 100644 --- a/Src/ElasticScale.Client/ShardManagement/Shard/IShardProvider.cs +++ b/Src/ElasticScale.Client/ShardManagement/Shard/IShardProvider.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Threading.Tasks; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/Shard/PointMapping.cs b/Src/ElasticScale.Client/ShardManagement/Shard/PointMapping.cs index 05ef583..1fd9a51 100644 --- a/Src/ElasticScale.Client/ShardManagement/Shard/PointMapping.cs +++ b/Src/ElasticScale.Client/ShardManagement/Shard/PointMapping.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/Shard/RangeMapping.cs b/Src/ElasticScale.Client/ShardManagement/Shard/RangeMapping.cs index dee0614..d36085d 100644 --- a/Src/ElasticScale.Client/ShardManagement/Shard/RangeMapping.cs +++ b/Src/ElasticScale.Client/ShardManagement/Shard/RangeMapping.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/Shard/Shard.cs b/Src/ElasticScale.Client/ShardManagement/Shard/Shard.cs index 1b75e0e..ade8328 100644 --- a/Src/ElasticScale.Client/ShardManagement/Shard/Shard.cs +++ b/Src/ElasticScale.Client/ShardManagement/Shard/Shard.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/Shard/ValidationUtils.cs b/Src/ElasticScale.Client/ShardManagement/Shard/ValidationUtils.cs index 4c2b339..f5ac8d7 100644 --- a/Src/ElasticScale.Client/ShardManagement/Shard/ValidationUtils.cs +++ b/Src/ElasticScale.Client/ShardManagement/Shard/ValidationUtils.cs @@ -3,7 +3,11 @@ using System; using System.Data; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Data.SqlTypes; using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMap/ListShardMap.cs b/Src/ElasticScale.Client/ShardManagement/ShardMap/ListShardMap.cs index c802bfe..3f7ae6d 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMap/ListShardMap.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMap/ListShardMap.cs @@ -3,7 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMap/RangeShardMap.cs b/Src/ElasticScale.Client/ShardManagement/ShardMap/RangeShardMap.cs index 13217c4..378fcc9 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMap/RangeShardMap.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMap/RangeShardMap.cs @@ -3,7 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMap.cs b/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMap.cs index 6afdd16..5a00344 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMap.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMap.cs @@ -3,7 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMapUtils.cs b/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMapUtils.cs index 393cb5f..becd4a9 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMapUtils.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMapUtils.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Globalization; using System.Reflection; diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMapManager/ShardMapManagerFactory.cs b/Src/ElasticScale.Client/ShardManagement/ShardMapManager/ShardMapManagerFactory.cs index a0e8698..16db88d 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMapManager/ShardMapManagerFactory.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMapManager/ShardMapManagerFactory.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMapper/BaseShardMapper.cs b/Src/ElasticScale.Client/ShardManagement/ShardMapper/BaseShardMapper.cs index b71b6be..56fb797 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMapper/BaseShardMapper.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMapper/BaseShardMapper.cs @@ -3,7 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Linq; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMapper/DefaultShardMapper.cs b/Src/ElasticScale.Client/ShardManagement/ShardMapper/DefaultShardMapper.cs index 78f7734..1efa4cc 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMapper/DefaultShardMapper.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMapper/DefaultShardMapper.cs @@ -3,7 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Linq; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMapper/IShardMapper.cs b/Src/ElasticScale.Client/ShardManagement/ShardMapper/IShardMapper.cs index 462c208..a6e188d 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMapper/IShardMapper.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMapper/IShardMapper.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Threading.Tasks; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMapper/ListShardMapper.cs b/Src/ElasticScale.Client/ShardManagement/ShardMapper/ListShardMapper.cs index 5ec9074..9b3a219 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMapper/ListShardMapper.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMapper/ListShardMapper.cs @@ -3,7 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Threading.Tasks; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMapper/RangeShardMapper.cs b/Src/ElasticScale.Client/ShardManagement/ShardMapper/RangeShardMapper.cs index 3be0615..59cbda2 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMapper/RangeShardMapper.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMapper/RangeShardMapper.cs @@ -3,7 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Linq; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlConnectionInfo.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlConnectionInfo.cs index a0fdb04..dfd7ddb 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlConnectionInfo.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlConnectionInfo.cs @@ -3,7 +3,11 @@ using System; using System.Data.Common; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLocation.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLocation.cs index 777ce1e..9988fb1 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLocation.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLocation.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Data.SqlTypes; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLogEntry.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLogEntry.cs index c6055bc..a8ae38c 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLogEntry.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlLogEntry.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Data.SqlTypes; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlMapping.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlMapping.cs index a8fab4a..d788632 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlMapping.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlMapping.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlResults.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlResults.cs index 626ccc2..e7dee7d 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlResults.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlResults.cs @@ -3,7 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlSchemaInfo.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlSchemaInfo.cs index 7e26b71..f5a0b09 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlSchemaInfo.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlSchemaInfo.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Data.SqlTypes; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShard.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShard.cs index 9c18510..df750d0 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShard.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShard.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Data.SqlTypes; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMap.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMap.cs index f14b573..5467028 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMap.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMap.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMapManagerCredentials.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMapManagerCredentials.cs index 02ae635..2ab38de 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMapManagerCredentials.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMapManagerCredentials.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnection.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnection.cs index 537103b..4033816 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnection.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnection.cs @@ -3,7 +3,11 @@ using System; using System.Data; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Threading.Tasks; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnectionFactory.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnectionFactory.cs index bddadae..77e8577 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnectionFactory.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreConnectionFactory.cs @@ -3,7 +3,11 @@ namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { +#if NETFRAMEWORK + using System.Data.SqlClient; +#else using Microsoft.Data.SqlClient; +#endif /// /// Constructs instance of Sql Store Connection. diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreTransactionScope.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreTransactionScope.cs index 71fc89c..906d74f 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreTransactionScope.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlStoreTransactionScope.cs @@ -4,7 +4,11 @@ using System; using System.Collections.Generic; using System.Data; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Data.SqlTypes; using System.Diagnostics; using System.Text; diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlUserStoreConnection.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlUserStoreConnection.cs index c570dbb..bf4cbb7 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlUserStoreConnection.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlUserStoreConnection.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Threading.Tasks; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/Store/IStoreConnectionFactory.cs b/Src/ElasticScale.Client/ShardManagement/Store/IStoreConnectionFactory.cs index 95dc823..51a29c8 100644 --- a/Src/ElasticScale.Client/ShardManagement/Store/IStoreConnectionFactory.cs +++ b/Src/ElasticScale.Client/ShardManagement/Store/IStoreConnectionFactory.cs @@ -3,7 +3,11 @@ namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { +#if NETFRAMEWORK + using System.Data.SqlClient; +#else using Microsoft.Data.SqlClient; +#endif /// /// Factory for store connections. diff --git a/Src/ElasticScale.Client/ShardManagement/Store/IStoreTransactionScope.cs b/Src/ElasticScale.Client/ShardManagement/Store/IStoreTransactionScope.cs index c1b3644..48df0e2 100644 --- a/Src/ElasticScale.Client/ShardManagement/Store/IStoreTransactionScope.cs +++ b/Src/ElasticScale.Client/ShardManagement/Store/IStoreTransactionScope.cs @@ -3,7 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Data.SqlTypes; using System.Text; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/Store/IUserStoreConnection.cs b/Src/ElasticScale.Client/ShardManagement/Store/IUserStoreConnection.cs index bad07cd..4562f8b 100644 --- a/Src/ElasticScale.Client/ShardManagement/Store/IUserStoreConnection.cs +++ b/Src/ElasticScale.Client/ShardManagement/Store/IUserStoreConnection.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Threading.Tasks; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/Store/SqlVersion.cs b/Src/ElasticScale.Client/ShardManagement/Store/SqlVersion.cs index 0847ed2..83d20f5 100644 --- a/Src/ElasticScale.Client/ShardManagement/Store/SqlVersion.cs +++ b/Src/ElasticScale.Client/ShardManagement/Store/SqlVersion.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Data.SqlTypes; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperation.cs index dde3b07..88e9aac 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperation.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Linq; diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperationLocal.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperationLocal.cs index bf412af..dc29bb7 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperationLocal.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Base/StoreOperationLocal.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/DetachShardGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/DetachShardGlobalOperation.cs index d7db1d1..4b3eb14 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/DetachShardGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/DetachShardGlobalOperation.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/ReplaceMappingsGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/ReplaceMappingsGlobalOperation.cs index 8b41e74..9a5ad4e 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/ReplaceMappingsGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Recovery/ReplaceMappingsGlobalOperation.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Collections.Generic; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Linq; diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/AddShardingSchemaInfoGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/AddShardingSchemaInfoGlobalOperation.cs index 4af3fa9..8ae03f2 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/AddShardingSchemaInfoGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/AddShardingSchemaInfoGlobalOperation.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/FindShardingSchemaInfoGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/FindShardingSchemaInfoGlobalOperation.cs index 02d212b..d414e5e 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/FindShardingSchemaInfoGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/FindShardingSchemaInfoGlobalOperation.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/GetShardingSchemaInfosGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/GetShardingSchemaInfosGlobalOperation.cs index bd9eecb..370827e 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/GetShardingSchemaInfosGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/GetShardingSchemaInfosGlobalOperation.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/RemoveShardingSchemaInfoGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/RemoveShardingSchemaInfoGlobalOperation.cs index 3489487..cee3bd4 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/RemoveShardingSchemaInfoGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/RemoveShardingSchemaInfoGlobalOperation.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/UpdateShardingSchemaInfoGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/UpdateShardingSchemaInfoGlobalOperation.cs index 1e4ad80..9c281b1 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/UpdateShardingSchemaInfoGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/SchemaInformation/UpdateShardingSchemaInfoGlobalOperation.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/AddShardOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/AddShardOperation.cs index 22ba3bc..b5699dd 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/AddShardOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/AddShardOperation.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Linq; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/FindShardByLocationGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/FindShardByLocationGlobalOperation.cs index 86b1aec..df23d98 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/FindShardByLocationGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/FindShardByLocationGlobalOperation.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/GetShardsGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/GetShardsGlobalOperation.cs index 0e923d2..fbd5c3e 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/GetShardsGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/GetShardsGlobalOperation.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/RemoveShardOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/RemoveShardOperation.cs index ece6529..b7da93c 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/RemoveShardOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/RemoveShardOperation.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Linq; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/UpdateShardOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/UpdateShardOperation.cs index 89075a7..a2024e2 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/UpdateShardOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMap/UpdateShardOperation.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Linq; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/AddShardMapGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/AddShardMapGlobalOperation.cs index 432b341..de944b5 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/AddShardMapGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/AddShardMapGlobalOperation.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/FindShardMapByNameGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/FindShardMapByNameGlobalOperation.cs index bcbcd68..7d24df7 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/FindShardMapByNameGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/FindShardMapByNameGlobalOperation.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetDistinctShardLocationsGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetDistinctShardLocationsGlobalOperation.cs index 13b5a37..c5ac072 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetDistinctShardLocationsGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetDistinctShardLocationsGlobalOperation.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetShardMapsGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetShardMapsGlobalOperation.cs index 63908f8..4fc9db7 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetShardMapsGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/GetShardMapsGlobalOperation.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/LoadShardMapManagerGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/LoadShardMapManagerGlobalOperation.cs index df960ae..94800d6 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/LoadShardMapManagerGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/LoadShardMapManagerGlobalOperation.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Collections.Generic; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Linq; diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/RemoveShardMapGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/RemoveShardMapGlobalOperation.cs index 8cece4e..939f3e6 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/RemoveShardMapGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManager/RemoveShardMapGlobalOperation.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManagerFactory/CreateShardMapManagerGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManagerFactory/CreateShardMapManagerGlobalOperation.cs index 82552fc..76e6346 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManagerFactory/CreateShardMapManagerGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapManagerFactory/CreateShardMapManagerGlobalOperation.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Linq; using System.Diagnostics; diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/AddMappingOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/AddMappingOperation.cs index e1d99be..dca4bbe 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/AddMappingOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/AddMappingOperation.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Linq; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByIdGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByIdGlobalOperation.cs index ec313f1..4e7723c 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByIdGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByIdGlobalOperation.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByKeyGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByKeyGlobalOperation.cs index 91275dd..8d6f6ed 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByKeyGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/FindMappingByKeyGlobalOperation.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Threading.Tasks; diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/GetMappingsByRangeGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/GetMappingsByRangeGlobalOperation.cs index 60032a5..30f7dce 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/GetMappingsByRangeGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/GetMappingsByRangeGlobalOperation.cs @@ -1,7 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement { diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/LockOrUnLockMappingsGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/LockOrUnLockMappingsGlobalOperation.cs index df06bed..ff30aa6 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/LockOrUnLockMappingsGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/LockOrUnLockMappingsGlobalOperation.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Linq; diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/RemoveMappingOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/RemoveMappingOperation.cs index d20e01e..c1ec2b3 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/RemoveMappingOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/RemoveMappingOperation.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Linq; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/ReplaceMappingsOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/ReplaceMappingsOperation.cs index 145283f..4e41854 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/ReplaceMappingsOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/ReplaceMappingsOperation.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System.Linq; diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/UpdateMappingOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/UpdateMappingOperation.cs index ad0691f..c13f5fd 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/UpdateMappingOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/ShardMapper/UpdateMappingOperation.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; namespace Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement diff --git a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Upgrade/UpgradeStoreGlobalOperation.cs b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Upgrade/UpgradeStoreGlobalOperation.cs index cb321d9..13dcf53 100644 --- a/Src/ElasticScale.Client/ShardManagement/StoreOperations/Upgrade/UpgradeStoreGlobalOperation.cs +++ b/Src/ElasticScale.Client/ShardManagement/StoreOperations/Upgrade/UpgradeStoreGlobalOperation.cs @@ -2,7 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Linq; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Diagnostics; using System; diff --git a/Src/ElasticScale.Client/ShardManagement/Utils/SqlUtils.cs b/Src/ElasticScale.Client/ShardManagement/Utils/SqlUtils.cs index 5c75409..cc9d9a9 100644 --- a/Src/ElasticScale.Client/ShardManagement/Utils/SqlUtils.cs +++ b/Src/ElasticScale.Client/ShardManagement/Utils/SqlUtils.cs @@ -5,7 +5,11 @@ using System.Collections; using System.Collections.Generic; using System.Data; -using Microsoft.Data.SqlClient; +#if NETFRAMEWORK + using System.Data.SqlClient; +#else + using Microsoft.Data.SqlClient; +#endif using System.Data.SqlTypes; using System.Diagnostics; using System.IO; From ed03b612a4fdf13d605d897e90e7aa0efeea3ace Mon Sep 17 00:00:00 2001 From: Navjot Singh Date: Thu, 13 May 2021 12:15:42 -0700 Subject: [PATCH 03/14] Update ExceptionUtils.cs Using ShardManagementException constructor which takes inner exception. --- Src/ElasticScale.Client/ShardManagement/Utils/ExceptionUtils.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/ElasticScale.Client/ShardManagement/Utils/ExceptionUtils.cs b/Src/ElasticScale.Client/ShardManagement/Utils/ExceptionUtils.cs index a4da98a..c271815 100644 --- a/Src/ElasticScale.Client/ShardManagement/Utils/ExceptionUtils.cs +++ b/Src/ElasticScale.Client/ShardManagement/Utils/ExceptionUtils.cs @@ -97,8 +97,8 @@ internal static ShardManagementException GetStoreExceptionGlobal( category, ShardManagementErrorCode.StorageOperationFailure, Errors._Store_SqlExceptionGlobal, - storeException.InnerException != null ? storeException.InnerException.Message : storeException.Message, storeException, + storeException.InnerException != null ? storeException.InnerException.Message : storeException.Message, operationName); } From ca0557f2db708612b959848b957706b23047a232 Mon Sep 17 00:00:00 2001 From: Andrew Young Date: Tue, 18 May 2021 15:15:01 -0700 Subject: [PATCH 04/14] Upgrade SqlClient to 2.1.2. Add more authentication schemes --- .../Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj | 6 +++--- .../ShardManagement/ShardMap/ShardMapUtils.cs | 4 ++++ .../SqlStore/SqlShardMapManagerCredentials.cs | 7 ++++++- ....Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj | 2 +- ...t.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj b/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj index 20f64ba..8defc76 100644 --- a/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj +++ b/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj @@ -19,8 +19,8 @@ win;unix Microsoft.Azure.SqlDatabase.ElasticScale - - + + @@ -51,7 +51,7 @@ - 1.1.1 + 2.1.2 diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMapUtils.cs b/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMapUtils.cs index becd4a9..9cdc761 100644 --- a/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMapUtils.cs +++ b/Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMapUtils.cs @@ -43,6 +43,10 @@ internal static class ShardMapUtils /// because it may not be available in the .NET framework version that we are running in /// internal static readonly string ActiveDirectoryInteractiveStr = "ActiveDirectoryInteractive"; + internal static readonly string ActiveDirectoryServicePrincipal = "ActiveDirectoryServicePrincipal"; + internal static readonly string ActiveDirectoryDeviceCodeFlow = "ActiveDirectoryDeviceCodeFlow"; + internal static readonly string ActiveDirectoryManagedIdentity = "ActiveDirectoryManagedIdentity"; + internal static readonly string ActiveDirectoryMSI = "ActiveDirectoryMSI"; [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline")] static ShardMapUtils() diff --git a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMapManagerCredentials.cs b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMapManagerCredentials.cs index 2ab38de..d573fdd 100644 --- a/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMapManagerCredentials.cs +++ b/Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMapManagerCredentials.cs @@ -166,7 +166,12 @@ internal static void EnsureCredentials( { string authentication = connectionString[ShardMapUtils.Authentication].ToString(); if (authentication.Equals(ShardMapUtils.ActiveDirectoryIntegratedStr, StringComparison.OrdinalIgnoreCase) - || authentication.Equals(ShardMapUtils.ActiveDirectoryInteractiveStr, StringComparison.OrdinalIgnoreCase)) + || authentication.Equals(ShardMapUtils.ActiveDirectoryInteractiveStr, StringComparison.OrdinalIgnoreCase) + || authentication.Equals(ShardMapUtils.ActiveDirectoryManagedIdentity, StringComparison.OrdinalIgnoreCase) + || authentication.Equals(ShardMapUtils.ActiveDirectoryServicePrincipal, StringComparison.OrdinalIgnoreCase) + || authentication.Equals(ShardMapUtils.ActiveDirectoryDeviceCodeFlow, StringComparison.OrdinalIgnoreCase) + || authentication.Equals(ShardMapUtils.ActiveDirectoryMSI, StringComparison.OrdinalIgnoreCase) + ) { return; } diff --git a/Test/ElasticScale.ClientTestCommon/Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj b/Test/ElasticScale.ClientTestCommon/Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj index 204f67d..e5704d4 100644 --- a/Test/ElasticScale.ClientTestCommon/Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj +++ b/Test/ElasticScale.ClientTestCommon/Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj b/Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj index 8e96093..3beb214 100644 --- a/Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj +++ b/Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj @@ -9,7 +9,7 @@ - + From 36ae20fe63b8517463256afb2b72248a04f8b177 Mon Sep 17 00:00:00 2001 From: stuartpa Date: Sat, 17 Dec 2022 11:48:54 -0800 Subject: [PATCH 05/14] Bump System.Data.SqlClient to 4.8.5 --- .../Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj | 2 +- ...osoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj | 2 +- ...rosoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj b/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj index c34d9b4..0a3d16b 100644 --- a/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj +++ b/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj @@ -24,7 +24,7 @@ - + diff --git a/Test/ElasticScale.ClientTestCommon/Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj b/Test/ElasticScale.ClientTestCommon/Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj index 07fc952..a1b332c 100644 --- a/Test/ElasticScale.ClientTestCommon/Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj +++ b/Test/ElasticScale.ClientTestCommon/Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj b/Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj index 7daa778..1fcfeb5 100644 --- a/Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj +++ b/Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj @@ -9,7 +9,7 @@ - + From 385f34561e6fdcbd22a60dd2b2d7e19fee62ed9f Mon Sep 17 00:00:00 2001 From: "microsoft-github-policy-service[bot]" <77245923+microsoft-github-policy-service[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 17:24:34 +0000 Subject: [PATCH 06/14] Microsoft mandatory file --- SECURITY.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..e138ec5 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,41 @@ + + +## Security + +Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/). + +If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below. + +## Reporting Security Issues + +**Please do not report security vulnerabilities through public GitHub issues.** + +Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report). + +If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey). + +You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). + +Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue: + + * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.) + * Full paths of source file(s) related to the manifestation of the issue + * The location of the affected source code (tag/branch/commit or direct URL) + * Any special configuration required to reproduce the issue + * Step-by-step instructions to reproduce the issue + * Proof-of-concept or exploit code (if possible) + * Impact of the issue, including how an attacker might exploit the issue + +This information will help us triage your report more quickly. + +If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs. + +## Preferred Languages + +We prefer all communications to be in English. + +## Policy + +Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd). + + From 3475147cf86c995517a7eadce2022048a0038352 Mon Sep 17 00:00:00 2001 From: Stuart Padley Date: Wed, 15 Mar 2023 08:01:59 +0000 Subject: [PATCH 07/14] Set up CI with Azure Pipelines [skip ci] --- azure-pipelines.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..6a9684e --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,33 @@ +# .NET Desktop +# Build and run tests for .NET Desktop or Windows classic desktop solutions. +# Add steps that publish symbols, save build artifacts, and more: +# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net + +trigger: +- master + +pool: + vmImage: 'windows-latest' + +variables: + solution: '**/*.sln' + buildPlatform: 'Any CPU' + buildConfiguration: 'Release' + +steps: +- task: NuGetToolInstaller@1 + +- task: NuGetCommand@2 + inputs: + restoreSolution: '$(solution)' + +- task: VSBuild@1 + inputs: + solution: '$(solution)' + platform: '$(buildPlatform)' + configuration: '$(buildConfiguration)' + +- task: VSTest@2 + inputs: + platform: '$(buildPlatform)' + configuration: '$(buildConfiguration)' From 8ffbbfea193324a93a78845cd161c36aaf603c78 Mon Sep 17 00:00:00 2001 From: Stuart Padley Date: Tue, 21 Mar 2023 13:38:28 +0000 Subject: [PATCH 08/14] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 57 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6a9684e..3c43a44 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -31,3 +31,60 @@ steps: inputs: platform: '$(buildPlatform)' configuration: '$(buildConfiguration)' + +- task: EsrpCodeSigning@1 + displayName: ESRP CodeSigning - *.dll + inputs: + ConnectedServiceName: c79f9758-1916-461b-a046-681af3058521 + FolderPath: src + Pattern: '*.dll' + signConfigType: inlineSignParams + inlineOperation: >- + [ + { + "keyCode": "CP-230012", + "operationSetCode": "SigntoolSign", + "parameters": [ + { + "parameterName": "OpusName", + "parameterValue": "Microsoft" + }, + { + "parameterName": "OpusInfo", + "parameterValue": "http://www.microsoft.com" + }, + { + "parameterName": "PageHash", + "parameterValue": "/NPH" + }, + { + "parameterName": "FileDigest", + "parameterValue": "/fd sha256" + }, + { + "parameterName": "TimeStamp", + "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256" + } + ], + "toolName": "signtool.exe", + "toolVersion": "6.2.9304.0" + } + ] +- task: DotNetCoreCLI@2 + name: DotNetCoreCLI3 + displayName: dotnet pack + inputs: + command: pack + searchPatternPack: Src/**/*.csproj + outputDir: $(Build.ArtifactStagingDirectory)\pkg + nobuild: true +- task: EsrpCodeSigning@1 + displayName: ESRP CodeSigning - *.nupkg + enabled: False + inputs: + ConnectedServiceName: c79f9758-1916-461b-a046-681af3058521 + FolderPath: $(Build.ArtifactStagingDirectory)\pkg + Pattern: '*.nupkg' + signConfigType: inlineSignParams + CertificateId: 402 + inlineOperation: "[ \n {\n \"keyCode\": \"CP-401405\",\n \"operationSetCode\": \"NuGetSign\",\n \"parameters\": [ ],\n \"toolName\": \"sign\",\n \"toolVersion\": \"1.0\"\n },\n {\n \"keyCode\": \"CP-401405\",\n \"operationSetCode\": \"NuGetVerify\",\n \"parameters\": [ ],\n \"toolName\": \"sign\",\n \"toolVersion\": \"1.0\"\n }\n]" From 334333fbf83d64049f65f31e410310a57dacfe5b Mon Sep 17 00:00:00 2001 From: Stuart Padley Date: Tue, 21 Mar 2023 13:44:02 +0000 Subject: [PATCH 09/14] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 83 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 77 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3c43a44..2eee868 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,14 +32,14 @@ steps: platform: '$(buildPlatform)' configuration: '$(buildConfiguration)' -- task: EsrpCodeSigning@1 +- task: EsrpCodeSigning@2 displayName: ESRP CodeSigning - *.dll inputs: - ConnectedServiceName: c79f9758-1916-461b-a046-681af3058521 + ConnectedServiceName: 'Code Signing' FolderPath: src Pattern: '*.dll' - signConfigType: inlineSignParams - inlineOperation: >- + signConfigType: 'inlineSignParams' + inlineOperation: | [ { "keyCode": "CP-230012", @@ -47,11 +47,11 @@ steps: "parameters": [ { "parameterName": "OpusName", - "parameterValue": "Microsoft" + "parameterValue": "go-sqlcmd" }, { "parameterName": "OpusInfo", - "parameterValue": "http://www.microsoft.com" + "parameterValue": "https://github.com/microsoft/go-sqlcmd" }, { "parameterName": "PageHash", @@ -68,8 +68,24 @@ steps: ], "toolName": "signtool.exe", "toolVersion": "6.2.9304.0" + }, + { + "keyCode": "CP-230012", + "operationSetCode": "SigntoolVerify", + "parameters": [ + { + "parameterName": "VerifyAll", + "parameterValue": "/all" + } + ], + "toolName": "signtool.exe", + "toolVersion": "6.2.9304.0" } ] + SessionTimeout: '60' + MaxConcurrency: '50' + MaxRetryAttempts: '5' + - task: DotNetCoreCLI@2 name: DotNetCoreCLI3 displayName: dotnet pack @@ -78,6 +94,61 @@ steps: searchPatternPack: Src/**/*.csproj outputDir: $(Build.ArtifactStagingDirectory)\pkg nobuild: true + +- task: EsrpCodeSigning@2 + displayName: ESRP CodeSigning - *.nupkg + inputs: + ConnectedServiceName: 'Code Signing' + FolderPath: $(Build.ArtifactStagingDirectory)\pkg + Pattern: '*.nupkg' + signConfigType: 'inlineSignParams' + inlineOperation: | + [ + { + "keyCode": "CP-230012", + "operationSetCode": "SigntoolSign", + "parameters": [ + { + "parameterName": "OpusName", + "parameterValue": "go-sqlcmd" + }, + { + "parameterName": "OpusInfo", + "parameterValue": "https://github.com/microsoft/go-sqlcmd" + }, + { + "parameterName": "PageHash", + "parameterValue": "/NPH" + }, + { + "parameterName": "FileDigest", + "parameterValue": "/fd sha256" + }, + { + "parameterName": "TimeStamp", + "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256" + } + ], + "toolName": "signtool.exe", + "toolVersion": "6.2.9304.0" + }, + { + "keyCode": "CP-230012", + "operationSetCode": "SigntoolVerify", + "parameters": [ + { + "parameterName": "VerifyAll", + "parameterValue": "/all" + } + ], + "toolName": "signtool.exe", + "toolVersion": "6.2.9304.0" + } + ] + SessionTimeout: '60' + MaxConcurrency: '50' + MaxRetryAttempts: '5' + - task: EsrpCodeSigning@1 displayName: ESRP CodeSigning - *.nupkg enabled: False From bf8eaaafd09c1406835c11ef85d4ca3f50d4411a Mon Sep 17 00:00:00 2001 From: Stuart Padley Date: Tue, 21 Mar 2023 14:01:47 +0000 Subject: [PATCH 10/14] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2eee868..9439fd7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -27,10 +27,10 @@ steps: platform: '$(buildPlatform)' configuration: '$(buildConfiguration)' -- task: VSTest@2 - inputs: - platform: '$(buildPlatform)' - configuration: '$(buildConfiguration)' +# - task: VSTest@2 +# inputs: +# platform: '$(buildPlatform)' +# configuration: '$(buildConfiguration)' - task: EsrpCodeSigning@2 displayName: ESRP CodeSigning - *.dll From 1c53c93cfbba59e3b3d24b2943f7f226b5a45466 Mon Sep 17 00:00:00 2001 From: Stuart Padley Date: Tue, 21 Mar 2023 07:32:30 -0700 Subject: [PATCH 11/14] Remove deprecated elements that break dotnet pack --- ...t.Azure.SqlDatabase.ElasticScale.Client.csproj | 5 +++-- Src/ElasticScale.Client/Properties/Icon.png | Bin 0 -> 393 bytes 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 Src/ElasticScale.Client/Properties/Icon.png diff --git a/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj b/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj index 0a3d16b..c5f605c 100644 --- a/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj +++ b/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj @@ -10,9 +10,9 @@ net451;net46;netstandard2.0 Microsoft;Elastic;Scale;Azure;SQL;DB;Database;Shard;Sharding;Management;Query;azureofficial Added support for SqlConnection.AccessToken. This can be provided by using OpenConnection methods that receive SqlConnectionInfo parameter. Using AccessToken requires .NET 4.6 or higher, or .NET Standard with System.Data.SqlClient 4.6 or higher. - http://go.microsoft.com/fwlink/?LinkID=288890 + Icon.png https://github.com/Azure/elastic-db-tools - https://github.com/Azure/elastic-db-tools/blob/master/LICENSE + MIT true git https://github.com/Azure/elastic-db-tools @@ -28,6 +28,7 @@ + True True diff --git a/Src/ElasticScale.Client/Properties/Icon.png b/Src/ElasticScale.Client/Properties/Icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1e58d764e3b2a499f3f2ed11f011688a5f715e1f GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)oCO|{#S9F5M?jcysy3fA0|TSA zr;B4q#jUru4YQaWMH(K~i?4QN`N&qb@r+{9YsMn+gPSWDZa?A5)X@p5Y;|BdJSpi~ zQpmAGS`+ph_#duq*6*LTv4T0RKC-y-N6cBqV~uIvlkXZbuZhoW)H@MV*|4QjOWy6O zc=7{nfd|YV>gwuP?k)PWf%i;<+=8zH|8y8xMFJcceI0=G1r`F#58F@uXWbC@(Ra$$ zTN<*fpF1zOY4qXk&CL?A>n%6@&CtC4A<*iB&0EGcajOKu7aZ?rr&ju3e}ACQBAoNV zw^@gkF63~oxBOubvoFAblaP%U-i7C{NIUf{bxP5No0n`4oPL!x<<)AI-wB()&a>^l a$oXleu8_#$?>m8E%i!ti=d#Wzp$P!^ypzZP literal 0 HcmV?d00001 From a55194946e25b03a93596835a2eb749aad54f679 Mon Sep 17 00:00:00 2001 From: Stuart Padley Date: Tue, 21 Mar 2023 15:11:16 +0000 Subject: [PATCH 12/14] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9439fd7..f2f9ea6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -106,7 +106,7 @@ steps: [ { "keyCode": "CP-230012", - "operationSetCode": "SigntoolSign", + "operationSetCode": "NuGetSign", "parameters": [ { "parameterName": "OpusName", @@ -134,7 +134,7 @@ steps: }, { "keyCode": "CP-230012", - "operationSetCode": "SigntoolVerify", + "operationSetCode": "NuGetVerify", "parameters": [ { "parameterName": "VerifyAll", @@ -148,14 +148,3 @@ steps: SessionTimeout: '60' MaxConcurrency: '50' MaxRetryAttempts: '5' - -- task: EsrpCodeSigning@1 - displayName: ESRP CodeSigning - *.nupkg - enabled: False - inputs: - ConnectedServiceName: c79f9758-1916-461b-a046-681af3058521 - FolderPath: $(Build.ArtifactStagingDirectory)\pkg - Pattern: '*.nupkg' - signConfigType: inlineSignParams - CertificateId: 402 - inlineOperation: "[ \n {\n \"keyCode\": \"CP-401405\",\n \"operationSetCode\": \"NuGetSign\",\n \"parameters\": [ ],\n \"toolName\": \"sign\",\n \"toolVersion\": \"1.0\"\n },\n {\n \"keyCode\": \"CP-401405\",\n \"operationSetCode\": \"NuGetVerify\",\n \"parameters\": [ ],\n \"toolName\": \"sign\",\n \"toolVersion\": \"1.0\"\n }\n]" From c328ff69d6de5ed5ac8f16eb69ef5b606df0d331 Mon Sep 17 00:00:00 2001 From: Stuart Padley Date: Tue, 21 Mar 2023 08:43:38 -0700 Subject: [PATCH 13/14] Update signing params --- azure-pipelines.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f2f9ea6..b777beb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -47,11 +47,11 @@ steps: "parameters": [ { "parameterName": "OpusName", - "parameterValue": "go-sqlcmd" + "parameterValue": "Microsoft" }, { "parameterName": "OpusInfo", - "parameterValue": "https://github.com/microsoft/go-sqlcmd" + "parameterValue": "http://www.microsoft.com" }, { "parameterName": "PageHash", @@ -105,16 +105,16 @@ steps: inlineOperation: | [ { - "keyCode": "CP-230012", + "keyCode": "CP-401405", "operationSetCode": "NuGetSign", "parameters": [ { "parameterName": "OpusName", - "parameterValue": "go-sqlcmd" + "parameterValue": "Microsoft" }, { "parameterName": "OpusInfo", - "parameterValue": "https://github.com/microsoft/go-sqlcmd" + "parameterValue": "http://www.microsoft.com" }, { "parameterName": "PageHash", @@ -133,7 +133,7 @@ steps: "toolVersion": "6.2.9304.0" }, { - "keyCode": "CP-230012", + "keyCode": "CP-401405", "operationSetCode": "NuGetVerify", "parameters": [ { From 2ddea86db8906fdb1d2a6759098ec1ddfd97fbeb Mon Sep 17 00:00:00 2001 From: Stuart Padley Date: Wed, 26 Apr 2023 15:12:34 +0100 Subject: [PATCH 14/14] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b777beb..ed167f6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -148,3 +148,9 @@ steps: SessionTimeout: '60' MaxConcurrency: '50' MaxRetryAttempts: '5' + +- task: PublishPipelineArtifact@1 + displayName: 'Publish release' + inputs: + targetPath: $(Build.ArtifactStagingDirectory) + artifactName: ElasticScaleClientLibrary