Merge remote-tracking branch 'upstream/main' into lnx/azurecore (#22349)

Co-authored-by: Yeming Liu <[email protected]>
Azure · Aug 8, 2023 · 5b9e6d6 · 5b9e6d6
1 parent d0f2e61
commit 5b9e6d6
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 5 deletions.
diff --git a/src/Accounts/Accounts/ChangeLog.md b/src/Accounts/Accounts/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Updated Azure.Core to 1.34.0.
 * Updated the reference of Azure PowerShell Common to 1.3.82-preview.
 
 ## Version 2.12.5

diff --git a/src/Accounts/AssemblyLoading/ConditionalAssemblyProvider.cs b/src/Accounts/AssemblyLoading/ConditionalAssemblyProvider.cs
@@ -42,7 +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.33.0.0").WithPowerShellCore(),
+                CreateAssembly("netcoreapp2.1", "Azure.Core", "1.34.0.0").WithPowerShellCore(),
                 CreateAssembly("netcoreapp2.1", "Microsoft.Identity.Client", "4.49.1.0").WithPowerShellCore(),
                 CreateAssembly("netcoreapp3.1", "Microsoft.Identity.Client.Extensions.Msal", "2.23.0.0").WithPowerShellCore(),
 
@@ -64,14 +64,14 @@ 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.33.0.0").WithWindowsPowerShell(),
+                CreateAssembly("netfx", "Azure.Core", "1.34.0.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "Microsoft.Identity.Client", "4.49.1.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "Microsoft.Identity.Client.Extensions.Msal", "2.23.0.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "Newtonsoft.Json", "13.0.0.0").WithWindowsPowerShell(),
-                CreateAssembly("netfx", "System.Diagnostics.DiagnosticSource", "4.0.4.0").WithWindowsPowerShell(),
+                CreateAssembly("netfx", "System.Diagnostics.DiagnosticSource", "6.0.0.1").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "System.Numerics.Vectors", "4.1.4.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "System.Reflection.DispatchProxy", "4.0.4.0").WithWindowsPowerShell(),
-                CreateAssembly("netfx", "System.Runtime.CompilerServices.Unsafe", "4.0.6.0").WithWindowsPowerShell(),
+                CreateAssembly("netfx", "System.Runtime.CompilerServices.Unsafe", "6.0.0.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "System.Security.Cryptography.Cng", "4.3.0.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "System.Text.Encodings.Web", "4.0.5.1").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "System.Xml.ReaderWriter", "4.1.0.0").WithWindowsPowerShell(),

diff --git a/src/Compute/Compute/ChangeLog.md b/src/Compute/Compute/ChangeLog.md
@@ -20,6 +20,7 @@
 
 -->
 ## Upcoming Release
+* Updated Azure.Core to 1.34.0.
 
 ## Version 6.2.0
 * Fixed the `Update-AzVmss` cmdlet so the `AutomaticRepairGracePeriod`, `AutomaticRepairAction`, and `EnableAutomaticRepair` parameters function correctly.

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
+* Updated Azure.Core to 1.34.0.
 
 ## Version 4.1.0
 * Updated Azure.Core to 1.33.0.

diff --git a/src/CosmosDB/CosmosDB/ChangeLog.md b/src/CosmosDB/CosmosDB/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Updated Azure.Core to 1.34.0.
 
 ## Version 1.11.2
 * Updated Azure.Core to 1.33.0.

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
+* Updated Azure.Core to 1.34.0.
 
 ## Version 4.10.2
 * Bug Fix: Removed depulicated IpRules from `NetworkRuleSet` and `MhsmNetworkRuleSet`. [#22472]

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
+* Updated Azure.Core to 1.34.0.
 
 ## Version 0.13.0
 * Updated to api-version 2022-11-01        

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
+* Updated Azure.Core to 1.34.0.
 
 ## Version 1.6.2
 * Updated Azure.Core to 1.33.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
+* Updated Azure.Core to 1.34.0.
 
 ## Version 5.9.0
 * Supported OAuth authentication on File service cmdlets

diff --git a/src/Synapse/Synapse/ChangeLog.md b/src/Synapse/Synapse/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Updated Azure.Core to 1.34.0.
 
 ## Version 3.0.2
 * Updated Azure.Core to 1.33.0.

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/netfx/System.Diagnostics.DiagnosticSource.dll b/src/lib/netfx/System.Diagnostics.DiagnosticSource.dll
diff --git a/src/lib/netfx/System.Runtime.CompilerServices.Unsafe.dll b/src/lib/netfx/System.Runtime.CompilerServices.Unsafe.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.33.0"/>
+    <PackageReference Include="Azure.Core" Version="1.34.0"/>
   </ItemGroup>
   <ItemGroup Condition="'$(IsTestProject)' != 'true'">
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.13.1">