Load context support for net core

jeremytammik · Sep 16, 2024 · 5a9d9a6 · 5a9d9a6
1 parent e7e811f
commit 5a9d9a6
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/source/RevitLookup/Models/ModuleInfo.cs b/source/RevitLookup/Models/ModuleInfo.cs
@@ -22,9 +22,9 @@ namespace RevitLookup.Models;
 
 public sealed class ModuleInfo
 {
-    public required string Name { get; set; }
-    public required string Path { get; set; }
-    public required int Order { get; set; }
-    public required string Version { get; set; }
-    public required string Domain { get; set; }
+    public required string Name { get; init; }
+    public required string Path { get; init; }
+    public required int Order { get; init; }
+    public required string Version { get; init; }
+    public required string Container { get; init; }
 }
diff --git a/source/RevitLookup/ViewModels/Dialogs/ModulesViewModel.cs b/source/RevitLookup/ViewModels/Dialogs/ModulesViewModel.cs
@@ -18,6 +18,9 @@
 // Software - Restricted Rights) and DFAR 252.227-7013(c)(1)(ii)
 // (Rights in Technical Data and Computer Software), as applicable.
 
+#if NETCOREAPP
+using System.Runtime.Loader;
+#endif
 using RevitLookup.Models;
 
 namespace RevitLookup.ViewModels.Dialogs;
@@ -35,7 +38,6 @@ public ModulesViewModel()
 
     private void Initialize()
     {
-        var domain = AppDomain.CurrentDomain;
         var assemblies = AppDomain.CurrentDomain.GetAssemblies();
         Modules = new List<ModuleInfo>(assemblies.Length);
 
@@ -49,7 +51,11 @@ private void Initialize()
                 Path = assembly.IsDynamic ? string.Empty : assembly.Location,
                 Order = i + 1,
                 Version = assemblyName.Version is null ? string.Empty : assemblyName.Version.ToString(),
-                Domain = domain.FriendlyName
+#if NETCOREAPP
+                Container = AssemblyLoadContext.GetLoadContext(assembly)?.Name
+#else
+                Container = AppDomain.CurrentDomain.FriendlyName
+#endif
             };
 
             Modules.Add(module);

diff --git a/source/RevitLookup/Views/Dialogs/ModulesDialog.xaml b/source/RevitLookup/Views/Dialogs/ModulesDialog.xaml
@@ -76,13 +76,13 @@
                 </DataGridTemplateColumn.CellTemplate>
             </DataGridTemplateColumn>
             <DataGridTemplateColumn
-                Width="2*"
-                Header="Domain">
+                x:Name="ContainerColumn"
+                Width="2*">
                 <DataGridTemplateColumn.CellTemplate>
                     <DataTemplate>
                         <TextBlock
-                            Text="{Binding Domain}"
-                            ToolTip="{Binding Domain}">
+                            Text="{Binding Container}"
+                            ToolTip="{Binding Container}">
                         </TextBlock>
                     </DataTemplate>
                 </DataGridTemplateColumn.CellTemplate>

diff --git a/source/RevitLookup/Views/Dialogs/ModulesDialog.xaml.cs b/source/RevitLookup/Views/Dialogs/ModulesDialog.xaml.cs
@@ -34,6 +34,12 @@ public ModulesDialog(IServiceProvider serviceProvider)
         _serviceProvider = serviceProvider;
         DataContext = new ModulesViewModel();
         InitializeComponent();
+
+#if NETCOREAPP
+        ContainerColumn.Header = "Load context";
+#else
+        ContainerColumn.Header = "Domain";
+#endif
     }
 
     public async Task ShowAsync()