Skip to content

Commit

Permalink
Reapply "Update Azure.Identity to 1.13.0 (#26447)"
Browse files Browse the repository at this point in the history
This reverts commit 46f9e71.
  • Loading branch information
Nickcandy committed Nov 12, 2024
1 parent fb6e099 commit 6f4f7a5
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/Accounts/Accounts/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* Fixed the issue that `Export-AzSshConfig` and `Enter-AzVM` from Az.Ssh are not able to use when WAM is enabled.
* Added breaking change preannouncement for the removal of alias `Resolve-Error`. #26189
* Integrated new detection library to expand the scope of secrets.
* Upgraded Azure.Core to 1.44.1.
* Upgraded Azure.Core to 1.44.1 and Azure.Identity to 1.13.0

## Version 3.0.4
* Added customized UserAgent for ARM telemetry.
Expand Down
5 changes: 1 addition & 4 deletions src/Accounts/Accounts/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<Project>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.targets))\Directory.Build.targets" />
<!-- Skip in live unit testing https://docs.microsoft.com/en-us/visualstudio/test/live-unit-testing-faq?view=vs-2022#can-i-customize-my-live-unit-testing-builds- -->
<Target Name ="BuildAssemblyLoadContextProject" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug' And '$(BuildingForLiveUnitTesting)' != 'true'">
<Exec Command="dotnet build ../AuthenticationAssemblyLoadContext/AuthenticationAssemblyLoadContext.csproj"/>
</Target>
<Target Name="AddAccountsPsm1Dependency" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug' And '$(BuildingForLiveUnitTesting)' != 'true'">
<Target Name="AddAccountsPsm1Dependency" AfterTargets="Build" Condition="'$(BuildingForLiveUnitTesting)' != 'true'">
<Exec Command="pwsh -NonInteractive -NoLogo -NoProfile -Command &quot;. '$(OutDir)../../../tools/AddModulePsm1Dependency.ps1' -ModuleFolder '$(OutDir)' -IgnorePwshVersion &quot;" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions src/Accounts/AssemblyLoading/ConditionalAssemblyProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static void Initialize(string rootPath, IConditionalAssemblyContext conte
// todo: consider moving the list to a standalone config file
#region AssemblyList
CreateAssembly("netstandard2.0", "Azure.Core", "1.44.1.0"),
CreateAssembly("netstandard2.0", "Azure.Identity", "1.12.0.0"),
CreateAssembly("netstandard2.0", "Azure.Identity", "1.13.0.0"),
CreateAssembly("netstandard2.0", "Azure.Identity.Broker", "1.1.0.0"),
CreateAssembly("netstandard2.0", "Microsoft.Bcl.AsyncInterfaces", "6.0.0.0"),
CreateAssembly("netstandard2.0", "Microsoft.Identity.Client", "4.65.0.0"),
Expand All @@ -55,7 +55,7 @@ public static void Initialize(string rootPath, IConditionalAssemblyContext conte
CreateAssembly("netstandard2.0", "System.Memory.Data", "6.0.0.0"),
CreateAssembly("netstandard2.0", "System.Text.Json", "6.0.0.0"),
CreateAssembly("netstandard2.0", "System.Buffers", "4.0.3.0").WithWindowsPowerShell(),
CreateAssembly("netstandard2.0", "System.Memory", "4.0.1.1").WithWindowsPowerShell(),
CreateAssembly("netstandard2.0", "System.Memory", "4.0.1.2").WithWindowsPowerShell(),
CreateAssembly("netstandard2.0", "System.Net.Http.WinHttpHandler", "4.0.4.0").WithWindowsPowerShell(),
CreateAssembly("netstandard2.0", "System.Private.ServiceModel", "4.7.0.0").WithWindowsPowerShell(),
CreateAssembly("netstandard2.0", "System.Security.AccessControl", "4.1.3.0").WithWindowsPowerShell(),
Expand Down
8 changes: 4 additions & 4 deletions src/Accounts/Authentication/Authentication.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.12.0" />
<PackageReference Include="Azure.Identity" Version="1.13.0" />
<PackageReference Include="Azure.Identity.Broker" Version="1.1.0" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.61.3" />
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.61.3" />
<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.61.3" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.65.0" />
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.65.0" />
<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.65.0" />
<PackageReference Include="Microsoft.Security.Utilities.Core" Version="1.8.0" />
</ItemGroup>

Expand Down
Binary file modified src/lib/netstandard2.0/Azure.Identity.dll
Binary file not shown.
Binary file modified src/lib/netstandard2.0/System.Memory.dll
Binary file not shown.

0 comments on commit 6f4f7a5

Please sign in to comment.