Upgraded Azure.Core to 1.37.0 (#24313)

* Upgraded Azure.Core to 1.37.0 * Merge Azure.Core of .net framework to .net standard * Update ChangeLog for modules affected
Azure · Mar 11, 2024 · 3318943 · 3318943
1 parent f538998
commit 3318943
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 7 deletions.
diff --git a/src/Accounts/Accounts/ChangeLog.md b/src/Accounts/Accounts/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Upgraded Azure.Core to 1.37.0.
 
 ## Version 2.16.0
 * Added a preview feature to detect secrets and sensitive information from the output of Azure PowerShell cmdlets to prevent leakage. Enable it by `Set-AzConfig -DisplaySecretsWarning $true`. Learn more at https://go.microsoft.com/fwlink/?linkid=2258844

diff --git a/src/Accounts/AssemblyLoading.Test/UnitTests/ConditionalAssemblyProviderTests.cs b/src/Accounts/AssemblyLoading.Test/UnitTests/ConditionalAssemblyProviderTests.cs
@@ -25,7 +25,6 @@ public class ConditionalAssemblyProviderTests
     {
         private const string NetFx = "netfx";
         private const string NetStandard20 = "netstandard2.0";
-        private const string NetCoreApp21 = "netcoreapp2.1";
         private const string RootPath = "root";
 
         [Fact]
@@ -43,7 +42,7 @@ public void CanGetAssembliesOnWindowsPowerShell()
             var assemblies = ConditionalAssemblyProvider.GetAssemblies();
 
             Assert.True(assemblies.TryGetValue("Azure.Core", out var azureCore));
-            Assert.Equal(GetExpectedAssemblyPath(NetFx, "Azure.Core"), azureCore.Path);
+            Assert.Equal(GetExpectedAssemblyPath(NetStandard20, "Azure.Core"), azureCore.Path);
             Assert.True(assemblies.TryGetValue("Newtonsoft.Json", out var newtonsoftJson));
             Assert.Equal(GetExpectedAssemblyPath(NetFx, "Newtonsoft.Json"), newtonsoftJson.Path);
 
@@ -66,7 +65,7 @@ public void CanGetAssembliesOnPowerShellCorePlus()
             var assemblies = ConditionalAssemblyProvider.GetAssemblies();
 
             Assert.True(assemblies.TryGetValue("Azure.Core", out var azureCore));
-            Assert.Equal(GetExpectedAssemblyPath(NetCoreApp21, "Azure.Core"), azureCore.Path);
+            Assert.Equal(GetExpectedAssemblyPath(NetStandard20, "Azure.Core"), azureCore.Path);
 
             Assert.False(assemblies.TryGetValue("Newtonsoft.Json", out _));
 

diff --git a/src/Accounts/AssemblyLoading/ConditionalAssemblyProvider.cs b/src/Accounts/AssemblyLoading/ConditionalAssemblyProvider.cs
@@ -42,8 +42,7 @@ public static void Initialize(string rootPath, IConditionalAssemblyContext conte
                 // todo: add a tool to update assembly versions after replacing the assemblies. (Can it support newly introduced assemblies?)
                 // todo: consider moving the list to a standalone config file
                 #region AssemblyList
-                CreateAssembly("netcoreapp2.1", "Azure.Core", "1.35.0.0").WithPowerShellCore(),
-
+                CreateAssembly("netstandard2.0", "Azure.Core", "1.37.0.0"),
                 CreateAssembly("netstandard2.0", "Azure.Identity", "1.10.3.0"),
                 CreateAssembly("netstandard2.0", "Azure.Identity.Broker", "1.0.0.0"),
                 CreateAssembly("netstandard2.0", "Microsoft.Bcl.AsyncInterfaces", "1.0.0.0"),
@@ -64,7 +63,6 @@ public static void Initialize(string rootPath, IConditionalAssemblyContext conte
                 CreateAssembly("netstandard2.0", "System.ServiceModel.Primitives", "4.7.0.0").WithWindowsPowerShell(),
                 CreateAssembly("netstandard2.0", "System.Threading.Tasks.Extensions", "4.2.0.1").WithWindowsPowerShell(),
 
-                CreateAssembly("netfx", "Azure.Core", "1.35.0.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "Newtonsoft.Json", "13.0.0.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "System.Diagnostics.DiagnosticSource", "6.0.0.1").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "System.Numerics.Vectors", "4.1.4.0").WithWindowsPowerShell(),

diff --git a/src/CodeSigning/CodeSigning/ChangeLog.md b/src/CodeSigning/CodeSigning/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Upgraded Azure.Core to 1.37.0.
 
 ## Version 0.1.0
 * First preview release for module Az.CodeSigning

diff --git a/src/Compute/Compute/ChangeLog.md b/src/Compute/Compute/ChangeLog.md
@@ -20,6 +20,7 @@
 
 -->
 ## Upcoming Release
+* Upgraded Azure.Core to 1.37.0.
 * Az.Compute is updated to use the 2023-07-03 GalleryRP REST API calls.
 
 ## Version 7.1.2

diff --git a/src/ContainerRegistry/ContainerRegistry/ChangeLog.md b/src/ContainerRegistry/ContainerRegistry/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Upgraded Azure.Core to 1.37.0.
 * Fixed vulnerability https://github.com/advisories/GHSA-8g9c-28fc-mcx2
 
 ## Version 4.1.3

diff --git a/src/CosmosDB/CosmosDB/ChangeLog.md b/src/CosmosDB/CosmosDB/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Upgraded Azure.Core to 1.37.0.
 
 ## Version 1.14.1
 * Fixed validation issues in same-account collection/container/graph and database/table/Gremlin restores, affecting the following cmdlets:

diff --git a/src/KeyVault/KeyVault/ChangeLog.md b/src/KeyVault/KeyVault/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Upgraded Azure.Core to 1.37.0.
 
 ## Version 5.2.1
 * Supported `HsmPlatform` in `KeyAttributes`.

diff --git a/src/NetAppFiles/NetAppFiles/ChangeLog.md b/src/NetAppFiles/NetAppFiles/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Upgraded Azure.Core to 1.37.0.
 
 ## Version 0.15.1
 * Fixed some minor issues

diff --git a/src/PolicyInsights/PolicyInsights/ChangeLog.md b/src/PolicyInsights/PolicyInsights/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Upgraded Azure.Core to 1.37.0.
 
 ## Version 1.6.4
 * Upgraded Azure.Core to 1.35.0.

diff --git a/src/Storage/Storage.Management/ChangeLog.md b/src/Storage/Storage.Management/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Upgraded Azure.Core to 1.37.0.
 * Fixed upload file with OAuth authentication issue [#24289] 
     - `Set-AzStorageFileContent`
 

diff --git a/src/Synapse/Synapse/ChangeLog.md b/src/Synapse/Synapse/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Upgraded Azure.Core to 1.37.0.
 * Fixed vulnerability https://github.com/advisories/GHSA-98g6-xh36-x2p7
 
 ## Version 3.0.5

diff --git a/src/lib/netcoreapp2.1/Azure.Core.dll b/src/lib/netcoreapp2.1/Azure.Core.dll
diff --git a/src/lib/netfx/Azure.Core.dll b/src/lib/netfx/Azure.Core.dll
diff --git a/src/lib/netstandard2.0/Azure.Core.dll b/src/lib/netstandard2.0/Azure.Core.dll
diff --git a/tools/Common.Netcore.Dependencies.targets b/tools/Common.Netcore.Dependencies.targets
@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Azure.Core" Version="1.35.0"/>
+    <PackageReference Include="Azure.Core" Version="1.37.0"/>
   </ItemGroup>
   <ItemGroup Condition="'$(IsTestProject)' != 'true'">
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.18.0">