Fix issue where the same component can be loaded in multiple ALC and …

…cause cast issues (#669) * Fix issue where the same authored component was getting loaded in different ALC causing type cast issues. * Change bin directory to _build folder.
microsoft · Jan 15, 2021 · f5a5255 · f5a5255
1 parent fb0e7ad
commit f5a5255
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/src/Authoring/WinRT.Host.Shim/Module.cs b/src/Authoring/WinRT.Host.Shim/Module.cs
@@ -2,14 +2,8 @@
 // to simplify deployment
 
 using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Collections.Concurrent;
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Text;
-using Windows.Foundation;
-using WinRT;
 
 #if !NETSTANDARD2_0
 using System.Runtime.Loader;
@@ -69,13 +63,14 @@ private static class ActivationLoader
         }
 #else
         private class ActivationLoader : AssemblyLoadContext
-        {
+        {
+            private static readonly ConcurrentDictionary<string, ActivationLoader> ALCMapping = new ConcurrentDictionary<string, ActivationLoader>();
             private AssemblyDependencyResolver _resolver;
 
             public static Assembly LoadAssembly(string targetAssembly)
             {
-                var loader = new ActivationLoader(targetAssembly);
-                return loader.LoadFromAssemblyPath(targetAssembly);
+                return ALCMapping.GetOrAdd(targetAssembly, (_) => new ActivationLoader(targetAssembly))
+                    .LoadFromAssemblyPath(targetAssembly);
             }
 
             private ActivationLoader(string path)
@@ -96,7 +91,6 @@ private ActivationLoader(string path)
                 };
             }
 
-
             protected override Assembly Load(AssemblyName assemblyName)
             {
                 if (assemblyName.Name != "WinRT.Runtime")

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -36,7 +36,7 @@
     <CsWinRTPath Condition="'$(Platform)'=='ARM' or '$(Platform)'=='ARM64'">$([MSBuild]::NormalizeDirectory('$(SolutionDir)_build', 'x86', '$(Configuration)', 'cswinrt', 'bin'))</CsWinRTPath>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.vcxproj'">
+  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.vcxproj' or '$(MSBuildProjectExtension)' == '.wapproj'">
     <OutDir>$([MSBuild]::NormalizeDirectory('$(BuildOutDir)', '$(MSBuildProjectName)', 'bin'))</OutDir>
     <IntDir>$([MSBuild]::NormalizeDirectory('$(BuildOutDir)', '$(MSBuildProjectName)', 'obj'))</IntDir>
   </PropertyGroup>

diff --git a/src/Tests/AuthoringConsumptionTest/test.cpp b/src/Tests/AuthoringConsumptionTest/test.cpp
@@ -308,9 +308,7 @@ TEST(AuthoringTest, CustomDictionaryImplementations)
 
     EXPECT_EQ(dictionary.GetView().TryLookup(L"second").value(), basicStruct2);
     EXPECT_FALSE(dictionary.GetView().TryLookup(L"fourth").has_value());
-
-    // TODO: Broken due to ALC type mismatch.
-/*  
+
     TestClass testClass;
     EXPECT_EQ(testClass.GetSum(dictionary, L"second"), 4);
 
@@ -330,15 +328,13 @@ TEST(AuthoringTest, CustomDictionaryImplementations)
     EXPECT_TRUE(mapSplit1.HasKey(L"first"));
     EXPECT_FALSE(mapSplit1.HasKey(L"third"));
     EXPECT_TRUE(mapSplit2.HasKey(L"third"));
-    */
 
     Windows::Foundation::Collections::IMap<hstring, AuthoringTest::BasicStruct> map = dictionary;
     map.Clear();
     EXPECT_EQ(map.Size(), 0);
 }
 
-// TODO: Broken due to ALC type mismatch.
-TEST(AuthoringTest, DISABLED_CustomVectorImplementations)
+TEST(AuthoringTest, CustomVectorImplementations)
 {
     TestClass testClass;
     testClass.SetProjectedDisposableObject();