Azure · VeryEarly · Jun 15, 2020 · Jun 14, 2020
diff --git a/src/Accounts/Accounts/Accounts.csproj b/src/Accounts/Accounts/Accounts.csproj
@@ -11,21 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PreLoadAssemblies Include="$(RepoSrc)lib\Newtonsoft.Json.10.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Buffers.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Net.Http.WinHttpHandler.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Private.ServiceModel.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Reflection.DispatchProxy.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Security.AccessControl.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Security.Permissions.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Security.Principal.Windows.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.ServiceModel.Primitives.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\Microsoft.IdentityModel.Clients.ActiveDirectory\NetFx\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\Microsoft.IdentityModel.Clients.ActiveDirectory\NetFx\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\Azure.Core\PreloadAssemblies\*.dll" />
-    <NetCoreAssemblies Include="$(RepoSrc)lib\Azure.Core\NetCoreAssemblies\*.dll" />
-    <NetCoreAssemblies Include="$(RepoSrc)lib\Microsoft.IdentityModel.Clients.ActiveDirectory\NetCore\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
-    <NetCoreAssemblies Include="$(RepoSrc)lib\Microsoft.IdentityModel.Clients.ActiveDirectory\NetCore\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" />
+    <PreLoadAssemblies Include="$(RepoSrc)lib\NetFxPreloadAssemblies\*.dll" />
+    <NetCoreAssemblies Include="$(RepoSrc)lib\NetCorePreloadAssemblies\*.dll" />
     <StorageDependencies Include="$(RepoSrc)lib\WindowsAzure.Storage\9.3.0\Microsoft.WindowsAzure.Storage.dll" />
     <StorageDependencies Include="$(RepoSrc)lib\WindowsAzure.Storage\9.3.0\Microsoft.WindowsAzure.Storage.DataMovement.dll" />
   </ItemGroup>
@@ -38,10 +25,12 @@
     <Copy SourceFiles="@(PreLoadAssemblies)" DestinationFolder="$(TargetDir)\PreloadAssemblies" />
     <Copy SourceFiles="@(NetCoreAssemblies)" DestinationFolder="$(TargetDir)\NetCoreAssemblies" />
     <Copy SourceFiles="@(StorageDependencies)" DestinationFolder="$(TargetDir)" />
+    <Copy SourceFiles="$(RepoSrc)lib\PreloadAssemblyInfo.json" DestinationFolder="$(TargetDir)" />
   </Target>
 
   <ItemGroup>
     <None Update="StartupScripts\AzError.ps1" CopyToOutputDirectory="PreserveNewest" />
+    <None Update="StartupScripts\InitializeAssemblyResolver.ps1" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   <ItemGroup>
     <None Update="PostImportScripts\LoadAuthenticators.ps1" CopyToOutputDirectory="PreserveNewest" />

