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

Jump to bottom

Change | Remove some unneeded references and update Azure.Identity #2577

Merged
merged 2 commits into from
Jun 26, 2024
Merged

Change | Remove some unneeded references and update Azure.Identity #2577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f643a6
fixes #2574
ErikEJ Jun 17, 2024
91030e5
Bump Azure.Identity version
ErikEJ Jun 17, 2024
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
4 changes: 1 addition & 3 deletions src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
<Compile Include="..\..\ref\Microsoft.Data.SqlClient.Batch.NetCoreApp.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
<PackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngVersion)" />
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion 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 @@ -945,7 +945,6 @@
<!-- <ProjectReference Include="$(SqlServerSourceCode)\Microsoft.SqlServer.Server.csproj" /> -->
<PackageReference Include="Microsoft.SqlServer.Server" Version="$(MicrosoftSqlServerServerVersion)" />
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
</ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<Reference Include="System.Transactions" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,9 +751,6 @@
<PackageReference Include="Azure.Identity">
<Version>$(AzureIdentityVersion)</Version>
</PackageReference>
<PackageReference Include="Microsoft.Identity.Client">
<Version>$(MicrosoftIdentityClientVersion)</Version>
</PackageReference>
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect">
<version>$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)</version>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
</ContentWithTargetPath>
</ItemGroup>
<ItemGroup>
<PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
<PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
</ItemGroup>
<ItemGroup>
<ContentWithTargetPath Include="..\tools\Microsoft.Data.SqlClient.TestUtilities\xunit.runner.json">
Expand Down
1 change: 0 additions & 1 deletion ...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 @@ -338,7 +338,6 @@
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
</ItemGroup>
<ItemGroup>
<PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
<PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions tools/props/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
</PropertyGroup>
<!-- NetFx and NetCore project dependencies -->
<PropertyGroup>
<AzureIdentityVersion>1.11.3</AzureIdentityVersion>
<MicrosoftIdentityClientVersion>4.60.3</MicrosoftIdentityClientVersion>
<AzureIdentityVersion>1.11.4</AzureIdentityVersion>
<MicrosoftIdentityModelProtocolsOpenIdConnectVersion>7.5.0</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
<MicrosoftIdentityModelJsonWebTokensVersion>7.5.0</MicrosoftIdentityModelJsonWebTokensVersion>
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
Expand All @@ -42,7 +41,6 @@
<MicrosoftSqlServerServerVersion>1.0.0</MicrosoftSqlServerServerVersion>
<SystemDiagnosticsPerformanceCounterVersion>6.0.1</SystemDiagnosticsPerformanceCounterVersion>
<SystemRuntimeCachingVersion>6.0.0</SystemRuntimeCachingVersion>
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
<SystemSecurityPermissionsVersion>6.0.0</SystemSecurityPermissionsVersion>
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
<SystemTextEncodingCodePagesVersion>6.0.0</SystemTextEncodingCodePagesVersion>
Expand Down
9 changes: 3 additions & 6 deletions tools/specs/Microsoft.Data.SqlClient.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependencies>
<group targetFramework="net462">
<dependency id="Microsoft.Data.SqlClient.SNI" version="5.2.0" />
<dependency id="Azure.Identity" version="1.11.3" />
<dependency id="Microsoft.Identity.Client" version="4.60.3" />
<dependency id="Azure.Identity" version="1.11.4" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.0" />
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.5.0" />
<dependency id="System.Buffers" version="4.5.1" />
Expand All @@ -40,8 +39,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
</group>
<group targetFramework="net8.0">
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.2.0" exclude="Compile" />
<dependency id="Azure.Identity" version="1.11.3" />
<dependency id="Microsoft.Identity.Client" version="4.60.3" exclude="Compile"/>
<dependency id="Azure.Identity" version="1.11.4" />
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.5.0" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.0" />
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
Expand All @@ -50,8 +48,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
</group>
<group targetFramework="net6.0">
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.2.0" exclude="Compile" />
<dependency id="Azure.Identity" version="1.11.3" />
<dependency id="Microsoft.Identity.Client" version="4.60.3" exclude="Compile"/>
<dependency id="Azure.Identity" version="1.11.4" />
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.5.0" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.0" />
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
Expand Down
Loading