update assembly version of Azure.Core

src/Accounts/Accounts/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Updated Azure.Core assembly
 * Fixed an issue that may cause `Connect-AzAccount` to fail in multi-threaded execution [#11201]
 
 ## Version 1.8.1

src/Accounts/Accounts/PostImportScripts/LoadAuthenticators.ps1

@@ -2,4 +2,8 @@
     try {
 	    [Microsoft.Azure.PowerShell.Authenticators.DesktopAuthenticatorBuilder]::Apply([Microsoft.Azure.Commands.Common.Authentication.AzureSession]::Instance)
 	} catch {}
+
+	try {
+	    [Microsoft.Azure.Commands.Profile.Utilities.CustomAssemblyResolver]::Initialize()
+	} catch {}
 }

src/Accounts/Accounts/Utilities/CustomAssemblyResolver.cs

@@ -0,0 +1,37 @@
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace Microsoft.Azure.Commands.Profile.Utilities
+{
+    public static class CustomAssemblyResolver
+    {
+        public static void Initialize()
+        {
+            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+        }
+
+        /// <summary>
+        /// When the resolution of an assembly fails, if it's Newtonsoft.Json 9, redirect to 10
+        /// </summary>
+        public static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+        {
+            try
+            {
+                AssemblyName name = new AssemblyName(args.Name);
+                if(string.Equals(name.Name, "Azure.Core", StringComparison.OrdinalIgnoreCase)
+                    && name.Version?.Major == 1 && (name.Version?.Minor == 2 && name.Version?.Build <= 1 || 
+                    name.Version?.Minor == 1))
+                {
+                    string accountFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+                    string azureCorePath = Path.Combine(accountFolder, @"PreloadAssemblies\Azure.Core.dll");
+                    return Assembly.LoadFrom(azureCorePath);
+                }
+            }
+            catch
+            {
+            }
+            return null;
+        }
+    }
+}

src/Storage/Storage.Management/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Moved the logic of loading Azure.Core to Az.Accounts
 
 ## Version 2.1.0
 * Updated assembly version of data plane cmdlets

src/Storage/Storage/Storage.csproj

@@ -11,11 +11,6 @@
     <RootNamespace>Microsoft.WindowsAzure.Commands.$(PsModuleName)</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PreLoadAssemblies Include="$(RepoSrc)lib\Azure.Core\PreloadAssemblies\*.dll" />
-    <NetCoreAssemblies Include="$(RepoSrc)lib\Azure.Core\NetCoreAssemblies\*.dll" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Azure.Storage.Blobs" Version="12.4.0" />
     <PackageReference Include="Azure.Storage.Files.DataLake" Version="12.0.0" />