Skip to content

Commit 549658a

Browse files
isra-felisra-fel
authored
Merge pull request Azure#26500 from Azure/lnx/revertcore
revert relative changes about Azure.core
2 parents 13f3375 + bdba7ee commit 549658a

File tree

23 files changed

+18
-26
lines changed

23 files changed

+18
-26
lines changed

‎src/Accounts/Accounts/ChangeLog.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,13 @@
2222
* Fixed the issue that `Export-AzSshConfig` and `Enter-AzVM` from Az.Ssh are not able to use when WAM is enabled.
2323
* Added breaking change preannouncement for the removal of alias `Resolve-Error`. #26189
2424
* Integrated new detection library to expand the scope of secrets.
25-
* Upgraded Azure.Core to 1.44.1 and Azure.Identity to 1.13.0
2625

2726
## Version 3.0.4
2827
* Added customized UserAgent for ARM telemetry.
2928
* Fixed secrets exposure in example documentation.
3029
* Updated `Connect-AzAccount` to fix a display issue in PowerShell ISE [#24556].
3130
* Updated the reference of Azure PowerShell Common to 1.3.100-preview.
3231
* Used Azure.Identity and Azure.Core directly for client assertion [#22628].
33-
* Integrated new detection library to expand the scope of secrets.
3432

3533
## Version 3.0.3
3634
* Reduced the frequency of displaying sign-in announcement messages.

‎src/Accounts/Accounts/Directory.Build.targets‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<Project>
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.targets))\Directory.Build.targets" />
33
<!-- 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- -->
4-
<Target Name="AddAccountsPsm1Dependency" AfterTargets="Build" Condition="'$(BuildingForLiveUnitTesting)' != 'true'">
4+
<Target Name ="BuildAssemblyLoadContextProject" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug' And '$(BuildingForLiveUnitTesting)' != 'true'">
5+
<Exec Command="dotnet build ../AuthenticationAssemblyLoadContext/AuthenticationAssemblyLoadContext.csproj"/>
6+
</Target>
7+
<Target Name="AddAccountsPsm1Dependency" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug' And '$(BuildingForLiveUnitTesting)' != 'true'">
58
<Exec Command="pwsh -NonInteractive -NoLogo -NoProfile -Command &quot;. '$(OutDir)../../../tools/AddModulePsm1Dependency.ps1' -ModuleFolder '$(OutDir)' -IgnorePwshVersion &quot;" />
69
</Target>
710
</Project>