diff --git a/src/Accounts/Accounts/ChangeLog.md b/src/Accounts/Accounts/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Update preloaded assemblies [#12024,#11976]
 * Updated Azure.Core assembly
 * Fixed an issue that may cause `Connect-AzAccount` to fail in multi-threaded execution [#11201]
 

diff --git a/src/Accounts/Accounts/PostImportScripts/LoadAuthenticators.ps1 b/src/Accounts/Accounts/PostImportScripts/LoadAuthenticators.ps1
@@ -2,8 +2,4 @@
     try {
 	    [Microsoft.Azure.PowerShell.Authenticators.DesktopAuthenticatorBuilder]::Apply([Microsoft.Azure.Commands.Common.Authentication.AzureSession]::Instance)
 	} catch {}
-
-	try {
-	    [Microsoft.Azure.Commands.Profile.Utilities.CustomAssemblyResolver]::Initialize()
-	} catch {}
 }
diff --git a/src/Accounts/Accounts/StartupScripts/InitializeAssemblyResolver.ps1 b/src/Accounts/Accounts/StartupScripts/InitializeAssemblyResolver.ps1
@@ -0,0 +1,5 @@
+if ($PSEdition -eq 'Desktop') {
+	try {
+	    [Microsoft.Azure.Commands.Profile.Utilities.CustomAssemblyResolver]::Initialize()
+	} catch {}
+}
diff --git a/src/Accounts/Accounts/Utilities/CustomAssemblyResolver.cs b/src/Accounts/Accounts/Utilities/CustomAssemblyResolver.cs
@@ -1,13 +1,31 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using Newtonsoft.Json;
 
 namespace Microsoft.Azure.Commands.Profile.Utilities
 {
     public static class CustomAssemblyResolver
     {
+        private static IDictionary<string, Version> NetFxPreloadAssemblies =
+            new Dictionary<string, Version>(StringComparer.InvariantCultureIgnoreCase);
+
+        private static string PreloadAssemblyFolder { get; set; }
+
         public static void Initialize()
         {
+            var accountFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            PreloadAssemblyFolder = Path.Combine(accountFolder, "PreloadAssemblies");
+            var assemblyInfo = File.ReadAllText(Path.Combine(accountFolder, "PreloadAssemblyInfo.json"));
+
+            var root = JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, string>>>(assemblyInfo);
+            var netfx = root["netfx"];
+            foreach(var info in netfx)
+            {
+                NetFxPreloadAssemblies[info.Key] = new Version(info.Value);
+            }
+
             AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
         }
 
@@ -19,13 +37,13 @@ public static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEvent
             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))
+                if (NetFxPreloadAssemblies.TryGetValue(args.Name, out Version version))
                 {
-                    string accountFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-                    string azureCorePath = Path.Combine(accountFolder, @"PreloadAssemblies\Azure.Core.dll");
-                    return Assembly.LoadFrom(azureCorePath);
+                    if (version >= name.Version && version.Major == name.Version.Major)
+                    {
+                        string requiredAssembly = Path.Combine(PreloadAssemblyFolder, $"{args.Name}.dll");
+                        return Assembly.LoadFrom(requiredAssembly);
+                    }
                 }
             }
             catch

diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Diagnostics.DiagnosticSource.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Diagnostics.DiagnosticSource.dll
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Runtime.CompilerServices.Unsafe.4.0.4.0.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Runtime.CompilerServices.Unsafe.4.0.4.0.dll
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Runtime.CompilerServices.Unsafe.4.0.4.1.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Runtime.CompilerServices.Unsafe.4.0.4.1.dll
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Threading.Tasks.Extensions.4.3.1.0.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Threading.Tasks.Extensions.4.3.1.0.dll
diff --git a/...ure.Core/NetCoreAssemblies/Azure.Core.dll → ...b/NetCorePreloadAssemblies/Azure.Core.dll b/...ure.Core/NetCoreAssemblies/Azure.Core.dll → ...b/NetCorePreloadAssemblies/Azure.Core.dll
diff --git a/...emblies/Microsoft.Bcl.AsyncInterfaces.dll → ...emblies/Microsoft.Bcl.AsyncInterfaces.dll b/...emblies/Microsoft.Bcl.AsyncInterfaces.dll → ...emblies/Microsoft.Bcl.AsyncInterfaces.dll
diff --git a/...odel.Clients.ActiveDirectory.Platform.dll → ...odel.Clients.ActiveDirectory.Platform.dll b/...odel.Clients.ActiveDirectory.Platform.dll → ...odel.Clients.ActiveDirectory.Platform.dll
diff --git a/...IdentityModel.Clients.ActiveDirectory.dll → ...IdentityModel.Clients.ActiveDirectory.dll b/...IdentityModel.Clients.ActiveDirectory.dll → ...IdentityModel.Clients.ActiveDirectory.dll
diff --git a/...oreAssemblies/System.Numerics.Vectors.dll → ...oadAssemblies/System.Numerics.Vectors.dll b/...oreAssemblies/System.Numerics.Vectors.dll → ...oadAssemblies/System.Numerics.Vectors.dll
diff --git a/...ystem.Runtime.CompilerServices.Unsafe.dll → ...ystem.Runtime.CompilerServices.Unsafe.dll b/...ystem.Runtime.CompilerServices.Unsafe.dll → ...ystem.Runtime.CompilerServices.Unsafe.dll
diff --git a/...eAssemblies/System.Text.Encodings.Web.dll → ...dAssemblies/System.Text.Encodings.Web.dll b/...eAssemblies/System.Text.Encodings.Web.dll → ...dAssemblies/System.Text.Encodings.Web.dll
diff --git a/...re/NetCoreAssemblies/System.Text.Json.dll → ...orePreloadAssemblies/System.Text.Json.dll b/...re/NetCoreAssemblies/System.Text.Json.dll → ...orePreloadAssemblies/System.Text.Json.dll
diff --git a/...ies/System.Threading.Tasks.Extensions.dll → ...ies/System.Threading.Tasks.Extensions.dll b/...ies/System.Threading.Tasks.Extensions.dll → ...ies/System.Threading.Tasks.Extensions.dll
diff --git a/...ure.Core/PreloadAssemblies/Azure.Core.dll → ...lib/NetFxPreloadAssemblies/Azure.Core.dll b/...ure.Core/PreloadAssemblies/Azure.Core.dll → ...lib/NetFxPreloadAssemblies/Azure.Core.dll
diff --git a/...emblies/Microsoft.Bcl.AsyncInterfaces.dll → ...emblies/Microsoft.Bcl.AsyncInterfaces.dll b/...emblies/Microsoft.Bcl.AsyncInterfaces.dll → ...emblies/Microsoft.Bcl.AsyncInterfaces.dll
diff --git a/...odel.Clients.ActiveDirectory.Platform.dll → ...odel.Clients.ActiveDirectory.Platform.dll b/...odel.Clients.ActiveDirectory.Platform.dll → ...odel.Clients.ActiveDirectory.Platform.dll
diff --git a/...IdentityModel.Clients.ActiveDirectory.dll → ...IdentityModel.Clients.ActiveDirectory.dll b/...IdentityModel.Clients.ActiveDirectory.dll → ...IdentityModel.Clients.ActiveDirectory.dll
diff --git a/src/lib/Newtonsoft.Json.10.dll → ...etFxPreloadAssemblies/Newtonsoft.Json.dll b/src/lib/Newtonsoft.Json.10.dll → ...etFxPreloadAssemblies/Newtonsoft.Json.dll
diff --git a/src/lib/System.Buffers.dll → ...NetFxPreloadAssemblies/System.Buffers.dll b/src/lib/System.Buffers.dll → ...NetFxPreloadAssemblies/System.Buffers.dll
diff --git a/....Diagnostics.DiagnosticSource.4.0.4.0.dll → ...s/System.Diagnostics.DiagnosticSource.dll b/....Diagnostics.DiagnosticSource.4.0.4.0.dll → ...s/System.Diagnostics.DiagnosticSource.dll
diff --git a/....Core/PreloadAssemblies/System.Memory.dll → .../NetFxPreloadAssemblies/System.Memory.dll b/....Core/PreloadAssemblies/System.Memory.dll → .../NetFxPreloadAssemblies/System.Memory.dll
diff --git a/src/lib/System.Net.Http.WinHttpHandler.dll → ...mblies/System.Net.Http.WinHttpHandler.dll b/src/lib/System.Net.Http.WinHttpHandler.dll → ...mblies/System.Net.Http.WinHttpHandler.dll
diff --git a/...oadAssemblies/System.Numerics.Vectors.dll → ...oadAssemblies/System.Numerics.Vectors.dll b/...oadAssemblies/System.Numerics.Vectors.dll → ...oadAssemblies/System.Numerics.Vectors.dll
diff --git a/src/lib/System.Private.ServiceModel.dll → ...ssemblies/System.Private.ServiceModel.dll b/src/lib/System.Private.ServiceModel.dll → ...ssemblies/System.Private.ServiceModel.dll
diff --git a/src/lib/System.Reflection.DispatchProxy.dll → ...blies/System.Reflection.DispatchProxy.dll b/src/lib/System.Reflection.DispatchProxy.dll → ...blies/System.Reflection.DispatchProxy.dll
diff --git a/src/lib/NetFxPreloadAssemblies/System.Runtime.CompilerServices.Unsafe.dll b/src/lib/NetFxPreloadAssemblies/System.Runtime.CompilerServices.Unsafe.dll
diff --git a/...emblies/System.Security.AccessControl.dll → ...emblies/System.Security.AccessControl.dll b/...emblies/System.Security.AccessControl.dll → ...emblies/System.Security.AccessControl.dll
diff --git a/...ssemblies/System.Security.Permissions.dll → ...ssemblies/System.Security.Permissions.dll b/...ssemblies/System.Security.Permissions.dll → ...ssemblies/System.Security.Permissions.dll
diff --git a/...ies/System.Security.Principal.Windows.dll → ...ies/System.Security.Principal.Windows.dll b/...ies/System.Security.Principal.Windows.dll → ...ies/System.Security.Principal.Windows.dll
diff --git a/src/lib/System.ServiceModel.Primitives.dll → ...mblies/System.ServiceModel.Primitives.dll b/src/lib/System.ServiceModel.Primitives.dll → ...mblies/System.ServiceModel.Primitives.dll
diff --git a/...dAssemblies/System.Text.Encodings.Web.dll → ...dAssemblies/System.Text.Encodings.Web.dll b/...dAssemblies/System.Text.Encodings.Web.dll → ...dAssemblies/System.Text.Encodings.Web.dll
diff --git a/...re/PreloadAssemblies/System.Text.Json.dll → ...tFxPreloadAssemblies/System.Text.Json.dll b/...re/PreloadAssemblies/System.Text.Json.dll → ...tFxPreloadAssemblies/System.Text.Json.dll
diff --git a/...em.Threading.Tasks.Extensions.4.2.0.0.dll → ...ies/System.Threading.Tasks.Extensions.dll b/...em.Threading.Tasks.Extensions.4.2.0.0.dll → ...ies/System.Threading.Tasks.Extensions.dll
diff --git a/...oadAssemblies/System.Xml.ReaderWriter.dll → ...oadAssemblies/System.Xml.ReaderWriter.dll b/...oadAssemblies/System.Xml.ReaderWriter.dll → ...oadAssemblies/System.Xml.ReaderWriter.dll
diff --git a/src/lib/PreloadAssemblyInfo.json b/src/lib/PreloadAssemblyInfo.json
@@ -0,0 +1,36 @@
+{
+  "netfx": {
+    "Azure.Core": "1.2.1.0",
+    "Microsoft.Bcl.AsyncInterfaces": "1.0.0.0",
+    "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.19.2.6005",
+    "Microsoft.IdentityModel.Clients.ActiveDirectory.Platform": "3.19.2.6005",
+    "Newtonsoft.Json": "10.0.0.0",
+    "System.Buffers": "4.0.2.0",
+    "System.Diagnostics.DiagnosticSource": "4.0.4.0",
+    "System.Memory": "4.0.1.1",
+    "System.Net.Http.WinHttpHandler": "4.0.2.0",
+    "System.Numerics.Vectors": "4.1.3.0",
+    "System.Private.ServiceModel": "4.1.2.1",
+    "System.Reflection.DispatchProxy": "4.0.3.0",
+    "System.Runtime.CompilerServices.Unsafe": "4.0.5.0",
+    "System.Security.AccessControl": "4.1.1.0",
+    "System.Security.Permissions": "4.0.1.0",
+    "System.Security.Principal.Windows": "4.1.1.0",
+    "System.ServiceModel.Primitives": "4.2.0.0",
+    "System.Text.Encodings.Web": "4.0.4.0",
+    "System.Text.Json": "4.0.0.0",
+    "System.Threading.Tasks.Extensions": "4.2.0.0",
+    "System.Xml.ReaderWriter": "4.1.0.0"
+  },
+  "netcore": {
+    "Azure.Core": "1.2.1.0",
+    "Microsoft.Bcl.AsyncInterfaces": "1.0.0.0",
+    "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.19.2.6005",
+    "Microsoft.IdentityModel.Clients.ActiveDirectory.Platform": "3.19.2.6005",
+    "System.Numerics.Vectors": "4.1.4.0",
+    "System.Runtime.CompilerServices.Unsafe": "4.0.6.0",
+    "System.Text.Encodings.Web": "4.0.5.0",
+    "System.Text.Json": "4.0.0.0",
+    "System.Threading.Tasks.Extensions": "4.3.1.0"
+    }
+}
diff --git a/src/lib/System.Security.AccessControl.dll b/src/lib/System.Security.AccessControl.dll
diff --git a/src/lib/System.Security.Permissions.dll b/src/lib/System.Security.Permissions.dll
diff --git a/src/lib/System.Security.Principal.Windows.dll b/src/lib/System.Security.Principal.Windows.dll
diff --git a/src/lib/test.net472.config b/src/lib/test.net472.config
@@ -9,7 +9,7 @@
         <codeBase version="9.0.0.0"
                   href="../../../../../lib/Newtonsoft.Json.9.dll"/>
         <codeBase version="10.0.0.0"
-                  href="../../../../../lib/Newtonsoft.Json.10.dll"/>
+                  href="../../../../../libNetFxPreloadAssemblies/Newtonsoft.Json.dll"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>