Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support ConfigurationManager in Net Standard for configurable retry logic #1090

Merged
merged 7 commits into from
Jun 7, 2021
Merged

Add support ConfigurationManager in Net Standard for configurable retry logic #1090

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f0eff15
add cnfgManager for netstandard
May 31, 2021
33a4de0
Merge remote-tracking branch 'UpSream/main' into CRLStandard
May 31, 2021
97877b6
Add Runtime.Loader dependency
May 31, 2021
297f1b3
fix cnfgManager version
Jun 1, 2021
5cebe3f
Improved
Jun 4, 2021
a356978
Merge remote-tracking branch 'UpSream/main' into CRLStandard
Jun 4, 2021
7e24935
Use LocalAppContextSwitches
Jun 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,14 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.cs">
<Link>Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.CreateProvider.cs">
<Link>Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.CreateProvider.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Reliability\AppConfigManager.cs">
<Link>Microsoft\Data\SqlClient\Reliability\AppConfigManager.cs</Link>
</Compile>
<Compile Include="Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.NetCoreApp.cs" />
<Compile Include="Microsoft\Data\SqlClient\Reliability\SqlAppContextSwitchManager.NetCoreApp.cs" />
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlUtil.cs">
<Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
</Compile>
Expand All @@ -334,7 +342,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlDelegatedTransaction.NetStandard.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.NetStandard.cs" />
<Compile Include="Microsoft\Data\SqlClient\SNI\SslOverTdsStream.NetStandard.cs" />
<Compile Include="Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.NetStandard.cs" />
</ItemGroup>
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND '$(TargetFramework)' != 'netstandard2.0'">
<Compile Include="..\..\src\Microsoft\Data\SqlClient\AlwaysEncryptedAttestationException.cs">
Expand Down Expand Up @@ -383,14 +390,6 @@
<Compile Include="Microsoft\Data\SqlClient\SNI\SslOverTdsStream.NetCoreApp.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.AssemblyLoadContext.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyUtils.AssemblyLoadContext.cs" />
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.CreateProvider.cs">
<Link>Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.CreateProvider.NetCoreApp.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Reliability\AppConfigManager.cs">
<Link>Microsoft\Data\SqlClient\Reliability\AppConfigManager.NetCoreApp.cs</Link>
</Compile>
<Compile Include="Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.NetCoreApp.cs" />
<Compile Include="Microsoft\Data\SqlClient\Reliability\SqlAppContextSwitchManager.NetCoreApp.cs" />
</ItemGroup>
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND '$(TargetFramework)' != 'netstandard2.0' AND '$(BuildSimulator)' == 'true'">
<Compile Include="Microsoft\Data\SqlClient\SimulatorEnclaveProvider.NetCoreApp.cs" />
Expand Down Expand Up @@ -838,7 +837,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Condition="'$(TargetsWindows)' == 'true' and '$(IsUAPAssembly)' != 'true'" Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
<PackageReference Condition="'$(TargetGroup)' == 'netcoreapp'" Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesVersion)" />
Expand All @@ -857,6 +856,7 @@
<PackageReference Include="System.Resources.ResourceManager" Version="$(SystemResourcesResourceManagerVersion)" />
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
<PackageReference Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" />
<PackageReference Condition="$(TargetGroup) == 'netstandard'" Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
<PackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngVersion)" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="All" />
</ItemGroup>
Expand Down
28 changes: 0 additions & 28 deletions .../src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryLogicManager.NetStandard.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...soft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\CryptoVector.cs" />
<Compile Include="AlwaysEncrypted\TestFixtures\Setup\CryptoNativeBaselineReader.cs" />
<Compile Include="AlwaysEncrypted\TestTrustedMasterKeyPaths.cs" />
<Compile Include="SQL\RetryLogic\SqlConfigurationManagerReliabilityTest.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetsWindows)' == 'true' and !$(ReferenceType.Contains('NetStandard'))">
<Compile Include="AlwaysEncrypted\CspProviderExt.cs" />
Expand Down Expand Up @@ -75,6 +74,7 @@
<Compile Include="SQL\RetryLogic\RetryLogicTestHelper.cs" />
<Compile Include="SQL\RetryLogic\SqlCommandReliabilityTest.cs" />
<Compile Include="SQL\RetryLogic\SqlConnectionReliabilityTest.cs" />
<Compile Include="SQL\RetryLogic\SqlConfigurationManagerReliabilityTest.cs" />
<Compile Include="SQL\SqlBulkCopyTest\OrderHint.cs" />
<Compile Include="SQL\SqlBulkCopyTest\OrderHintAsync.cs" />
<Compile Include="SQL\SqlBulkCopyTest\OrderHintDuplicateColumn.cs" />
Expand Down Expand Up @@ -297,12 +297,12 @@
<ItemGroup>
<PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
<PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
<PackageReference Condition="$(ReferenceType.Contains('Package')) OR '$(TargetGroup)'=='netfx'" Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(AddOnsPath)AzureKeyVaultProvider\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj" />
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="$(MicrosoftIdentityModelClientsActiveDirectoryVersion)" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
<PackageReference Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
Expand Down
4 changes: 4 additions & 0 deletions tools/props/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
<SystemThreadingTasksVersion>4.3.0</SystemThreadingTasksVersion>
<SystemXmlReaderWriterVersion>4.3.1</SystemXmlReaderWriterVersion>
</PropertyGroup>
<!-- NetStandard project dependencies -->
<PropertyGroup>
<SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>
</PropertyGroup>
<!-- AKV Provider project dependencies -->
<PropertyGroup>
<AzureCoreVersion>[1.6.0,2.0.0)</AzureCoreVersion>
Expand Down
2 changes: 2 additions & 0 deletions tools/specs/Microsoft.Data.SqlClient.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.8.0" />
<dependency id="System.Configuration.ConfigurationManager" version="4.7.0" exclude="Compile" />
<dependency id="System.Runtime.Loader" version="4.3.0" exclude="Compile" />
</group>
<group targetFramework="netstandard2.1">
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="3.0.0-preview1.21104.2" exclude="Compile" />
Expand All @@ -88,6 +89,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.8.0" />
<dependency id="System.Configuration.ConfigurationManager" version="4.7.0" exclude="Compile" />
<dependency id="System.Runtime.Loader" version="4.3.0" exclude="Compile" />
</group>
</dependencies>
<frameworkAssemblies>
Expand Down