‎src/Accounts/AssemblyLoading/ConditionalAssemblyProvider.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,20 @@ public static void Initialize(string rootPath, IConditionalAssemblyContext conte
4242
// todo: add a tool to update assembly versions after replacing the assemblies. (Can it support newly introduced assemblies?)
4343
// todo: consider moving the list to a standalone config file
4444
#region AssemblyList
45-
CreateAssembly("netstandard2.0", "Azure.Core", "1.44.1.0"),
46-
CreateAssembly("netstandard2.0", "Azure.Identity", "1.13.0.0"),
45+
CreateAssembly("netstandard2.0", "Azure.Core", "1.41.0.0"),
46+
CreateAssembly("netstandard2.0", "Azure.Identity", "1.12.0.0"),
4747
CreateAssembly("netstandard2.0", "Azure.Identity.Broker", "1.1.0.0"),
48-
CreateAssembly("netstandard2.0", "Microsoft.Bcl.AsyncInterfaces", "6.0.0.0"),
48+
CreateAssembly("netstandard2.0", "Microsoft.Bcl.AsyncInterfaces", "1.0.0.0"),
4949
CreateAssembly("netstandard2.0", "Microsoft.Identity.Client", "4.65.0.0"),
5050
CreateAssembly("netstandard2.0", "Microsoft.Identity.Client.Extensions.Msal", "4.65.0.0"),
5151
CreateAssembly("netstandard2.0", "Microsoft.Identity.Client.Broker", "4.65.0.0"),
5252
CreateAssembly("netstandard2.0", "Microsoft.Identity.Client.NativeInterop", "0.16.2.0"),
5353
CreateAssembly("netstandard2.0", "Microsoft.IdentityModel.Abstractions", "6.35.0.0"),
54-
CreateAssembly("netstandard2.0", "System.ClientModel", "1.1.0.0"),
55-
CreateAssembly("netstandard2.0", "System.Memory.Data", "6.0.0.0"),
56-
CreateAssembly("netstandard2.0", "System.Text.Json", "6.0.0.0"),
54+
CreateAssembly("netstandard2.0", "System.ClientModel", "1.0.0.0"),
55+
CreateAssembly("netstandard2.0", "System.Memory.Data", "1.0.2.0"),
56+
CreateAssembly("netstandard2.0", "System.Text.Json", "4.0.1.2"),
5757
CreateAssembly("netstandard2.0", "System.Buffers", "4.0.3.0").WithWindowsPowerShell(),
58-
CreateAssembly("netstandard2.0", "System.Memory", "4.0.1.2").WithWindowsPowerShell(),
58+
CreateAssembly("netstandard2.0", "System.Memory", "4.0.1.1").WithWindowsPowerShell(),
5959
CreateAssembly("netstandard2.0", "System.Net.Http.WinHttpHandler", "4.0.4.0").WithWindowsPowerShell(),
6060
CreateAssembly("netstandard2.0", "System.Private.ServiceModel", "4.7.0.0").WithWindowsPowerShell(),
6161
CreateAssembly("netstandard2.0", "System.Security.AccessControl", "4.1.3.0").WithWindowsPowerShell(),
@@ -70,8 +70,8 @@ public static void Initialize(string rootPath, IConditionalAssemblyContext conte
7070
CreateAssembly("netfx", "System.Reflection.DispatchProxy", "4.0.4.0").WithWindowsPowerShell(),
7171
CreateAssembly("netfx", "System.Runtime.CompilerServices.Unsafe", "6.0.0.0").WithWindowsPowerShell(),
7272
CreateAssembly("netfx", "System.Security.Cryptography.Cng", "4.3.0.0").WithWindowsPowerShell(),
73-
CreateAssembly("netfx", "System.Security.Cryptography.ProtectedData", "4.0.3.0").WithWindowsPowerShell(),
74-
CreateAssembly("netfx", "System.Text.Encodings.Web", "6.0.0.0").WithWindowsPowerShell(),
73+
CreateAssembly("netfx", "System.Security.Cryptography.ProtectedData", "4.5.0.0").WithWindowsPowerShell(),
74+
CreateAssembly("netfx", "System.Text.Encodings.Web", "4.0.5.1").WithWindowsPowerShell(),
7575
CreateAssembly("netfx", "System.Xml.ReaderWriter", "4.1.0.0").WithWindowsPowerShell(),
7676
#endregion
7777
};

‎src/Accounts/Authentication/Authentication.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Azure.Identity" Version="1.13.0" />
15+
<PackageReference Include="Azure.Identity" Version="1.12.0" />
1616
<PackageReference Include="Azure.Identity.Broker" Version="1.1.0" />
17-
<PackageReference Include="Microsoft.Identity.Client" Version="4.65.0" />
18-
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.65.0" />
19-
<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.65.0" />
17+
<PackageReference Include="Microsoft.Identity.Client" Version="4.61.3" />
18+
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.61.3" />
19+
<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.61.3" />
2020
<PackageReference Include="Microsoft.Security.Utilities.Core" Version="1.8.0" />
2121
</ItemGroup>
2222

‎src/CodeSigning/CodeSigning/ChangeLog.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21-
* Upgraded Azure.Core to 1.44.1.
2221

2322
## Version 0.2.0
2423
* Added `Get-AzCodeSigningCertChain` cmdlet to retrieve the certificate chain for a certificate profile.

‎src/Compute/Compute/ChangeLog.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
## Upcoming Release
2323
* Added optional parameters `-SecurityPostureId` and `-SecurityPostureExcludeExtension` to cmdlets `New-AzVmss` and `New-AzVmssConfig`.
2424
* Updated image aliases to be up-to-date in the azure-powershell\src\Compute\Strategies\ComputeRp\Images.json file.
25-
* Upgraded Azure.Core to 1.44.1.
2625
* Added `NvmeDisk` argument completer to `DiffDiskPlacement` parameter for `Set-AzVMOSDisk` and `Set-AzVmssStorageProfile` cmdlets, allowing options for disk placement as `CacheDisk`, `ResourceDisk`, or `NvmeDisk`.
2726

2827
## Version 8.4.0

‎src/ContainerRegistry/ContainerRegistry/ChangeLog.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21-
* Upgraded Azure.Core to 1.44.1.
2221

2322
## Version 4.2.1
2423
* Introduced secrets detection feature to safeguard sensitive data.

‎src/CosmosDB/CosmosDB/ChangeLog.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
-->
2020

2121
## Upcoming Release
22-
* Upgraded Azure.Core to 1.44.1.
2322

2423
## Version 1.15.0
2524
* Added new parameter `DisableTtl` to `Restore-AzCosmosDBAccount`.

‎src/KeyVault/KeyVault/ChangeLog.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21-
* Upgraded Azure.Core to 1.44.1.
2221

2322
## Version 6.2.0
2423
* Fixed a parameter validation issue in Set-AzureKeyVaultCertificatePolicy. [#25649]

‎src/NetAppFiles/NetAppFiles/ChangeLog.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21-
* Upgraded Azure.Core to 1.44.1.
2221

2322
## Version 0.18.0
2423
* Fixed some minor issues

0 commit comments

Comments
 (0)