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

[5.2.1] Upgrade Azure.Identity version to 1.11.1 #2468

Closed
wants to merge 1 commit into from
+17 −17
Closed

[5.2.1] Upgrade Azure.Identity version to 1.11.1 #2468

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions tools/props/Versions.props
View file
Original file line number Diff line number Diff line change
@@ -27,8 +27,8 @@
</PropertyGroup>
<!-- NetFx and NetCore project dependencies -->
<PropertyGroup>
<AzureIdentityVersion>1.10.3</AzureIdentityVersion>
<MicrosoftIdentityClientVersion>4.56.0</MicrosoftIdentityClientVersion>
<AzureIdentityVersion>1.11.1</AzureIdentityVersion>
<MicrosoftIdentityClientVersion>4.60.3</MicrosoftIdentityClientVersion>
<MicrosoftIdentityModelProtocolsOpenIdConnectVersion>6.35.0</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
<MicrosoftIdentityModelJsonWebTokensVersion>6.35.0</MicrosoftIdentityModelJsonWebTokensVersion>
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
@@ -55,7 +55,7 @@
</PropertyGroup>
<!-- AKV Provider project dependencies -->
<PropertyGroup>
<AzureCoreVersion>[1.35.0,2.0.0)</AzureCoreVersion>
<AzureCoreVersion>[1.38.0,2.0.0)</AzureCoreVersion>
<AzureSecurityKeyVaultKeysVersion>[4.4.0,5.0.0)</AzureSecurityKeyVaultKeysVersion>
<MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
</PropertyGroup>
20 changes: 10 additions & 10 deletions tools/specs/Microsoft.Data.SqlClient.nuspec
View file
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@ 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.10.3" />
<dependency id="Microsoft.Identity.Client" version="4.56.0" />
<dependency id="Azure.Identity" version="1.11.1" />
<dependency id="Microsoft.Identity.Client" version="4.60.3" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.35.0" />
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.35.0" />
<dependency id="System.Buffers" version="4.5.1" />
@@ -40,8 +40,8 @@ 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.10.3" />
<dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Compile"/>
<dependency id="Azure.Identity" version="1.11.1" />
<dependency id="Microsoft.Identity.Client" version="4.60.3" exclude="Compile"/>
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.35.0" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.35.0" />
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
@@ -50,8 +50,8 @@ 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.10.3" />
<dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Compile"/>
<dependency id="Azure.Identity" version="1.11.1" />
<dependency id="Microsoft.Identity.Client" version="4.60.3" exclude="Compile"/>
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.35.0" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.35.0" />
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
@@ -60,8 +60,8 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
</group>
<group targetFramework="netstandard2.0">
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.2.0" exclude="Compile" />
<dependency id="Azure.Identity" version="1.10.3" />
<dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Compile"/>
<dependency id="Azure.Identity" version="1.11.1" />
<dependency id="Microsoft.Identity.Client" version="4.60.3" exclude="Compile"/>
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.35.0" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.35.0" />
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
@@ -78,8 +78,8 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
</group>
<group targetFramework="netstandard2.1">
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.2.0" exclude="Compile" />
<dependency id="Azure.Identity" version="1.10.3" />
<dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Compile"/>
<dependency id="Azure.Identity" version="1.11.1" />
<dependency id="Microsoft.Identity.Client" version="4.60.3" exclude="Compile"/>
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.35.0" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.35.0" />
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
8 changes: 4 additions & 4 deletions tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
View file
Original file line number Diff line number Diff line change
@@ -26,25 +26,25 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
<dependencies>
<group targetFramework="net462">
<dependency id="Microsoft.Data.SqlClient" version="5.1.5" />
<dependency id="Azure.Core" version="[1.35.0,2.0.0)" />
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same notes here from the original PR #2462.

<dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.1" />
</group>
<group targetFramework="net8.0">
<dependency id="Microsoft.Data.SqlClient" version="5.1.5" />
<dependency id="Azure.Core" version="[1.35.0,2.0.0)" />
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
<dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.0" />
</group>
<group targetFramework="net6.0">
<dependency id="Microsoft.Data.SqlClient" version="5.1.5" />
<dependency id="Azure.Core" version="[1.35.0,2.0.0)" />
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
<dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.1" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="Microsoft.Data.SqlClient" version="5.1.5" />
<dependency id="Azure.Core" version="[1.35.0,2.0.0)" />
<dependency id="Azure.Core" version="[1.38.0,2.0.0)" />
<dependency id="Azure.Security.KeyVault.Keys" version="[4.5.0,5.0.0)" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.1" />
</group>

Unchanged files with check annotations Beta

