Fix AssemblyResolve in .NET Core

ricaun-io · Apr 4, 2024 · 552f227 · 552f227
1 parent 946873d
commit 552f227
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,14 +10,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fixed
 - Fix `Installation` Application issue.
 - Fix `Timeout` issue with `testsFinishedForceToEnd`.
-### Updated
-- Update `ricaun.Revit.Installation`
+### Command
+- Update `ricaun.Revit.Installation` to `1.1.2`
 - Update `debugger` with debug logs.
 - Update `Command` with `SemanticVersion`.
+### Application
+- Fix `AssemblyResolve` in `.NET Core` updated `AppDomainExtension`.
+### Shared
+- Update `NamedPipeWrapper.Json` to `1.7.0`
+### TestAdapter
 - Update `TestAdapter` with debug logs.
 - Update `TestAdapter` with `PackageTags`
 - Update `TestAdapter` with `PackageLicenseFile`
 
+
 ## [1.3.0] / 2024-03-28
 ### Features
 - Readme information to wiki.

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
 	<PropertyGroup>
-		<Version>1.3.1-beta.1</Version>
+		<Version>1.3.1-rc</Version>
 	</PropertyGroup>
 </Project>
diff --git a/ricaun.RevitTest.Application/Extensions/AppDomainUtils.cs b/ricaun.RevitTest.Application/Extensions/AppDomainUtils.cs
@@ -12,6 +12,17 @@ internal static class AppDomainUtils
         /// <returns></returns>
         public static AppDomainExtension.DelegatesDisposable AssemblyResolveDisposable()
         {
+#if DEBUG
+            var resolveEventHandler = AppDomain.CurrentDomain.GetResolveEventHandler();
+            Console.WriteLine($"Debug Domain >> {AppDomain.CurrentDomain.FriendlyName}");
+            Console.WriteLine($"Debug Assembly >> {typeof(AppDomainUtils).Assembly.FullName}");
+            Console.WriteLine($"Debug Location >> {typeof(AppDomainUtils).Assembly.Location}");
+            Console.WriteLine($"Debug GetResolveEventHandler >> {resolveEventHandler}");
+            if (resolveEventHandler is not null)
+            {
+                Console.WriteLine($"Debug GetInvocationList >> {resolveEventHandler.GetInvocationList().Length}");
+            }
+#endif
             return AppDomain.CurrentDomain.GetAssemblyResolveDisposable().NotRemoveDelegatesAfterDispose();
         }
     }
@@ -25,12 +36,21 @@ internal static class AppDomainExtension
         /// <returns></returns>
         public static ResolveEventHandler GetResolveEventHandler(this AppDomain appDomain)
         {
+#if NETFRAMEWORK
             var fieldName = "_AssemblyResolve";
 
             var fieldInfo = appDomain.GetType()
                 .GetField(fieldName, BindingFlags.Instance | BindingFlags.NonPublic);
 
             return fieldInfo?.GetValue(appDomain) as ResolveEventHandler;
+#elif NET
+            var fieldName = "AssemblyResolve";
+
+            var fieldInfo = typeof(System.Runtime.Loader.AssemblyLoadContext)
+                .GetField(fieldName, BindingFlags.Static | BindingFlags.NonPublic);
+
+            return fieldInfo?.GetValue(null) as ResolveEventHandler;
+#endif
         }
 
         /// <summary>

diff --git a/ricaun.RevitTest.Application/ricaun.RevitTest.Application.csproj b/ricaun.RevitTest.Application/ricaun.RevitTest.Application.csproj
@@ -139,7 +139,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="9.*" IncludeAssets="build; compile" PrivateAssets="All">
       <NoWarn>NU1903</NoWarn>
     </PackageReference>
-    <PackageReference Include="Revit_All_Main_Versions_API_x64" Version="$(RevitVersion).*-*" IncludeAssets="build; compile" PrivateAssets="All" />
+    <PackageReference Include="Revit_All_Main_Versions_API_x64" Version="$(RevitVersion).*" IncludeAssets="build; compile" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ricaun.RevitTest.Console/Resources/ricaun.RevitTest.Application.bundle.zip b/ricaun.RevitTest.Console/Resources/ricaun.RevitTest.Application.bundle.zip
diff --git a/ricaun.RevitTest.Console/ricaun.RevitTest.Console.csproj b/ricaun.RevitTest.Console/ricaun.RevitTest.Console.csproj
@@ -47,7 +47,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ricaun.Revit.Installation" Version="*-*" />
+    <PackageReference Include="ricaun.Revit.Installation" Version="*" />
     <PackageReference Include="Microsoft.VisualStudio.Interop" Version="*" />
   </ItemGroup>
 

diff --git a/ricaun.RevitTest.Shared/ricaun.RevitTest.Shared.csproj b/ricaun.RevitTest.Shared/ricaun.RevitTest.Shared.csproj
@@ -64,7 +64,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NamedPipeWrapper.Json" Version="*-*" />
+    <PackageReference Include="NamedPipeWrapper.Json" Version="*" />
     <PackageReference Include="ricaun.NUnit" Version="*" />
   </ItemGroup>
 

diff --git a/ricaun.RevitTest.TestAdapter/Resources/net48/ricaun.RevitTest.Console.zip b/ricaun.RevitTest.TestAdapter/Resources/net48/ricaun.RevitTest.Console.zip
diff --git a/ricaun.RevitTest.TestAdapter/Resources/net8.0-windows/ricaun.RevitTest.Console.zip b/ricaun.RevitTest.TestAdapter/Resources/net8.0-windows/ricaun.RevitTest.Console.zip
diff --git a/ricaun.RevitTest.Tests/ricaun.RevitTest.Tests.csproj b/ricaun.RevitTest.Tests/ricaun.RevitTest.Tests.csproj
@@ -56,7 +56,7 @@
 
   <ItemGroup>
     <PackageReference Include="ricaun.Revit.Async" Version="*" />
-    <PackageReference Include="Revit_All_Main_Versions_API_x64" Version="$(RevitVersion).*-*" IncludeAssets="build; compile" PrivateAssets="All" />
+    <PackageReference Include="Revit_All_Main_Versions_API_x64" Version="$(RevitVersion).*" IncludeAssets="build; compile" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>