diff --git a/src/Accounts/Accounts/ChangeLog.md b/src/Accounts/Accounts/ChangeLog.md index a362893a602d..d7315b607f5c 100644 --- a/src/Accounts/Accounts/ChangeLog.md +++ b/src/Accounts/Accounts/ChangeLog.md @@ -20,6 +20,7 @@ ## Upcoming Release * Upgraded System.Reflection.DispatchProxy on Windows PowerShell [#17856] +* Upgraded Azure.Identity to 1.6.0 and Azure.Core to 1.24.0 ## Version 2.7.6 * Upgraded Microsoft.Rest.ClientRuntime to 2.3.24 diff --git a/src/Accounts/Authentication/Authentication.csproj b/src/Accounts/Authentication/Authentication.csproj index 388c5e5f8e2e..5faf000780ec 100644 --- a/src/Accounts/Authentication/Authentication.csproj +++ b/src/Accounts/Authentication/Authentication.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Accounts/Authentication/Utilities/CustomAssemblyResolver.cs b/src/Accounts/Authentication/Utilities/CustomAssemblyResolver.cs index 94bd79e6f326..04f644ed3c6d 100644 --- a/src/Accounts/Authentication/Utilities/CustomAssemblyResolver.cs +++ b/src/Accounts/Authentication/Utilities/CustomAssemblyResolver.cs @@ -24,10 +24,10 @@ public static class CustomAssemblyResolver private static IDictionary NetFxPreloadAssemblies = new Dictionary(StringComparer.InvariantCultureIgnoreCase) { - {"Azure.Core", new Version("1.22.0.0")}, + {"Azure.Core", new Version("1.24.0.0")}, {"Microsoft.Bcl.AsyncInterfaces", new Version("1.1.1.0")}, - {"Microsoft.Identity.Client", new Version("4.30.1.0") }, - {"Microsoft.Identity.Client.Extensions.Msal", new Version("2.18.4.0") }, + {"Microsoft.Identity.Client", new Version("4.39.0.0") }, + {"Microsoft.Identity.Client.Extensions.Msal", new Version("2.19.3.0") }, {"Microsoft.IdentityModel.Clients.ActiveDirectory", new Version("3.19.2.6005")}, {"Microsoft.IdentityModel.Clients.ActiveDirectory.Platform", new Version("3.19.2.6005")}, {"Newtonsoft.Json", new Version("10.0.0.0")}, diff --git a/src/Accounts/AuthenticationAssemblyLoadContext/AzAssemblyLoadContextInitializer.cs b/src/Accounts/AuthenticationAssemblyLoadContext/AzAssemblyLoadContextInitializer.cs index ca5efa9cc5d5..9a010d1e8852 100644 --- a/src/Accounts/AuthenticationAssemblyLoadContext/AzAssemblyLoadContextInitializer.cs +++ b/src/Accounts/AuthenticationAssemblyLoadContext/AzAssemblyLoadContextInitializer.cs @@ -31,11 +31,11 @@ static AzAssemblyLoadContextInitializer() //TODO: Generate assembly version info into AzSharedAssemblies.json during build var azSharedAssemblies = new Dictionary() { - {"Azure.Core", new Version("1.22.0.0")}, - {"Azure.Identity", new Version("1.5.0.0")}, + {"Azure.Core", new Version("1.24.0.0")}, + {"Azure.Identity", new Version("1.6.0.0")}, {"Microsoft.Bcl.AsyncInterfaces", new Version("1.1.1.0")}, - {"Microsoft.Identity.Client", new Version("4.30.1.0") }, - {"Microsoft.Identity.Client.Extensions.Msal", new Version("2.18.4.0") }, + {"Microsoft.Identity.Client", new Version("4.39.0.0") }, + {"Microsoft.Identity.Client.Extensions.Msal", new Version("2.19.3.0") }, {"System.Memory.Data", new Version("1.0.2.0")}, {"System.Text.Json", new Version("4.0.1.2")}, }; diff --git a/src/Accounts/Authenticators/Authenticators.csproj b/src/Accounts/Authenticators/Authenticators.csproj index 0617434f299f..e06960b0baf1 100644 --- a/src/Accounts/Authenticators/Authenticators.csproj +++ b/src/Accounts/Authenticators/Authenticators.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/Accounts/Authenticators/ClientAssertionAuthenticator.cs b/src/Accounts/Authenticators/ClientAssertionAuthenticator.cs index 76bd9c0dc623..f501c41b3b58 100644 --- a/src/Accounts/Authenticators/ClientAssertionAuthenticator.cs +++ b/src/Accounts/Authenticators/ClientAssertionAuthenticator.cs @@ -25,6 +25,7 @@ using Microsoft.WindowsAzure.Commands.Common; using Microsoft.Identity.Client; using Microsoft.Azure.PowerShell.Authenticators.Identity; +using ClientAssertionCredential = Microsoft.Azure.PowerShell.Authenticators.Identity.ClientAssertionCredential; namespace Microsoft.Azure.PowerShell.Authenticators { diff --git a/src/lib/NetCorePreloadAssemblies/Azure.Core.dll b/src/lib/NetCorePreloadAssemblies/Azure.Core.dll index 32652d6de4d0..342eeff5cc0b 100644 Binary files a/src/lib/NetCorePreloadAssemblies/Azure.Core.dll and b/src/lib/NetCorePreloadAssemblies/Azure.Core.dll differ diff --git a/src/lib/NetCorePreloadAssemblies/Azure.Identity.dll b/src/lib/NetCorePreloadAssemblies/Azure.Identity.dll index 0d214db71cad..eaab4655b4fe 100644 Binary files a/src/lib/NetCorePreloadAssemblies/Azure.Identity.dll and b/src/lib/NetCorePreloadAssemblies/Azure.Identity.dll differ diff --git a/src/lib/NetCorePreloadAssemblies/Microsoft.Identity.Client.Extensions.Msal.dll b/src/lib/NetCorePreloadAssemblies/Microsoft.Identity.Client.Extensions.Msal.dll index 81b736cc09da..dc7f1deb1f0e 100644 Binary files a/src/lib/NetCorePreloadAssemblies/Microsoft.Identity.Client.Extensions.Msal.dll and b/src/lib/NetCorePreloadAssemblies/Microsoft.Identity.Client.Extensions.Msal.dll differ diff --git a/src/lib/NetCorePreloadAssemblies/Microsoft.Identity.Client.dll b/src/lib/NetCorePreloadAssemblies/Microsoft.Identity.Client.dll index f656e5e42360..fd6f3b5973a2 100644 Binary files a/src/lib/NetCorePreloadAssemblies/Microsoft.Identity.Client.dll and b/src/lib/NetCorePreloadAssemblies/Microsoft.Identity.Client.dll differ diff --git a/src/lib/NetFxPreloadAssemblies/Azure.Core.dll b/src/lib/NetFxPreloadAssemblies/Azure.Core.dll index 67edb79248ca..eea81ffd27cd 100644 Binary files a/src/lib/NetFxPreloadAssemblies/Azure.Core.dll and b/src/lib/NetFxPreloadAssemblies/Azure.Core.dll differ diff --git a/src/lib/NetFxPreloadAssemblies/Azure.Identity.dll b/src/lib/NetFxPreloadAssemblies/Azure.Identity.dll index 0d214db71cad..eaab4655b4fe 100644 Binary files a/src/lib/NetFxPreloadAssemblies/Azure.Identity.dll and b/src/lib/NetFxPreloadAssemblies/Azure.Identity.dll differ diff --git a/src/lib/NetFxPreloadAssemblies/Microsoft.Identity.Client.Extensions.Msal.dll b/src/lib/NetFxPreloadAssemblies/Microsoft.Identity.Client.Extensions.Msal.dll index d22ddefa2339..661af6d4bcb5 100644 Binary files a/src/lib/NetFxPreloadAssemblies/Microsoft.Identity.Client.Extensions.Msal.dll and b/src/lib/NetFxPreloadAssemblies/Microsoft.Identity.Client.Extensions.Msal.dll differ diff --git a/src/lib/NetFxPreloadAssemblies/Microsoft.Identity.Client.dll b/src/lib/NetFxPreloadAssemblies/Microsoft.Identity.Client.dll index 7f392562319f..6c1d657a17c9 100644 Binary files a/src/lib/NetFxPreloadAssemblies/Microsoft.Identity.Client.dll and b/src/lib/NetFxPreloadAssemblies/Microsoft.Identity.Client.dll differ diff --git a/tools/Common.Netcore.Dependencies.targets b/tools/Common.Netcore.Dependencies.targets index 5891aad93cd8..23c7f0335a1b 100644 --- a/tools/Common.Netcore.Dependencies.targets +++ b/tools/Common.Netcore.Dependencies.targets @@ -21,7 +21,7 @@ - +