View file
build.proj
<Target Name="RunManualTests">
<!-- Windows -->
<Exec ConsoleToMsBuild="true" Command="$(DotnetPath)dotnet test &quot;@(ManualTestsProj)&quot; -p:Configuration=$(Configuration) -p:Target$(TFGroup)Version=$(TF) --no-build -l &quot;console;verbosity=normal&quot; --collect &quot;Code coverage&quot; -p:TestSet=$(TestSet) --results-directory $(ResultsDirectory) -p:TestTargetOS=Windows$(TargetGroup) --filter &quot;category!=non$(TargetGroup)tests&amp;category!=failing&amp;category!=nonwindowstests&quot; &quot;--logger:trx;LogFilePrefix=Manual-Windows$(TargetGroup)-$(TestSet)&quot;" Condition="'$(IsEnabledWindows)' == 'true'"/>

Check failure on line 189 in build.proj

Azure Pipelines / Release 5.2 (Win 2022 SQL 2019 net462,AnyCPU,false,3,netstandard2.1)

build.proj#L189 

build.proj(189,5): Error MSB3073: The command "dotnet test "src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" -p:Configuration=Release -p:TargetnetfxVersion=net462 --no-build -l "console;verbosity=normal" --collect "Code coverage" -p:TestSet=3 --results-directory TestResults -p:TestTargetOS=Windowsnetfx --filter "category!=nonnetfxtests&category!=failing&category!=nonwindowstests" "--logger:trx;LogFilePrefix=Manual-Windowsnetfx-3"" exited with code 1.

Check failure on line 189 in build.proj

Azure Pipelines / Release 5.2 (Win 2022 SQL 2022 net8.0,AnyCPU,true,3,netstandard2.1)

build.proj#L189 

build.proj(189,5): Error MSB3073: The command "dotnet test "src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" -p:Configuration=Release -p:TargetnetcoreVersion=net8.0 --no-build -l "console;verbosity=normal" --collect "Code coverage" -p:TestSet=3 --results-directory TestResults -p:TestTargetOS=Windowsnetcoreapp --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" "--logger:trx;LogFilePrefix=Manual-Windowsnetcoreapp-3"" exited with code 1.

Check failure on line 189 in build.proj

Azure Pipelines / Release 5.2 (Win 2022 SQL 2022 net8.0,AnyCPU,true,3,netstandard2.1)

build.proj#L189 

build.proj(189,5): Error MSB3073: The command "dotnet test "src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" -p:Configuration=Release -p:TargetnetcoreVersion=net8.0 --no-build -l "console;verbosity=normal" --collect "Code coverage" -p:TestSet=3 --results-directory TestResults -p:TestTargetOS=Windowsnetcoreapp --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" "--logger:trx;LogFilePrefix=Manual-Windowsnetcoreapp-3"" exited with code 1.

Check failure on line 189 in build.proj

Azure Pipelines / Release 5.2 (Win 11 Azure SQL net8.0,AnyCPU,false,2,netstandard2.1)

build.proj#L189 

build.proj(189,5): Error MSB3073: The command "dotnet test "src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" -p:Configuration=Release -p:TargetnetcoreVersion=net8.0 --no-build -l "console;verbosity=normal" --collect "Code coverage" -p:TestSet=2 --results-directory TestResults -p:TestTargetOS=Windowsnetcoreapp --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" "--logger:trx;LogFilePrefix=Manual-Windowsnetcoreapp-2"" exited with code 1.

Check failure on line 189 in build.proj

Azure Pipelines / Release 5.2 (Win 11 Azure SQL net6.0,AnyCPU,false,2,netstandard2.1)

build.proj#L189 

build.proj(189,5): Error MSB3073: The command "dotnet test "src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" -p:Configuration=Release -p:TargetnetcoreVersion=net6.0 --no-build -l "console;verbosity=normal" --collect "Code coverage" -p:TestSet=2 --results-directory TestResults -p:TestTargetOS=Windowsnetcoreapp --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" "--logger:trx;LogFilePrefix=Manual-Windowsnetcoreapp-2"" exited with code 1.

Check failure on line 189 in build.proj

Azure Pipelines / Release 5.2

build.proj#L189 

build.proj(189,5): Error MSB3073: The command "dotnet test "src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" -p:Configuration=Release -p:TargetnetcoreVersion=net8.0 --no-build -l "console;verbosity=normal" --collect "Code coverage" -p:TestSet=3 --results-directory TestResults -p:TestTargetOS=Windowsnetcoreapp --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" "--logger:trx;LogFilePrefix=Manual-Windowsnetcoreapp-3"" exited with code 1.
<!-- Unix -->
<Exec ConsoleToMsBuild="true" Command="$(DotnetPath)dotnet test &quot;@(ManualTestsProj)&quot; -p:Configuration=$(Configuration) -p:TargetNetCoreVersion=$(TF) --no-build -l &quot;console;verbosity=normal&quot; --collect &quot;Code coverage&quot; -p:TestSet=$(TestSet) --results-directory $(ResultsDirectory) -p:TestTargetOS=Unixnetcoreapp --filter &quot;category!=nonnetcoreapptests&amp;category!=failing&amp;category!=nonlinuxtests&amp;category!=nonuaptests&quot; &quot;--logger:trx;LogFilePrefix=Manual-Unixnetcoreapp-$(TestSet)&quot;" Condition="'$(IsEnabledWindows)' != 'true'"/>
</Target>