From 5a5cbedd2203f4b9b7842e40e9b0bc8b929938ec Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Mon, 2 Jan 2023 12:57:16 +0000
Subject: [PATCH 01/18] First pass ifc4x3 implementation.

Supports loading IFC4x3 schema but latest Geometry needed

Styler fixed up and multi-schema code reviewed
---
 Xbim.Presentation/DrawingControl3D.xaml.cs       |  9 ++++++---
 .../DynamicProductSelectionControl.xaml.cs       |  2 +-
 .../FederatedModel/FederatedModelViewModel.cs    |  7 ++++++-
 Xbim.Presentation/Xbim.Presentation.csproj       |  5 +++--
 Xbim.WinformsSample/Xbim.WinformsSample.csproj   |  4 ++--
 XbimXplorer/Commands/wdwCommands.xaml.cs         | 10 +++++++---
 .../Dialogs/ExcludedTypes/ExpressTypeExpander.cs |  2 +-
 .../ExcludedTypes/StylerConfiguration.xaml.cs    | 16 +++++++++++-----
 XbimXplorer/Simplify/IfcSimplify.xaml.cs         |  2 +-
 XbimXplorer/XbimXplorer.csproj                   |  4 ++--
 XbimXplorer/XplorerMainWindow.xaml.cs            |  8 +++++++-
 XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj       |  2 +-
 12 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/Xbim.Presentation/DrawingControl3D.xaml.cs b/Xbim.Presentation/DrawingControl3D.xaml.cs
index f5268102..7052b765 100644
--- a/Xbim.Presentation/DrawingControl3D.xaml.cs
+++ b/Xbim.Presentation/DrawingControl3D.xaml.cs
@@ -231,9 +231,12 @@ protected void ClipPlaneHandlesHide()
 		{
 			typeof(Ifc2x3.ProductExtension.IfcSpace),
 			typeof(Ifc4.ProductExtension.IfcSpace),
-			typeof(Ifc2x3.ProductExtension.IfcFeatureElement),
-			typeof(Ifc4.ProductExtension.IfcFeatureElement)
-		};
+            typeof(Ifc4x3.ProductExtension.IfcSpace),
+
+            typeof(Ifc2x3.ProductExtension.IfcFeatureElement),
+			typeof(Ifc4.ProductExtension.IfcFeatureElement),
+            typeof(Ifc4x3.ProductExtension.IfcFeatureElement)
+        };
 
 		/// <summary>
 		/// The list of types that the engine will not consider in the generation of the scene, the exclusion code needs to be correctly implemented in the 
diff --git a/Xbim.Presentation/DynamicProductSelectionControl.xaml.cs b/Xbim.Presentation/DynamicProductSelectionControl.xaml.cs
index c3607ae2..9d5b3053 100644
--- a/Xbim.Presentation/DynamicProductSelectionControl.xaml.cs
+++ b/Xbim.Presentation/DynamicProductSelectionControl.xaml.cs
@@ -199,7 +199,7 @@ private void btnPerform_Click(object sender, RoutedEventArgs e)
             compilerParams.ReferencedAssemblies.Add("System.Xml.dll");
             compilerParams.ReferencedAssemblies.Add("System.Xml.Linq.dll");
             compilerParams.ReferencedAssemblies.Add("Xbim.Common.dll");
-            compilerParams.ReferencedAssemblies.Add("Xbim.Ifc2x3.dll");
+            compilerParams.ReferencedAssemblies.Add("Xbim.Ifc2x3.dll"); // TODO: handle newer schemas
             compilerParams.ReferencedAssemblies.Add("Xbim.IO.dll");
             compilerParams.ReferencedAssemblies.Add("Xbim.Ifc.Extensions.dll");
 
diff --git a/Xbim.Presentation/FederatedModel/FederatedModelViewModel.cs b/Xbim.Presentation/FederatedModel/FederatedModelViewModel.cs
index 4209c19f..1256a333 100644
--- a/Xbim.Presentation/FederatedModel/FederatedModelViewModel.cs
+++ b/Xbim.Presentation/FederatedModel/FederatedModelViewModel.cs
@@ -47,7 +47,12 @@ public string Project
                         var x4 = project as Ifc4.Kernel.IfcProject;
                         x4.Name = value;
                     }
-                    
+                    else if (project is Ifc4x3.Kernel.IfcProject)
+                    {
+                        var x4 = project as Ifc4.Kernel.IfcProject;
+                        x4.Name = value;
+                    }
+
                     txn.Commit();
                 }
                 OnPropertyChanged("Project");
diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index 6c862df6..c58dd6dc 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -10,7 +10,7 @@
     <PackageReleaseNotes>Now built on XBIM v5. Migrated from log4net to Microsoft.Extensions.Logging.</PackageReleaseNotes>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Version>5.1.0.0</Version>
+    <Version>5.1.0.0-develop</Version>
     <PackageIcon>XbimIcon.png</PackageIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472|AnyCPU'">
@@ -43,7 +43,8 @@
   <ItemGroup>
     <PackageReference Include="HelixToolkit.Wpf" Version="2.14.0" />
     <PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
-    <PackageReference Include="Xbim.Geometry" Version="5.1.443-develop" />
+    <PackageReference Include="Xbim.Essentials" Version="5.9.375-develop" />
+    <PackageReference Include="Xbim.Geometry" Version="5.1.445" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
diff --git a/Xbim.WinformsSample/Xbim.WinformsSample.csproj b/Xbim.WinformsSample/Xbim.WinformsSample.csproj
index 7da9346e..0d980074 100644
--- a/Xbim.WinformsSample/Xbim.WinformsSample.csproj
+++ b/Xbim.WinformsSample/Xbim.WinformsSample.csproj
@@ -49,8 +49,8 @@
 		<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
 		<PackageReference Include="System.Security.Principal.Windows" Version="4.5.1" />
 		<PackageReference Include="System.Threading.Tasks" Version="4.3.0" />		
-		<PackageReference Include="Xbim.Geometry" Version="5.1.443-develop" />
-		<PackageReference Include="Xbim.IO.Esent" Version="5.1.350" />
+		<PackageReference Include="Xbim.Geometry" Version="5.1.445" />
+		<PackageReference Include="Xbim.IO.Esent" Version="5.9.375-develop" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Xbim.Presentation\Xbim.Presentation.csproj" />
diff --git a/XbimXplorer/Commands/wdwCommands.xaml.cs b/XbimXplorer/Commands/wdwCommands.xaml.cs
index 0e9fa269..fe39f013 100644
--- a/XbimXplorer/Commands/wdwCommands.xaml.cs
+++ b/XbimXplorer/Commands/wdwCommands.xaml.cs
@@ -2047,6 +2047,7 @@ private IEnumerable<int> GetRepresentationItems(IEnumerable<int> labels, string
         private void PopulateFilterTypes()
         {
             // todo: these lists needs to be revised
+            // TODO: Add Ifc4x3 once geometry ready
                      
             _surfaceOrSolidTypes = new List<Type>();
             _surfaceOrSolidTypes.AddRange(SchemaMetadatas["ifc2x3"].ExpressType(typeof(Xbim.Ifc2x3.GeometryResource.IfcSurface)).NonAbstractSubTypes.Select(x => x.Type));
@@ -2322,6 +2323,8 @@ private IEnumerable<string> MatchingTypes(string regExString)
                             t.Namespace.StartsWith("Xbim.Ifc2x3.")
                             ||
                             t.Namespace.StartsWith("Xbim.Ifc4.")
+                            ||
+                            t.Namespace.StartsWith("Xbim.Ifc4x3.")
                             ))
                     )
                 {
@@ -2380,7 +2383,8 @@ private string GetFriendlyTypeName(Type type)
         internal static Dictionary<string, ExpressMetaData> SchemaMetadatas => new Dictionary<string, ExpressMetaData>
         {
             {"ifc2x3", ExpressMetaData.GetMetadata(typeof(Xbim.Ifc2x3.SharedBldgElements.IfcWall).Module)},
-            {"ifc4", ExpressMetaData.GetMetadata(typeof(Xbim.Ifc4.SharedBldgElements.IfcWall).Module)}
+            {"ifc4", ExpressMetaData.GetMetadata(typeof(Xbim.Ifc4.SharedBldgElements.IfcWall).Module)},
+            {"ifc4x3", ExpressMetaData.GetMetadata(typeof(Xbim.Ifc4x3.SharedBldgElements.IfcWall).Module)}
         };
 
         private TextHighliter ReportType(string type, int beVerbose, string indentationHeader = "")
@@ -2811,9 +2815,9 @@ private static string ReportPropValue(object propVal, ref List<int> retIds, bool
                 ? " [#" + propLabel + "]" 
                 : ""
                 );
-            if (pe as Xbim.Ifc2x3.Interfaces.IIfcCartesianPoint != null)
+            if (pe as IIfcCartesianPoint != null)
             {
-                var n = pe as Xbim.Ifc2x3.Interfaces.IIfcCartesianPoint;
+                var n = pe as IIfcCartesianPoint;
                 var vals = n.Coordinates.Select(x => x.Value);
                 ret += "\t" + string.Join("\t,\t", vals);
             }
diff --git a/XbimXplorer/Dialogs/ExcludedTypes/ExpressTypeExpander.cs b/XbimXplorer/Dialogs/ExcludedTypes/ExpressTypeExpander.cs
index 4cb2d408..e4cba36f 100644
--- a/XbimXplorer/Dialogs/ExcludedTypes/ExpressTypeExpander.cs
+++ b/XbimXplorer/Dialogs/ExcludedTypes/ExpressTypeExpander.cs
@@ -20,7 +20,7 @@ public ExpressTypeExpander(ExpressType view, IfcStore model)
 
         IEnumerable<ObjectViewModel> ITreeElement.GetChildren()
         {
-            foreach (var child in ExpressType.SubTypes)
+            foreach (var child in ExpressType.SubTypes.OrderBy(e => e.Name))
             {
                 yield return new ObjectViewModel() { Tag = new ExpressTypeExpander(child, Model) };                
             }
diff --git a/XbimXplorer/Dialogs/ExcludedTypes/StylerConfiguration.xaml.cs b/XbimXplorer/Dialogs/ExcludedTypes/StylerConfiguration.xaml.cs
index a9c976e9..32bc279e 100644
--- a/XbimXplorer/Dialogs/ExcludedTypes/StylerConfiguration.xaml.cs
+++ b/XbimXplorer/Dialogs/ExcludedTypes/StylerConfiguration.xaml.cs
@@ -34,16 +34,22 @@ private void PopulateTree()
             TypesTree.Items.Clear();
 
             // this is done through the metadata in order to ensure that class relationships are loaded
+            var module2X3 = (typeof(Xbim.Ifc2x3.Kernel.IfcProduct)).Module;
+            var meta2X3 = ExpressMetaData.GetMetadata(module2X3);
+            var product2X3 = meta2X3.ExpressType("IFCPRODUCT");
+            TypesTree.Items.Add(new ObjectViewModel() { Header = "Ifc2x3.IfcProduct", Tag = new ExpressTypeExpander(product2X3, Model), IsChecked = true });
+
             var module4 = (typeof(Xbim.Ifc4.Kernel.IfcProduct)).Module;
             var meta4 = ExpressMetaData.GetMetadata(module4);
             var product4 = meta4.ExpressType("IFCPRODUCT");
             TypesTree.Items.Add(new ObjectViewModel() { Header = "Ifc4.IfcProduct", Tag = new ExpressTypeExpander(product4, Model), IsChecked = true });
 
-            // this is done through the metadata in order to ensure that class relationships are loaded
-            var module2X3 = (typeof(Xbim.Ifc2x3.Kernel.IfcProduct)).Module;
-            var meta2X3 = ExpressMetaData.GetMetadata(module2X3);
-            var product2X3 = meta2X3.ExpressType("IFCPRODUCT"); 
-            TypesTree.Items.Add(new ObjectViewModel() { Header = "Ifc2x3.IfcProduct", Tag = new ExpressTypeExpander(product2X3, Model), IsChecked = true });
+            var module4x3 = (typeof(Xbim.Ifc4x3.Kernel.IfcProduct)).Module;
+            var meta4x3 = ExpressMetaData.GetMetadata(module4x3);
+            var product4x3 = meta4x3.ExpressType("IFCPRODUCT");
+            TypesTree.Items.Add(new ObjectViewModel() { Header = "Ifc4x3.IfcProduct", Tag = new ExpressTypeExpander(product4x3, Model), IsChecked = true });
+
+
         }
 
         public List<Type> ExcludedTypes
diff --git a/XbimXplorer/Simplify/IfcSimplify.xaml.cs b/XbimXplorer/Simplify/IfcSimplify.xaml.cs
index 898b8e40..fc0bf89b 100644
--- a/XbimXplorer/Simplify/IfcSimplify.xaml.cs
+++ b/XbimXplorer/Simplify/IfcSimplify.xaml.cs
@@ -481,7 +481,7 @@ private void cmdSave_Click(object sender, RoutedEventArgs e)
             var max = _exportList.Max();
             if (ExportContainment.IsChecked.Value)
             {
-                var newid = new Xbim.Ifc4.UtilityResource.IfcGloballyUniqueId();
+                Xbim.Ifc4.UtilityResource.IfcGloballyUniqueId newid;
                 // we need to ensure that the site is exported.
                 var exportedSite = _exportList.Intersect(_ifcSites).FirstOrDefault();
                 if (exportedSite == 0)
diff --git a/XbimXplorer/XbimXplorer.csproj b/XbimXplorer/XbimXplorer.csproj
index 1cf6982e..03e4a02f 100644
--- a/XbimXplorer/XbimXplorer.csproj
+++ b/XbimXplorer/XbimXplorer.csproj
@@ -62,8 +62,8 @@
 		<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.4" />
 		<PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
-		<PackageReference Include="Xbim.Geometry" Version="5.1.443-develop" />
-		<PackageReference Include="Xbim.IO.Esent" Version="5.1.350" />
+		<PackageReference Include="Xbim.Geometry" Version="5.1.445" />
+		<PackageReference Include="Xbim.IO.Esent" Version="5.9.375-develop" />
 	</ItemGroup>
 	<ItemGroup>
 		<Reference Include="Microsoft.CSharp" />
diff --git a/XbimXplorer/XplorerMainWindow.xaml.cs b/XbimXplorer/XplorerMainWindow.xaml.cs
index 60ed50e3..97389b7f 100644
--- a/XbimXplorer/XplorerMainWindow.xaml.cs
+++ b/XbimXplorer/XplorerMainWindow.xaml.cs
@@ -747,6 +747,7 @@ private void FederationFromDialogbox(OpenFileDialog dlg)
                 case ".ifczip":
                 case ".ifcxml":
                     // create temp file as a placeholder for the temporory xbim file                   
+                    // TODO: Will this work in IFC4x?
                     fedModel = IfcStore.Create(null, XbimSchemaVersion.Ifc2X3, XbimStoreType.InMemoryModel);
                     using (var txn = fedModel.BeginTransaction())
                     {
@@ -1178,11 +1179,16 @@ private void StylerIfcSpacesOnly(object sender, RoutedEventArgs e)
             var module4 = (typeof(Xbim.Ifc4.Kernel.IfcProduct)).Module;
             var meta4 = ExpressMetaData.GetMetadata(module4);
             var product4 = meta4.ExpressType("IFCPRODUCT");
-            
+
+            var module4x3 = (typeof(Xbim.Ifc4x3.Kernel.IfcProduct)).Module;
+            var meta4x3 = ExpressMetaData.GetMetadata(module4x3);
+            var product4x3 = meta4.ExpressType("IFCPRODUCT");
+
 
 
             var tpcoll = product2X3.NonAbstractSubTypes.Select(x => x.Type).ToList();
             tpcoll.AddRange(product4.NonAbstractSubTypes.Select(x => x.Type).ToList());
+            tpcoll.AddRange(product4x3.NonAbstractSubTypes.Select(x => x.Type).ToList());
             tpcoll.RemoveAll(x => x.Name == "IfcSpace");
 
             DrawingControl.ExcludedTypes = tpcoll;
diff --git a/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj b/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
index df0e99d8..1c753d33 100644
--- a/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
+++ b/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
@@ -68,6 +68,6 @@
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
     <PackageReference Include="System.Security.Principal.Windows" Version="4.5.1" />
     <PackageReference Include="System.Threading.Tasks" Version="4.3.0" />
-    <PackageReference Include="Xbim.Geometry" Version="5.1.443-develop" />    
+    <PackageReference Include="Xbim.Geometry" Version="5.1.445" />    
   </ItemGroup>
 </Project>
\ No newline at end of file

From 857eb50e1e74e7a62306d576b7ffd39b997f2b18 Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Mon, 2 Jan 2023 15:25:32 +0000
Subject: [PATCH 02/18] WIP upgrade to .net6.0 and latest netcore geometry
 (including 4x3). Geometry to test. Plugins disabled due to Nuget package
 deprecation

---
 Directory.Build.props                         |  2 +-
 Xbim.Presentation/DrawingControl3D.xaml.cs    | 10 +++--
 .../Extensions/ObservableMeshVisual3D.cs      |  4 +-
 Xbim.Presentation/Themes/Generic.xaml         |  2 +-
 Xbim.Presentation/Xbim.Presentation.csproj    | 27 +++++------
 Xbim.WindowsUI.sln                            | 10 ++---
 .../Xbim.WinformsSample.csproj                |  2 +-
 XbimXplorer/Commands/EmbedDoc.xaml            |  2 +-
 XbimXplorer/Commands/EmbedDoc.xaml.cs         |  5 ++-
 XbimXplorer/Commands/wdwCommands.xaml.cs      |  2 +-
 XbimXplorer/Dialogs/AssemblyInformation.cs    | 16 +++----
 .../PluginSystem/IPackageExtensions.cs        |  6 ++-
 XbimXplorer/PluginSystem/PluginInformation.cs | 15 ++++---
 .../PluginSystem/PluginInformationVm.cs       | 15 ++++---
 XbimXplorer/PluginSystem/PluginManagement.cs  |  6 ++-
 .../PluginSystem/PluginsConfig.xaml.cs        | 12 ++---
 XbimXplorer/Properties/Resources.Designer.cs  |  2 +-
 XbimXplorer/Properties/Settings.Designer.cs   |  2 +-
 XbimXplorer/XbimXplorer.csproj                | 45 ++++++++++---------
 XbimXplorer/XplorerMainWindow.Plugins.xaml.cs |  6 ++-
 XbimXplorer/XplorerMainWindow.xaml            |  2 +-
 XbimXplorer/XplorerMainWindow.xaml.cs         | 22 +++++----
 XbimXplorer/app.config                        |  4 +-
 XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj    |  2 +-
 nuget.config                                  |  1 +
 25 files changed, 120 insertions(+), 102 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 3dcc9b94..ae332a6d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -24,7 +24,7 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>..\XbimOpenSourceKeyFile.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
   </PropertyGroup>
diff --git a/Xbim.Presentation/DrawingControl3D.xaml.cs b/Xbim.Presentation/DrawingControl3D.xaml.cs
index 7052b765..d2797f88 100644
--- a/Xbim.Presentation/DrawingControl3D.xaml.cs
+++ b/Xbim.Presentation/DrawingControl3D.xaml.cs
@@ -1363,10 +1363,14 @@ private void ClearGraphics(ModelRefreshOptions options = ModelRefreshOptions.Non
 			Materials.Clear();
 			OriginalOpacities.Clear();
 
-			Opaques.Children.Clear();
-			Transparents.Children.Clear();
+			if(Opaques != null)
+				Opaques.Children.Clear();
+			if(Transparents != null)
+				Transparents.Children.Clear();
+			if(Extras != null)
 			Extras.Children.Clear();
-			Overlays.Children.Clear();
+			if(Overlays != null)
+				Overlays.Children.Clear();
 
 			if (!options.HasFlag(ModelRefreshOptions.ViewPreserveSelection))
 			{
diff --git a/Xbim.Presentation/Extensions/ObservableMeshVisual3D.cs b/Xbim.Presentation/Extensions/ObservableMeshVisual3D.cs
index b7d4992f..0bf404d6 100644
--- a/Xbim.Presentation/Extensions/ObservableMeshVisual3D.cs
+++ b/Xbim.Presentation/Extensions/ObservableMeshVisual3D.cs
@@ -1,6 +1,6 @@
-using System.ComponentModel;
+using HelixToolkit.Wpf;
+using System.ComponentModel;
 using System.Windows.Media.Media3D;
-using HelixToolkit.Wpf;
 using Xbim.Presentation.Extensions.Utility;
 
 namespace Xbim.Presentation.Extensions
diff --git a/Xbim.Presentation/Themes/Generic.xaml b/Xbim.Presentation/Themes/Generic.xaml
index 56bfd533..c4360193 100644
--- a/Xbim.Presentation/Themes/Generic.xaml
+++ b/Xbim.Presentation/Themes/Generic.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xbim.Presentation" 
-                    xmlns:helixToolkit="clr-namespace:HelixToolkit.Wpf;assembly=HelixToolkit.Wpf"
+                    xmlns:helixToolkit="clr-namespace:HelixToolkit.Wpf;assembly=HelixToolkit.Core.Wpf"
                     xmlns:extensions="clr-namespace:Xbim.Presentation.Extensions">
     <Style x:Key="{x:Type local:DrawingControl3D}" TargetType="{x:Type local:DrawingControl3D}">
         <Setter Property="Template">
diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index c58dd6dc..a4baca53 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -2,16 +2,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <LanguageTargets>$(MSBuildToolsPath)\Microsoft.CSharp.targets</LanguageTargets>
-    <TargetFrameworks>net472</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <Title>Xbim.Presentation</Title>
     <Description>Xbim.WindowsUI is a library containing a set of Windows Forms and WPF controls that can be used to build Windows Xaml 
     or forms-based applications, which can display the 3D geometry and semantic data in IFC building models.</Description>
     <PackageId>Xbim.WindowsUI</PackageId>
-    <PackageReleaseNotes>Now built on XBIM v5. Migrated from log4net to Microsoft.Extensions.Logging.</PackageReleaseNotes>
+    <PackageReleaseNotes>Now built on XBIM v6.</PackageReleaseNotes>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Version>5.1.0.0-develop</Version>
+    <Version>6.0.0.0-develop</Version>
     <PackageIcon>XbimIcon.png</PackageIcon>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472|AnyCPU'">
     <OutputPath>..\Output\Debug\</OutputPath>
@@ -36,25 +37,17 @@
       <Pack>True</Pack>
       <PackagePath></PackagePath>
     </None>
-    <Page Include="**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" Exclude="App.xaml" />
-    <Compile Update="**\*.xaml.cs" SubType="Designer" DependentUpon="%(Filename)" />
+    <!--<Page Include="**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" Exclude="App.xaml" />
+    <Compile Update="**\*.xaml.cs" SubType="Designer" DependentUpon="%(Filename)" />-->
     <Resource Include="assets\*.*" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HelixToolkit.Wpf" Version="2.14.0" />
+    <PackageReference Include="HelixToolkit.Core.Wpf" Version="2.23.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
     <PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
-    <PackageReference Include="Xbim.Essentials" Version="5.9.375-develop" />
-    <PackageReference Include="Xbim.Geometry" Version="5.1.445" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="WindowsBase" />
+    <PackageReference Include="Xbim.Geometry" Version="6.1.542-netcore" />
   </ItemGroup>
+  
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.de.resx">
       <Generator>ResXFileCodeGenerator</Generator>
diff --git a/Xbim.WindowsUI.sln b/Xbim.WindowsUI.sln
index 2f2130cc..3f7231dd 100644
--- a/Xbim.WindowsUI.sln
+++ b/Xbim.WindowsUI.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30907.101
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33122.133
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xbim.Presentation", "Xbim.Presentation\Xbim.Presentation.csproj", "{89F98E53-DE4E-4427-8244-D5934AD08849}"
 EndProject
@@ -14,13 +14,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		azure-pipelines.yml = azure-pipelines.yml
 		Directory.Build.props = Directory.Build.props
 		LICENCE.md = LICENCE.md
+		nuget.config = nuget.config
 		SharedAssemblyInfo.cs = SharedAssemblyInfo.cs
 		XplorerPlugin.Bcf.plugin.nuspec = XplorerPlugin.Bcf.plugin.nuspec
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XplorerPlugins", "XplorerPlugins", "{0A25F1E8-AAD2-4E93-B1AE-E50FCE26CB2C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XplorerPlugin.Bcf", "XplorerPlugin.Bcf\XplorerPlugin.Bcf.csproj", "{935963BB-7EE9-4C8F-BC60-DE43961F2E98}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XplorerPlugin.Bcf", "XplorerPlugin.Bcf\XplorerPlugin.Bcf.csproj", "{935963BB-7EE9-4C8F-BC60-DE43961F2E98}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{645DE1B1-90B9-4B04-8F65-F6C81B046B23}"
 EndProject
@@ -41,15 +42,12 @@ Global
 		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Release|Any CPU.Build.0 = Release|Any CPU
 		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Release|Any CPU.Build.0 = Release|Any CPU
 		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
diff --git a/Xbim.WinformsSample/Xbim.WinformsSample.csproj b/Xbim.WinformsSample/Xbim.WinformsSample.csproj
index 0d980074..4849be24 100644
--- a/Xbim.WinformsSample/Xbim.WinformsSample.csproj
+++ b/Xbim.WinformsSample/Xbim.WinformsSample.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<LanguageTargets>$(MSBuildToolsPath)\Microsoft.CSharp.targets</LanguageTargets>
-		<TargetFrameworks>net472</TargetFrameworks>
+		<TargetFrameworks>net48</TargetFrameworks>
 		<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
 		<OutputType>WinExe</OutputType>	
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/XbimXplorer/Commands/EmbedDoc.xaml b/XbimXplorer/Commands/EmbedDoc.xaml
index 5bd10968..e9fef077 100644
--- a/XbimXplorer/Commands/EmbedDoc.xaml
+++ b/XbimXplorer/Commands/EmbedDoc.xaml
@@ -5,7 +5,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:avalonDock="http://schemas.xceed.com/wpf/xaml/avalondock"
+             xmlns:avalonDock="https://github.com/Dirkster99/AvalonDock"
              mc:Ignorable="d" 
              >
     <Grid FocusManager.FocusedElement="{Binding ElementName=TxtCommand}">
diff --git a/XbimXplorer/Commands/EmbedDoc.xaml.cs b/XbimXplorer/Commands/EmbedDoc.xaml.cs
index 76ccd317..f6649b5b 100644
--- a/XbimXplorer/Commands/EmbedDoc.xaml.cs
+++ b/XbimXplorer/Commands/EmbedDoc.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using AvalonDock.Layout;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -11,7 +12,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using Xceed.Wpf.AvalonDock.Layout;
+
 
 namespace XbimXplorer.Commands
 {
diff --git a/XbimXplorer/Commands/wdwCommands.xaml.cs b/XbimXplorer/Commands/wdwCommands.xaml.cs
index fe39f013..f0d17d8f 100644
--- a/XbimXplorer/Commands/wdwCommands.xaml.cs
+++ b/XbimXplorer/Commands/wdwCommands.xaml.cs
@@ -1139,7 +1139,7 @@ private void PluginCommand(Match mdbclosed)
                 }
 
                 // test for the right command string
-                if (plugin.InstalledVersion != ""
+                if (plugin.InstalledVersion != null
                     && commandString.ToLower() == "install")
                 {
                     ReportAdd($"The plugin is already installed, use the 'plugin update {pluginName}' command instead.", Brushes.Red);
diff --git a/XbimXplorer/Dialogs/AssemblyInformation.cs b/XbimXplorer/Dialogs/AssemblyInformation.cs
index 1456deeb..a5ba6006 100644
--- a/XbimXplorer/Dialogs/AssemblyInformation.cs
+++ b/XbimXplorer/Dialogs/AssemblyInformation.cs
@@ -56,14 +56,14 @@ public static Dictionary<string, Assembly> MyGetReferencedAssembliesRecursive(th
 
             InternalGetDependentAssembliesRecursive(assembly);
 
-            // Only include assemblies that we wrote ourselves (ignore ones from GAC).
-            var keysToRemove = _dependentAssemblyList.Values.Where(
-                o => o.GlobalAssemblyCache == true).ToList();
+            //// Only include assemblies that we wrote ourselves (ignore ones from GAC).
+            //var keysToRemove = _dependentAssemblyList.Values.Where(
+            //    o => o.GlobalAssemblyCache == true).ToList();
 
-            foreach (var k in keysToRemove)
-            {
-                _dependentAssemblyList.Remove(k.FullName.MyToName());
-            }
+            //foreach (var k in keysToRemove)
+            //{
+            //    _dependentAssemblyList.Remove(k.FullName.MyToName());
+            //}
 
             return _dependentAssemblyList;
         }
@@ -102,7 +102,7 @@ private static void InternalGetDependentAssembliesRecursive(Assembly assembly)
                 {
                     try
                     {
-                        var a = Assembly.ReflectionOnlyLoad(r.FullName);
+                        var a = Assembly.LoadFrom(r.FullName);
                         _dependentAssemblyList[a.FullName.MyToName()] = a;
                         InternalGetDependentAssembliesRecursive(a);
                     }
diff --git a/XbimXplorer/PluginSystem/IPackageExtensions.cs b/XbimXplorer/PluginSystem/IPackageExtensions.cs
index 53ba037a..d9e0959d 100644
--- a/XbimXplorer/PluginSystem/IPackageExtensions.cs
+++ b/XbimXplorer/PluginSystem/IPackageExtensions.cs
@@ -1,6 +1,7 @@
 using System.IO;
 using NuGet;
 using Ionic.Zip;
+using NuGet.Packaging;
 
 namespace XbimXplorer.PluginSystem
 {
@@ -12,9 +13,9 @@ internal static class PackageExtensions
         /// <param name="package"></param>
         /// <param name="targetFileName"></param>
         /// <returns>true if successful, false if fail.</returns>
-        internal static bool ExtractManifestFile(this IPackage package, string targetFileName)
+        internal static bool ExtractManifestFile(this IPackageMetadata package, string targetFileName)
         {
-
+            #if Nuget
             using (var fs = package.GetStream())
             {
 
@@ -38,6 +39,7 @@ internal static bool ExtractManifestFile(this IPackage package, string targetFil
                     }
                 }
             }
+#endif
 
             return false;
         }
diff --git a/XbimXplorer/PluginSystem/PluginInformation.cs b/XbimXplorer/PluginSystem/PluginInformation.cs
index dcc8738d..048f0117 100644
--- a/XbimXplorer/PluginSystem/PluginInformation.cs
+++ b/XbimXplorer/PluginSystem/PluginInformation.cs
@@ -1,8 +1,9 @@
 using Microsoft.Extensions.Logging;
-using NuGet;
 using System;
 using System.IO;
 using System.Windows;
+using NuGet.Packaging;
+using NuGet.Versioning;
 
 namespace XbimXplorer.PluginSystem
 {
@@ -14,11 +15,11 @@ public class PluginInformation
 
         internal PluginConfiguration Config { get; set; }
         
-        public string AvailableVersion => _onlinePackage?.Version.ToString() ?? "";
-        public string InstalledVersion => _diskManifest?.Version ?? "";
+        public NuGetVersion AvailableVersion => _onlinePackage?.Version;
+        public NuGetVersion InstalledVersion => _diskManifest?.Version;
         public string LoadedVersion => MainWindow?.GetLoadedVersion(PluginId) ?? "";
 
-        private IPackage _onlinePackage;
+        private IPackageMetadata _onlinePackage;
         private ManifestMetadata _diskManifest;
         private DirectoryInfo _directory;
         
@@ -32,7 +33,7 @@ public PluginInformation(DirectoryInfo directoryInfo)
             SetDirectoryInfo(directoryInfo);
         }
 
-        public PluginInformation(IPackage p)
+        public PluginInformation(IPackageMetadata p)
         {
             SetPackage(p);
         }
@@ -63,7 +64,7 @@ internal void DeleteFromDisk()
             SetDirectoryInfo(_directory);
         }
 
-        public void SetPackage(IPackage package)
+        public void SetPackage(IPackageMetadata package)
         {
             _onlinePackage = package;
             if (string.IsNullOrEmpty(PluginId))
@@ -116,6 +117,7 @@ public bool ExtractPlugin(DirectoryInfo pluginDirectory)
 
             // now extract files
             // 
+#if Nuget
             foreach (var file in _onlinePackage.GetLibFiles())
             {
                 var destname = Path.Combine(subdir.FullName, file.EffectivePath);
@@ -162,6 +164,7 @@ public bool ExtractPlugin(DirectoryInfo pluginDirectory)
                 Logger.LogError(0, ex, "Error trying to create manifest file for: {packageName}", packageName);
                 return false;
             }
+#endif
             return true;
         }
 
diff --git a/XbimXplorer/PluginSystem/PluginInformationVm.cs b/XbimXplorer/PluginSystem/PluginInformationVm.cs
index 7b91da95..a3eb6faf 100644
--- a/XbimXplorer/PluginSystem/PluginInformationVm.cs
+++ b/XbimXplorer/PluginSystem/PluginInformationVm.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using NuGet;
+using NuGet.Versioning;
 using XbimXplorer.Annotations;
 
 namespace XbimXplorer.PluginSystem
@@ -25,7 +26,7 @@ public bool CanDownload
         {
             get
             {
-                if (string.IsNullOrEmpty(AvailableVersion))
+                if (AvailableVersion == null)
                     return false;
                 return AvailableVersion != InstalledVersion;
             }
@@ -40,7 +41,7 @@ public string DownloadCaption
                     return "Download";
 
                 // if can download and not installed 
-                if (string.IsNullOrWhiteSpace(InstalledVersion))
+                if (InstalledVersion == null)
                     return "Download";
 
                 // if installed
@@ -53,9 +54,9 @@ public string DownloadCaption
             }
         }
 
-        public bool IsInstalled => !string.IsNullOrWhiteSpace(InstalledVersion);
+        public bool IsInstalled => (InstalledVersion!=null);
 
-        public bool IsInstalledAndNotLoaded => !string.IsNullOrWhiteSpace(InstalledVersion) && string.IsNullOrWhiteSpace(LoadedVersion);
+        public bool IsInstalledAndNotLoaded => (InstalledVersion!=null) && string.IsNullOrWhiteSpace(LoadedVersion);
 
         public string PluginId => _model?.PluginId;
 
@@ -77,9 +78,9 @@ internal void RemoveInstallation()
             ? "Disable" 
             : "Enable";
 
-        public string AvailableVersion => _model?.AvailableVersion;
+        public NuGetVersion AvailableVersion => _model?.AvailableVersion;
 
-        public string InstalledVersion => _model?.InstalledVersion;
+        public NuGetVersion InstalledVersion => _model?.InstalledVersion;
 
         public string LoadedVersion => _model?.LoadedVersion;
 
@@ -98,7 +99,7 @@ public string Action
         {
             get
             {
-                if (LoadedVersion != "" && InstalledVersion != LoadedVersion)
+                if (LoadedVersion != "" && InstalledVersion.ToString() != LoadedVersion)
                     return "Restart required.";
                 return "";
             }
diff --git a/XbimXplorer/PluginSystem/PluginManagement.cs b/XbimXplorer/PluginSystem/PluginManagement.cs
index 733de666..25e36f45 100644
--- a/XbimXplorer/PluginSystem/PluginManagement.cs
+++ b/XbimXplorer/PluginSystem/PluginManagement.cs
@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Logging;
 using NuGet;
+using NuGet.Packaging;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -63,7 +64,7 @@ internal static DirectoryInfo GetPluginsDirectory()
 
         internal static ManifestMetadata GetManifestMetadata(DirectoryInfo path)
         {
-            var tmp = new ManifestMetadata() { Id = path.Name, Version = "<undetermined>" };
+            var tmp = new ManifestMetadata() { Id = path.Name, Version = new NuGet.Versioning.NuGetVersion("0.0.0") };
             var file = path.GetFiles("*.manifest").FirstOrDefault();
             if (file == null)
             {
@@ -88,6 +89,7 @@ internal static ManifestMetadata GetManifestMetadata(DirectoryInfo path)
 
         internal IEnumerable<PluginInformation> GetPlugins(PluginChannelOption option, string winUiNugetVersion)
         {
+#if nuge
             RefreshLocalPlugins();
             var repo = PackageRepositoryFactory.Default.CreateRepository(SelectedRepoUrl);
             var allowDevelop = option != PluginChannelOption.LatestStable;
@@ -134,6 +136,8 @@ internal IEnumerable<PluginInformation> GetPlugins(PluginChannelOption option, s
                 }
                 yield return pv;
             }
+#endif
+            return Enumerable.Empty<PluginInformation>();
         }
 
         public static string GetEntryFile(DirectoryInfo dir, string filename = null)
diff --git a/XbimXplorer/PluginSystem/PluginsConfig.xaml.cs b/XbimXplorer/PluginSystem/PluginsConfig.xaml.cs
index d8d94643..a5b08f70 100644
--- a/XbimXplorer/PluginSystem/PluginsConfig.xaml.cs
+++ b/XbimXplorer/PluginSystem/PluginsConfig.xaml.cs
@@ -6,6 +6,7 @@
 using System.Windows.Controls;
 using Microsoft.Extensions.Logging;
 using NuGet;
+using NuGet.Packaging;
 using Xbim.Presentation;
 
 namespace XbimXplorer.PluginSystem
@@ -111,11 +112,12 @@ private void PluginList_OnDrop(object sender, DragEventArgs e)
                     var fInfo = new FileInfo(fname);
                     if (fInfo.Extension != ".nupkg")
                         continue;
-                    IPackage p = new ZipPackage(fInfo.FullName);
-                    var pi = new PluginInformation(p);
-                    pi.ExtractPlugin(
-                        PluginManagement.GetPluginsDirectory()
-                        );
+                    //IPackageMetadata p = new ZipPackage(fInfo.FullName);
+                    //var pi = new PluginInformation(p);
+                    //pi.ExtractPlugin(
+                    //    PluginManagement.GetPluginsDirectory()
+                    //    );
+                    throw new NotImplementedException("NUget needs sorting");
                 }
                 catch (Exception ex)
                 {
diff --git a/XbimXplorer/Properties/Resources.Designer.cs b/XbimXplorer/Properties/Resources.Designer.cs
index d985a218..86d50d38 100644
--- a/XbimXplorer/Properties/Resources.Designer.cs
+++ b/XbimXplorer/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace XbimXplorer.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/XbimXplorer/Properties/Settings.Designer.cs b/XbimXplorer/Properties/Settings.Designer.cs
index 68bcb245..0b15a380 100644
--- a/XbimXplorer/Properties/Settings.Designer.cs
+++ b/XbimXplorer/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace XbimXplorer.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/XbimXplorer/XbimXplorer.csproj b/XbimXplorer/XbimXplorer.csproj
index 03e4a02f..131d58d3 100644
--- a/XbimXplorer/XbimXplorer.csproj
+++ b/XbimXplorer/XbimXplorer.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<LanguageTargets>$(MSBuildToolsPath)\Microsoft.CSharp.targets</LanguageTargets>
-		<TargetFrameworks>net472</TargetFrameworks>
+		<TargetFrameworks>net6.0-windows</TargetFrameworks>
 		<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
 		<OutputType>WinExe</OutputType>
 		<Title>Xbim Xplorer</Title>
@@ -11,6 +11,7 @@
       visualised both sematically and graphically, and supports a range of plugins to perform actions such as BCF exchange, and COBie export
 		</Description>
 		<ApplicationIcon />
+    <UseWPF>true</UseWPF>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472|AnyCPU'">
 		<OutputPath>..\Output\Debug\</OutputPath>
@@ -21,16 +22,18 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<!-- App.xaml -->
-		<ApplicationDefinition Include="App.xaml">
+		<!--<ApplicationDefinition Include="App.xaml">
 			<SubType>Designer</SubType>
 			<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-		</ApplicationDefinition>
+		</ApplicationDefinition>-->
+   
 		<EmbeddedResource Update="Properties\Resources.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Resources.Designer.cs" />
 		<Compile Update="Properties\Resources.Designer.cs" DesignTime="True" AutoGen="True" DependentUpon="Resources.resx" />
 		<Compile Update="Properties\Settings.Designer.cs">
 			<DesignTime>True</DesignTime>
 			<AutoGen>True</AutoGen>
 			<DependentUpon>Settings.settings</DependentUpon>
+			<DesignTimeSharedInput>True</DesignTimeSharedInput>
 		</Compile>
 		<Compile Update="Settings.Designer.cs" AutoGen="True" DependentUpon="Settings.settings" />
 		<None Update="Properties\Settings.settings">
@@ -38,8 +41,8 @@
 			<LastGenOutput>Settings.Designer.cs</LastGenOutput>
 		</None>
 		<None Update="Settings.settings" LastGenOutput="Settings.Designer.cs" Generator="SettingsSingleFileGenerator" />
-		<Page Include="**\*.xaml" SubType="Designer" Generator="MSBuild:UpdateDesignTimeXaml" Exclude="App.xaml" />
-		<Compile Update="**\*.xaml.cs" SubType="Designer" DependentUpon="%(Filename)" />
+		<!--<Page Include="**\*.xaml" SubType="Designer" Generator="MSBuild:UpdateDesignTimeXaml" Exclude="App.xaml" />
+		<Compile Update="**\*.xaml.cs" SubType="Designer" DependentUpon="%(Filename)" />-->
 		<Resource Include="assets\*.*" />
 		<Resource Include="Commands\console.bmp" />
 		<Resource Include="**\*.png" />
@@ -54,25 +57,23 @@
 		</EmbeddedResource>
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="AvalonDock" Version="2.0.2000" />
-		<PackageReference Include="DotNetZip" Version="1.13.3" />
+		<!--
+    <PackageReference Include="AvalonDock" Version="2.0.2000" />
 		<PackageReference Include="HelixToolkit.Wpf" Version="2.14.0" />
-		<PackageReference Include="Nuget.Core" Version="2.14.0" />
 		<PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
-		<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
-		<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.4" />
-		<PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
 		<PackageReference Include="Xbim.Geometry" Version="5.1.445" />
+		<PackageReference Include="Nuget.Core" Version="2.14.0" />
 		<PackageReference Include="Xbim.IO.Esent" Version="5.9.375-develop" />
-	</ItemGroup>
-	<ItemGroup>
-		<Reference Include="Microsoft.CSharp" />
-		<Reference Include="PresentationCore" />
-		<Reference Include="PresentationFramework" />
-		<Reference Include="System.Data.DataSetExtensions" />
-		<Reference Include="System.Windows.Forms" />
-		<Reference Include="System.Xaml" />
-		<Reference Include="WindowsBase" />
+    -->
+		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+		<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
+		<PackageReference Include="DotNetZip" Version="1.16.0" />
+		<PackageReference Include="Dirkster.AvalonDock" Version="4.71.1" />
+		<PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.103" />
+		<PackageReference Include="HelixToolkit.Core.Wpf" Version="2.23.0" />
+		<PackageReference Include="NuGet.Protocol" Version="6.4.0" />
+		<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Include="Xbim.IO.Esent" Version="5.9.375-develop" />
 	</ItemGroup>
 	<ItemGroup>
 		<Folder Include="Properties\" />
@@ -80,9 +81,9 @@
 	<ItemGroup>
 		<ProjectReference Include="..\Xbim.Presentation\Xbim.Presentation.csproj" />
   </ItemGroup>
-  <ItemGroup>
+  <!--<ItemGroup>
     <Page Update="Dialogs\RepresentationContextSelection.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
-	</ItemGroup>
+	</ItemGroup>-->
 </Project>
\ No newline at end of file
diff --git a/XbimXplorer/XplorerMainWindow.Plugins.xaml.cs b/XbimXplorer/XplorerMainWindow.Plugins.xaml.cs
index e4faaf13..cb8de719 100644
--- a/XbimXplorer/XplorerMainWindow.Plugins.xaml.cs
+++ b/XbimXplorer/XplorerMainWindow.Plugins.xaml.cs
@@ -12,9 +12,11 @@
 using Xbim.Presentation;
 using Xbim.Presentation.XplorerPluginSystem;
 using XbimXplorer.PluginSystem;
-using Xceed.Wpf.AvalonDock.Layout;
+
 using Image = System.Windows.Controls.Image;
 using Microsoft.Extensions.Logging;
+using AvalonDock.Layout;
+using NuGet.Packaging;
 
 namespace XbimXplorer
 {
@@ -526,7 +528,7 @@ public string GetAssemblyLocation(Assembly requestingAssembly)
         public string GetLoadedVersion(string pluginId)
         {
             return _loadedPlugins.ContainsKey(pluginId) 
-                ? _loadedPlugins[pluginId].Version 
+                ? _loadedPlugins[pluginId].Version.ToString()
                 : null;
         }
     }
diff --git a/XbimXplorer/XplorerMainWindow.xaml b/XbimXplorer/XplorerMainWindow.xaml
index 2bd4a9ea..1ab72682 100644
--- a/XbimXplorer/XplorerMainWindow.xaml
+++ b/XbimXplorer/XplorerMainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:local="clr-namespace:XbimXplorer"
         xmlns:diag="clr-namespace:System.Diagnostics;assembly=WindowsBase"
         xmlns:etb="clr-namespace:XbimXplorer.EditableTextBlock"
-    xmlns:avalonDock="http://schemas.xceed.com/wpf/xaml/avalondock"
+        xmlns:avalonDock="https://github.com/Dirkster99/AvalonDock"
     xmlns:viewModels="clr-namespace:Xbim.Ifc.ViewModels;assembly=Xbim.Ifc"
     Title="Xbim Xplorer" Height="600" Width="800" 
     x:Name="MainWindow"
diff --git a/XbimXplorer/XplorerMainWindow.xaml.cs b/XbimXplorer/XplorerMainWindow.xaml.cs
index 97389b7f..660ee034 100644
--- a/XbimXplorer/XplorerMainWindow.xaml.cs
+++ b/XbimXplorer/XplorerMainWindow.xaml.cs
@@ -48,8 +48,10 @@
 using Xbim.Geometry.Engine.Interop;
 using System.Windows.Media;
 
+
 #endregion
 
+
 namespace XbimXplorer
 {
     /// <summary>
@@ -57,6 +59,7 @@ namespace XbimXplorer
     /// </summary>
     public partial class XplorerMainWindow : IXbimXplorerPluginMasterWindow, INotifyPropertyChanged
     {
+
         private BackgroundWorker _loadFileBackgroundWorker;
         /// <summary>
         /// Used for the creation of a new federation file
@@ -247,21 +250,24 @@ void XplorerMainWindow_Closing(object sender, CancelEventArgs e)
 
         void XplorerMainWindow_Loaded(object sender, RoutedEventArgs e)
         {
-            var model = IfcStore.Create(null, XbimSchemaVersion.Ifc2X3, XbimStoreType.InMemoryModel);
-            ModelProvider.ObjectInstance = model;
-            ModelProvider.Refresh();
 
-            
+            // TODO: re-enable after sorting timing/sequencing issue - with DrawingCtrl.OnApplyTemplate()
+            //var model = IfcStore.Create(null, XbimSchemaVersion.Ifc2X3, XbimStoreType.InMemoryModel);
+            //ModelProvider.ObjectInstance = model;
+            //ModelProvider.Refresh();
+
+
 
             TestCRedist();
         }
 
         private void TestCRedist()
         {
-            if (Xbim.ModelGeometry.XbimEnvironment.RedistInstalled())
-                return;
-            Logger.LogError("Requisite C++ environment missing, download and install from {VCPath}", 
-                Xbim.ModelGeometry.XbimEnvironment.RedistDownloadPath());
+            // TODO: Fixup
+            //if (Xbim.ModelGeometry.XbimEnvironment.RedistInstalled())
+            //    return;
+            //Logger.LogError("Requisite C++ environment missing, download and install from {VCPath}", 
+            //    Xbim.ModelGeometry.XbimEnvironment.RedistDownloadPath());
         }
 
         private void XplorerMainWindow_Closed(object sender, EventArgs e)
diff --git a/XbimXplorer/app.config b/XbimXplorer/app.config
index ec00cf6f..0222aa28 100644
--- a/XbimXplorer/app.config
+++ b/XbimXplorer/app.config
@@ -13,7 +13,7 @@
     <!--<add key="XbimTempDirectory" value="c:\XbimTemp"></add>-->
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
-  <system.web>
+  <!--<system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
       <providers>
         <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
@@ -24,7 +24,7 @@
         <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
       </providers>
     </roleManager>
-  </system.web>
+  </system.web>-->
   <userSettings>
     <XbimXplorer.Properties.Settings>
       <setting name="FileAccessMode" serializeAs="String">
diff --git a/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj b/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
index 1c753d33..debacf29 100644
--- a/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
+++ b/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputType>WinExe</OutputType>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
diff --git a/nuget.config b/nuget.config
index 7e6bf687..0b2020f5 100644
--- a/nuget.config
+++ b/nuget.config
@@ -3,5 +3,6 @@
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <add key="xbim_develop" value="https://www.myget.org/F/xbim-develop/api/v3/index.json" protocolVersion="3"/>
     <add key="xbim_master" value="https://www.myget.org/F/xbim-master/api/v3/index.json" protocolVersion="3"/>
+    <add key="xbim" value="https://pkgs.dev.azure.com/xBIMTeam/_packaging/xbim/nuget/v3/index.json" />
   </packageSources>
 </configuration>
\ No newline at end of file

From 8e1e8d9267acf6429269ce98496efbcd00df7600 Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Mon, 2 Jan 2023 17:40:46 +0000
Subject: [PATCH 03/18] Integrated Essentials fix to allow 4x3 geometry to be
 created

---
 Xbim.Presentation/Xbim.Presentation.csproj |  1 +
 XbimXplorer/Dialogs/AboutWindow.xaml.cs    | 23 ++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index a4baca53..fe5aedfd 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -45,6 +45,7 @@
     <PackageReference Include="HelixToolkit.Core.Wpf" Version="2.23.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
     <PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
+    <PackageReference Include="Xbim.Essentials" Version="5.9.376-develop" />
     <PackageReference Include="Xbim.Geometry" Version="6.1.542-netcore" />
   </ItemGroup>
   
diff --git a/XbimXplorer/Dialogs/AboutWindow.xaml.cs b/XbimXplorer/Dialogs/AboutWindow.xaml.cs
index 37ca08bc..8b2b2a66 100644
--- a/XbimXplorer/Dialogs/AboutWindow.xaml.cs
+++ b/XbimXplorer/Dialogs/AboutWindow.xaml.cs
@@ -9,11 +9,8 @@
 using System.Windows.Navigation;
 using Xbim.Common;
 using Xbim.Ifc;
-using Xbim.Ifc4.GeometricModelResource;
-using Xbim.Ifc4.GeometryResource;
-using Xbim.Ifc4.Kernel;
-using Xbim.Ifc4.UtilityResource;
-using Xbim.Presentation.Extensions;
+using Xbim.Ifc4.Interfaces;
+
 
 
 namespace XbimXplorer.Dialogs
@@ -125,19 +122,19 @@ public string ModelInfo
                     }
                     sb.AppendLine();
                     sb.AppendLine("Model information:");
-                    var ohs = Model.Instances.OfType<IfcOwnerHistory>().FirstOrDefault();
+                    var ohs = Model.Instances.OfType<IIfcOwnerHistory>().FirstOrDefault();
                     sb.AppendFormat("Entities count: {0}\r\n", Model.Instances.Count);
                     sb.AppendFormat("Schema: {0}\r\n", Model.Header.FileSchema.Schemas.FirstOrDefault());
                     sb.AppendFormat("Description: {0}\r\n", Model.Header.FileDescription.Description.FirstOrDefault());
                     sb.AppendFormat("ImplementationLevel: {0}\r\n", Model.Header.FileDescription.ImplementationLevel);
-                    sb.AppendFormat("IfcProduct count: {0}\r\n", Model.Instances.CountOf<IfcProduct>());
-                    sb.AppendFormat("IfcSolidModel count: {0}\r\n", Model.Instances.CountOf<IfcSolidModel>());
-                    sb.AppendFormat("IfcMappedItem count: {0}\r\n", Model.Instances.CountOf<IfcMappedItem>());
-                    sb.AppendFormat("IfcBooleanResult count: {0}\r\n", Model.Instances.CountOf<IfcBooleanResult>());
+                    sb.AppendFormat("IfcProduct count: {0}\r\n", Model.Instances.CountOf<IIfcProduct>());
+                    sb.AppendFormat("IfcSolidModel count: {0}\r\n", Model.Instances.CountOf<IIfcSolidModel>());
+                    sb.AppendFormat("IfcMappedItem count: {0}\r\n", Model.Instances.CountOf<IIfcMappedItem>());
+                    sb.AppendFormat("IfcBooleanResult count: {0}\r\n", Model.Instances.CountOf<IIfcBooleanResult>());
                     sb.AppendFormat("BReps count: {0}\r\n", 
-                        Model.Instances.CountOf<IfcFaceBasedSurfaceModel>() + 
-                        Model.Instances.CountOf<IfcShellBasedSurfaceModel>() + 
-                        Model.Instances.CountOf<IfcManifoldSolidBrep>() 
+                        Model.Instances.CountOf<IIfcFaceBasedSurfaceModel>() + 
+                        Model.Instances.CountOf<IIfcShellBasedSurfaceModel>() + 
+                        Model.Instances.CountOf<IIfcManifoldSolidBrep>() 
                         );
                     sb.AppendFormat("Application: {0}\r\n",
                             ohs != null 

From b72b46fb3cde3eb3fd1d8cd1b6728db228cf865b Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Mon, 2 Jan 2023 18:34:38 +0000
Subject: [PATCH 04/18] Fixed up Tests, Winforms and Plugin projects Tidy up of
 projects

---
 Directory.Build.props                         |  4 +-
 Tests/Tests.csproj                            | 15 ++----
 Xbim.Presentation/Properties/AssemblyInfo.cs  |  2 +-
 .../Properties/Resources.Designer.cs          | 38 +++++++-------
 .../Properties/Resources.de.Designer.cs       |  1 -
 Xbim.Presentation/Xbim.Presentation.csproj    | 27 +++-------
 Xbim.WindowsUI.sln                            |  3 ++
 .../Properties/AssemblyInfo.cs                | 18 -------
 .../Xbim.WinformsSample.csproj                | 51 ++-----------------
 XbimXplorer/Properties/Settings.Designer.cs   |  2 +-
 XbimXplorer/XbimXplorer.csproj                | 40 +++------------
 XbimXplorer/app.config                        | 43 ----------------
 XplorerPlugin.Bcf/Properties/AssemblyInfo.cs  | 12 -----
 XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj    | 49 ++----------------
 14 files changed, 54 insertions(+), 251 deletions(-)
 delete mode 100644 Xbim.Presentation/Properties/Resources.de.Designer.cs

diff --git a/Directory.Build.props b/Directory.Build.props
index ae332a6d..9ede1f7f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -8,7 +8,7 @@
   </PropertyGroup>
   
   <PropertyGroup>
-    <Version>5.1.0.0</Version>
+    <Version>6.0.0.0</Version>
     <Copyright>Copyright © XBIM Ltd</Copyright>
     <Company>Xbim Ltd.</Company>
     <Authors>Steve Lockley, Martin Cerny and XBIMTeam Contributors</Authors>
@@ -17,7 +17,7 @@
     <PackageProjectUrl>https://github.com/xBimTeam/XbimWindowsUI</PackageProjectUrl>
     <PackageIconUrl>https://avatars1.githubusercontent.com/u/2284875?v=3&amp;amp;s=240</PackageIconUrl>
     <PackageReleaseNotes>
-      Now built on XBIM v5. Migrated from log4net to Microsoft.Extensions.Logging.
+      Now built on XBIM v6 to support netCore and IFC4x3
     </PackageReleaseNotes>
     <PackageTags>BIM, IFC, IfcXml, IfcZip, Ifc4, COBie, BuildingSmart</PackageTags>
     <RepositoryUrl>https://github.com/xBimTeam/XbimWindowsUI/tree/master</RepositoryUrl>
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index d34bd149..77f5bad2 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <Title>Xbim Presentation Tests</Title>
     <Description>Unit Tests for Xbim.Presentation</Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xaml" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xbim.Presentation\Xbim.Presentation.csproj" />
diff --git a/Xbim.Presentation/Properties/AssemblyInfo.cs b/Xbim.Presentation/Properties/AssemblyInfo.cs
index 43da8927..39cd09e7 100644
--- a/Xbim.Presentation/Properties/AssemblyInfo.cs
+++ b/Xbim.Presentation/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 [assembly: Guid("603a1283-949b-4733-bb77-0c622e46346d")]
 
 [assembly: XmlnsDefinition("http://schemas.Xbim.com/Presentation", "Xbim.Presentation")]
-[assembly: InternalsVisibleTo("Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010029a3c6da60efcb3ebe48c3ce14a169b5fa08ffbf5f276392ffb2006a9a2d596f5929cf0e68568d14ac7cbe334440ca0b182be7fa6896d2a73036f24bca081b2427a8dec5689a97f3d62547acd5d471ee9f379540f338bbb0ae6a165b44b1ae34405624baa4388404bce6d3e30de128cec379147af363ce9c5845f4f92d405ed0")]
+[assembly: InternalsVisibleTo("Tests")]
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None,
diff --git a/Xbim.Presentation/Properties/Resources.Designer.cs b/Xbim.Presentation/Properties/Resources.Designer.cs
index 28ab42aa..6bf1d9fb 100644
--- a/Xbim.Presentation/Properties/Resources.Designer.cs
+++ b/Xbim.Presentation/Properties/Resources.Designer.cs
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-//     der Code erneut generiert wird.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -13,13 +13,13 @@ namespace Xbim.Presentation.Properties {
     
     
     /// <summary>
-    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
-    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
-    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Resources {
@@ -33,7 +33,7 @@ internal Resources() {
         }
         
         /// <summary>
-        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         public static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ internal Resources() {
         }
         
         /// <summary>
-        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
-        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         public static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ internal Resources() {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die Materials ähnelt.
+        ///   Looks up a localized string similar to Materials.
         /// </summary>
         public static string Materials {
             get {
@@ -70,7 +70,7 @@ public static string Materials {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die Object ähnelt.
+        ///   Looks up a localized string similar to Object.
         /// </summary>
         public static string Object {
             get {
@@ -79,7 +79,7 @@ public static string Object {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die Properties ähnelt.
+        ///   Looks up a localized string similar to Properties.
         /// </summary>
         public static string Properties {
             get {
@@ -88,7 +88,7 @@ public static string Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die Quantities ähnelt.
+        ///   Looks up a localized string similar to Quantities.
         /// </summary>
         public static string Quantities {
             get {
@@ -97,7 +97,7 @@ public static string Quantities {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die Type ähnelt.
+        ///   Looks up a localized string similar to Type.
         /// </summary>
         public static string Type {
             get {
@@ -106,7 +106,7 @@ public static string Type {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die Verbose ähnelt.
+        ///   Looks up a localized string similar to Verbose.
         /// </summary>
         public static string Verbose {
             get {
diff --git a/Xbim.Presentation/Properties/Resources.de.Designer.cs b/Xbim.Presentation/Properties/Resources.de.Designer.cs
deleted file mode 100644
index 5f282702..00000000
--- a/Xbim.Presentation/Properties/Resources.de.Designer.cs
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index fe5aedfd..fb895481 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <LanguageTargets>$(MSBuildToolsPath)\Microsoft.CSharp.targets</LanguageTargets>
     <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <Title>Xbim.Presentation</Title>
     <Description>Xbim.WindowsUI is a library containing a set of Windows Forms and WPF controls that can be used to build Windows Xaml 
@@ -14,31 +13,17 @@
     <PackageIcon>XbimIcon.png</PackageIcon>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-windows|AnyCPU'">
     <OutputPath>..\Output\Debug\</OutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net472|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0-windows|AnyCPU'">
     <OutputPath>..\Output\Release</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Update="Properties\Resources.de.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.de.resx</DependentUpon>
-    </Compile>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Update="Settings.Designer.cs" AutoGen="True" DependentUpon="Settings.settings" />
-    <None Update="Settings.settings" LastGenOutput="Settings.Designer.cs" Generator="SettingsSingleFileGenerator" />
     <None Include="..\XbimIcon.png">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
     </None>
-    <!--<Page Include="**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" Exclude="App.xaml" />
-    <Compile Update="**\*.xaml.cs" SubType="Designer" DependentUpon="%(Filename)" />-->
     <Resource Include="assets\*.*" />
   </ItemGroup>
   <ItemGroup>
@@ -48,15 +33,19 @@
     <PackageReference Include="Xbim.Essentials" Version="5.9.376-develop" />
     <PackageReference Include="Xbim.Geometry" Version="6.1.542-netcore" />
   </ItemGroup>
-  
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.de.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.de.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Xbim.WindowsUI.sln b/Xbim.WindowsUI.sln
index 3f7231dd..c9655cb1 100644
--- a/Xbim.WindowsUI.sln
+++ b/Xbim.WindowsUI.sln
@@ -42,12 +42,15 @@ Global
 		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Release|Any CPU.Build.0 = Release|Any CPU
 		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Release|Any CPU.Build.0 = Release|Any CPU
 		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
diff --git a/Xbim.WinformsSample/Properties/AssemblyInfo.cs b/Xbim.WinformsSample/Properties/AssemblyInfo.cs
index bb215c68..5f831b55 100644
--- a/Xbim.WinformsSample/Properties/AssemblyInfo.cs
+++ b/Xbim.WinformsSample/Properties/AssemblyInfo.cs
@@ -5,13 +5,7 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("WinformsSample")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WinformsSample")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
@@ -22,15 +16,3 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("55A780CE-22A2-434A-BA2D-A368CBEFD959")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Xbim.WinformsSample/Xbim.WinformsSample.csproj b/Xbim.WinformsSample/Xbim.WinformsSample.csproj
index 4849be24..2f35efc7 100644
--- a/Xbim.WinformsSample/Xbim.WinformsSample.csproj
+++ b/Xbim.WinformsSample/Xbim.WinformsSample.csproj
@@ -2,56 +2,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<LanguageTargets>$(MSBuildToolsPath)\Microsoft.CSharp.targets</LanguageTargets>
-		<TargetFrameworks>net48</TargetFrameworks>
+		<TargetFrameworks>net6.0-windows7.0</TargetFrameworks>
 		<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
 		<OutputType>WinExe</OutputType>	
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <UseWindowsForms>true</UseWindowsForms>
+    <UseWPF>true</UseWPF>
 	</PropertyGroup>
-	<ItemGroup>
-		<Page Include="**\*.xaml" SubType="Designer" Generator="MSBuild:UpdateDesignTimeXaml" Exclude="App.xaml" />
-		<Compile Update="**\*.xaml.cs" SubType="Designer" DependentUpon="%(Filename)" />
-	</ItemGroup>
-	<ItemGroup>
-		<Reference Include="PresentationCore" />
-		<Reference Include="PresentationFramework" />
-		<Reference Include="System.Configuration" />
-		<Reference Include="System.Data.OracleClient" />
-		<Reference Include="System.Net" />
-		<Reference Include="System.ServiceProcess" />
-		<Reference Include="System.Transactions" />
-		<Reference Include="System.Windows.Forms" />
-		<Reference Include="System.Xaml" />
-		<Reference Include="UIAutomationProvider" />
-		<Reference Include="WindowsBase" />
-		<Reference Include="WindowsFormsIntegration" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="HelixToolkit" Version="2.14.0" />
-		<PackageReference Include="HelixToolkit.Wpf" Version="2.14.0" />
-		<PackageReference Include="ManagedEsent" Version="1.9.4" />
-		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.1" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
-		<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
-		<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.1" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-		<PackageReference Include="System.Buffers" Version="4.5.1" />
-		<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
-		<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-		<PackageReference Include="System.Memory" Version="4.5.4" />
-		<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
-		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
-		<PackageReference Include="System.Security.AccessControl" Version="4.5.0" />
-		<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
-		<PackageReference Include="System.Security.Principal.Windows" Version="4.5.1" />
-		<PackageReference Include="System.Threading.Tasks" Version="4.3.0" />		
-		<PackageReference Include="Xbim.Geometry" Version="5.1.445" />
-		<PackageReference Include="Xbim.IO.Esent" Version="5.9.375-develop" />
-	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Xbim.Presentation\Xbim.Presentation.csproj" />
 	</ItemGroup>
diff --git a/XbimXplorer/Properties/Settings.Designer.cs b/XbimXplorer/Properties/Settings.Designer.cs
index 0b15a380..a672b604 100644
--- a/XbimXplorer/Properties/Settings.Designer.cs
+++ b/XbimXplorer/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace XbimXplorer.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/XbimXplorer/XbimXplorer.csproj b/XbimXplorer/XbimXplorer.csproj
index 131d58d3..398d6e9f 100644
--- a/XbimXplorer/XbimXplorer.csproj
+++ b/XbimXplorer/XbimXplorer.csproj
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<LanguageTargets>$(MSBuildToolsPath)\Microsoft.CSharp.targets</LanguageTargets>
 		<TargetFrameworks>net6.0-windows</TargetFrameworks>
 		<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
 		<OutputType>WinExe</OutputType>
@@ -13,20 +12,13 @@
 		<ApplicationIcon />
     <UseWPF>true</UseWPF>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472|AnyCPU'">
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-windows|AnyCPU'">
 		<OutputPath>..\Output\Debug\</OutputPath>
-		<PlatformTarget>x86</PlatformTarget>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net472|AnyCPU'">
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0-windows|AnyCPU'">
 		<OutputPath>..\Output\Release</OutputPath>
 	</PropertyGroup>
 	<ItemGroup>
-		<!-- App.xaml -->
-		<!--<ApplicationDefinition Include="App.xaml">
-			<SubType>Designer</SubType>
-			<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-		</ApplicationDefinition>-->
-   
 		<EmbeddedResource Update="Properties\Resources.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Resources.Designer.cs" />
 		<Compile Update="Properties\Resources.Designer.cs" DesignTime="True" AutoGen="True" DependentUpon="Resources.resx" />
 		<Compile Update="Properties\Settings.Designer.cs">
@@ -40,9 +32,7 @@
 			<Generator>SettingsSingleFileGenerator</Generator>
 			<LastGenOutput>Settings.Designer.cs</LastGenOutput>
 		</None>
-		<None Update="Settings.settings" LastGenOutput="Settings.Designer.cs" Generator="SettingsSingleFileGenerator" />
-		<!--<Page Include="**\*.xaml" SubType="Designer" Generator="MSBuild:UpdateDesignTimeXaml" Exclude="App.xaml" />
-		<Compile Update="**\*.xaml.cs" SubType="Designer" DependentUpon="%(Filename)" />-->
+		
 		<Resource Include="assets\*.*" />
 		<Resource Include="Commands\console.bmp" />
 		<Resource Include="**\*.png" />
@@ -57,33 +47,17 @@
 		</EmbeddedResource>
 	</ItemGroup>
 	<ItemGroup>
-		<!--
-    <PackageReference Include="AvalonDock" Version="2.0.2000" />
-		<PackageReference Include="HelixToolkit.Wpf" Version="2.14.0" />
-		<PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
-		<PackageReference Include="Xbim.Geometry" Version="5.1.445" />
-		<PackageReference Include="Nuget.Core" Version="2.14.0" />
-		<PackageReference Include="Xbim.IO.Esent" Version="5.9.375-develop" />
-    -->
-		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-		<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
 		<PackageReference Include="DotNetZip" Version="1.16.0" />
 		<PackageReference Include="Dirkster.AvalonDock" Version="4.71.1" />
-		<PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.103" />
 		<PackageReference Include="HelixToolkit.Core.Wpf" Version="2.23.0" />
 		<PackageReference Include="NuGet.Protocol" Version="6.4.0" />
+		<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Xbim.IO.Esent" Version="5.9.375-develop" />
-	</ItemGroup>
-	<ItemGroup>
-		<Folder Include="Properties\" />
+		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="Xbim.IO.Esent" Version="5.9.376-develop" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Xbim.Presentation\Xbim.Presentation.csproj" />
   </ItemGroup>
-  <!--<ItemGroup>
-    <Page Update="Dialogs\RepresentationContextSelection.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-	</ItemGroup>-->
+ 
 </Project>
\ No newline at end of file
diff --git a/XbimXplorer/app.config b/XbimXplorer/app.config
index 0222aa28..1af641ab 100644
--- a/XbimXplorer/app.config
+++ b/XbimXplorer/app.config
@@ -9,27 +9,9 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
   </startup>
   <appSettings>
-    <!--Uncomment the following line to set the directory Xbim should use for temporary files, specify a full path name -->
-    <!--<add key="XbimTempDirectory" value="c:\XbimTemp"></add>-->
-    <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
-  <!--<system.web>
-    <membership defaultProvider="ClientAuthenticationMembershipProvider">
-      <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
-      </providers>
-    </membership>
-    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
-      <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
-      </providers>
-    </roleManager>
-  </system.web>-->
   <userSettings>
     <XbimXplorer.Properties.Settings>
-      <setting name="FileAccessMode" serializeAs="String">
-        <value>Read</value>
-      </setting>
       <setting name="MRUFilesCount" serializeAs="String">
         <value>4</value>
       </setting>
@@ -42,31 +24,6 @@
       <setting name="SettingsUpdateRequired" serializeAs="String">
         <value>True</value>
       </setting>
-      <setting name="LoggingLevel" serializeAs="String">
-        <value>Debug</value>
-      </setting>
     </XbimXplorer.Properties.Settings>
   </userSettings>
-  <runtime>
-
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-
-      <dependentAssembly>
-
-        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-
-        <bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
-
-      </dependentAssembly>
-
-      <dependentAssembly>
-
-        <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
-
-        <bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
-
-      </dependentAssembly>
-
-    </assemblyBinding>
-  </runtime>
 </configuration>
diff --git a/XplorerPlugin.Bcf/Properties/AssemblyInfo.cs b/XplorerPlugin.Bcf/Properties/AssemblyInfo.cs
index f92215a9..e87d05a4 100644
--- a/XplorerPlugin.Bcf/Properties/AssemblyInfo.cs
+++ b/XplorerPlugin.Bcf/Properties/AssemblyInfo.cs
@@ -7,7 +7,6 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("xBIM BCF Plugin")]
 [assembly: AssemblyDescription("")]
 
 
@@ -16,16 +15,6 @@
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
     //(used if a resource is not found in the page, 
@@ -35,4 +24,3 @@
     // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyFileVersion("5.0.1811.26661")]
\ No newline at end of file
diff --git a/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj b/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
index debacf29..570f24c4 100644
--- a/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
+++ b/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -17,57 +17,18 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+    <Title>xBIM BCF Plugin</Title>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data.OracleClient" />
-    <Reference Include="System.Net" />
-    <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Transactions" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
     <AppDesigner Include="Properties\" />
-    <None Update="xsd\markup.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Update="xsd\VisualizationInfo.xsd">
-      <SubType>Designer</SubType>
-    </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Xbim.Presentation\Xbim.Presentation.csproj" />
+    <PackageReference Include="DotNetZip" Version="1.16.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DotNetZip" Version="1.13.3" />
-    <PackageReference Include="HelixToolkit" Version="2.14.0" />
-    <PackageReference Include="HelixToolkit.Wpf" Version="2.14.0" />
-    <PackageReference Include="ManagedEsent" Version="1.9.4" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.1" />
-    <PackageReference Include="System.Buffers" Version="4.5.1" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-    <PackageReference Include="System.Memory" Version="4.5.4" />
-    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
-    <PackageReference Include="System.Security.AccessControl" Version="4.5.0" />
-    <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="4.5.1" />
-    <PackageReference Include="System.Threading.Tasks" Version="4.3.0" />
-    <PackageReference Include="Xbim.Geometry" Version="5.1.445" />    
+    <ProjectReference Include="..\Xbim.Presentation\Xbim.Presentation.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From 024213f341229523a1c24f6f56fc2a201466fd42 Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Tue, 3 Jan 2023 11:54:43 +0000
Subject: [PATCH 05/18] Added x86 as a target to support use on ARM64 until we
 get native support in GE Tweaked About & assemblies tabs to make clearer
 what's loaded

---
 Tests/Tests.csproj                            |  1 +
 Xbim.Presentation/Xbim.Presentation.csproj    |  7 +---
 Xbim.WindowsUI.sln                            | 25 +++++++++--
 .../Xbim.WinformsSample.csproj                |  1 +
 XbimXplorer/Dialogs/AboutWindow.xaml          |  4 +-
 XbimXplorer/Dialogs/AboutWindow.xaml.cs       | 26 +++++++++++-
 XbimXplorer/Dialogs/AssemblyInformation.cs    | 41 +++++++++++++++----
 XbimXplorer/XbimXplorer.csproj                |  8 ++++
 XbimXplorer/XplorerMainWindow.xaml.cs         |  2 +
 XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj    |  1 +
 10 files changed, 97 insertions(+), 19 deletions(-)

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 77f5bad2..b8ed1290 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <Title>Xbim Presentation Tests</Title>
     <Description>Unit Tests for Xbim.Presentation</Description>
+    <Platforms>AnyCPU;x86</Platforms>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index fb895481..eaadbdf5 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -12,12 +12,7 @@
     <Version>6.0.0.0-develop</Version>
     <PackageIcon>XbimIcon.png</PackageIcon>
     <UseWPF>true</UseWPF>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-windows|AnyCPU'">
-    <OutputPath>..\Output\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0-windows|AnyCPU'">
-    <OutputPath>..\Output\Release</OutputPath>
+    <Platforms>AnyCPU;x86</Platforms>
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\XbimIcon.png">
diff --git a/Xbim.WindowsUI.sln b/Xbim.WindowsUI.sln
index c9655cb1..da4b1439 100644
--- a/Xbim.WindowsUI.sln
+++ b/Xbim.WindowsUI.sln
@@ -30,29 +30,48 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{89F98E53-DE4E-4427-8244-D5934AD08849}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{89F98E53-DE4E-4427-8244-D5934AD08849}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89F98E53-DE4E-4427-8244-D5934AD08849}.Debug|x86.ActiveCfg = Debug|x86
+		{89F98E53-DE4E-4427-8244-D5934AD08849}.Debug|x86.Build.0 = Debug|x86
 		{89F98E53-DE4E-4427-8244-D5934AD08849}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{89F98E53-DE4E-4427-8244-D5934AD08849}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89F98E53-DE4E-4427-8244-D5934AD08849}.Release|x86.ActiveCfg = Release|x86
+		{89F98E53-DE4E-4427-8244-D5934AD08849}.Release|x86.Build.0 = Release|x86
 		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Debug|x86.ActiveCfg = Debug|x86
+		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Debug|x86.Build.0 = Debug|x86
 		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Release|x86.ActiveCfg = Release|x86
+		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Release|x86.Build.0 = Release|x86
 		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Debug|x86.ActiveCfg = Debug|x86
+		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Debug|x86.Build.0 = Debug|x86
 		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Release|x86.ActiveCfg = Release|x86
+		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Release|x86.Build.0 = Release|x86
 		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Debug|x86.ActiveCfg = Debug|x86
+		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Debug|x86.Build.0 = Debug|x86
 		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Release|x86.ActiveCfg = Release|x86
+		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Release|x86.Build.0 = Release|x86
 		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Debug|x86.ActiveCfg = Debug|x86
+		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Debug|x86.Build.0 = Debug|x86
 		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Release|x86.ActiveCfg = Release|x86
+		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Xbim.WinformsSample/Xbim.WinformsSample.csproj b/Xbim.WinformsSample/Xbim.WinformsSample.csproj
index 2f35efc7..b3db5a69 100644
--- a/Xbim.WinformsSample/Xbim.WinformsSample.csproj
+++ b/Xbim.WinformsSample/Xbim.WinformsSample.csproj
@@ -8,6 +8,7 @@
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
+    <Platforms>AnyCPU;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Xbim.Presentation\Xbim.Presentation.csproj" />
diff --git a/XbimXplorer/Dialogs/AboutWindow.xaml b/XbimXplorer/Dialogs/AboutWindow.xaml
index dd2be010..35fcbb12 100644
--- a/XbimXplorer/Dialogs/AboutWindow.xaml
+++ b/XbimXplorer/Dialogs/AboutWindow.xaml
@@ -26,6 +26,8 @@
                         </TextBlock>
                         <TextBlock TextWrapping="Wrap" Margin="0,3" Text="{Binding AppVersion}" />
                         <TextBlock TextWrapping="Wrap" Margin="0,3" Text="{Binding FileVersion}" />
+                        <TextBlock TextWrapping="Wrap" Margin="0,3" Text="{Binding ProcessorArchitecture}" />
+                        <TextBlock TextWrapping="Wrap" Margin="0,3" Text="{Binding RuntimeArchitecture}" />
                         <TextBlock Margin="0,3" >
                             <Hyperlink RequestNavigate="Link_RequestNavigate" NavigateUri="https://github.com/xbimteam">
 					            <TextBlock Text="https://github.com/xbimteam"/>
@@ -34,7 +36,7 @@
                     </StackPanel>
                 </TabItem>
                 <TabItem Header="Assemblies"  GotFocus="LoadAssemblies" >
-                    <TextBox x:Name="AssembliesText" VerticalScrollBarVisibility="Auto" Margin="10" Text="" />
+                    <TextBox x:Name="AssembliesText" VerticalScrollBarVisibility="Auto" Margin="10" Text="" FontFamily="Consolas" FontSize="10" />
                 </TabItem>
                 <TabItem Header="Model">
                     <TextBox VerticalScrollBarVisibility="Auto" Margin="10" Text="{Binding ModelInfo, Mode=OneWay}" />
diff --git a/XbimXplorer/Dialogs/AboutWindow.xaml.cs b/XbimXplorer/Dialogs/AboutWindow.xaml.cs
index 8b2b2a66..8093fad3 100644
--- a/XbimXplorer/Dialogs/AboutWindow.xaml.cs
+++ b/XbimXplorer/Dialogs/AboutWindow.xaml.cs
@@ -64,12 +64,34 @@ public string FileVersion
             }
         }
 
+        /// <summary>
+        /// The Process architecture we're running under. E.g. x86, x64, Arm64
+        /// </summary>
+        public string ProcessorArchitecture
+        {
+            get
+            {
+                return string.Format("Process: {0}", System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture);
+            }
+        }
+
+        /// <summary>
+        /// The .NET runtime architecture we're running under
+        /// </summary>
+        public string RuntimeArchitecture
+        {
+            get
+            {
+                return string.Format(".NET Runtime: {1} ({0})", typeof(string).Assembly.GetName().ProcessorArchitecture, System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription);
+            }
+        }
+
         public string AssembliesInfo
         {
             get
             {
                 var sb = new StringBuilder();
-                sb.AppendFormat("Name\tAssembly version\tFile version:\r\n");
+                sb.AppendFormat($"{"Name",-32}{"Assembly version",16}{"File version",16}\r\n");
                 var baseAssembly = Assembly.GetEntryAssembly();
                 DocumentAssembly(baseAssembly, sb);
                 
@@ -103,7 +125,7 @@ private void DocumentSingleAssembly(Assembly a, StringBuilder sb)
             var xa = new XbimAssemblyInfo(a);
             if (string.IsNullOrEmpty(a.Location))
                 xa.OverrideLocation = MainWindow.GetAssemblyLocation(a);
-            var assemblyDescription = $"{a.GetName().Name}\t{xa.AssemblyVersion}\t{xa.FileVersion}\r\n";
+            var assemblyDescription = $"{a.GetName().Name,-32}{xa.AssemblyVersion,16}{xa.FileVersion,16}{a.GetName().ProcessorArchitecture,6}\r\n";
             sb.Append(assemblyDescription);
         }
 
diff --git a/XbimXplorer/Dialogs/AssemblyInformation.cs b/XbimXplorer/Dialogs/AssemblyInformation.cs
index a5ba6006..563323eb 100644
--- a/XbimXplorer/Dialogs/AssemblyInformation.cs
+++ b/XbimXplorer/Dialogs/AssemblyInformation.cs
@@ -2,9 +2,12 @@
 //
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Text;
+using XbimXplorer.PluginSystem;
 
 namespace XbimXplorer.Dialogs
 {
@@ -54,7 +57,7 @@ public static Dictionary<string, Assembly> MyGetReferencedAssembliesRecursive(th
             _dependentAssemblyList = new Dictionary<string, Assembly>();
             _missingAssemblyList = new List<MissingAssembly>();
 
-            InternalGetDependentAssembliesRecursive(assembly);
+            InternalGetDependentAssemblies(assembly);
 
             //// Only include assemblies that we wrote ourselves (ignore ones from GAC).
             //var keysToRemove = _dependentAssemblyList.Values.Where(
@@ -75,22 +78,43 @@ public static List<MissingAssembly> MyGetMissingAssembliesRecursive(this Assembl
         {
             _dependentAssemblyList = new Dictionary<string, Assembly>();
             _missingAssemblyList = new List<MissingAssembly>();
-            InternalGetDependentAssembliesRecursive(assembly);
+            InternalGetDependentAssemblies(assembly);
 
             return _missingAssemblyList;
         }
 
+
+        private static void InternalGetDependentAssemblies(Assembly assembly)
+        {
+            var appDir = Path.GetDirectoryName(assembly.Location);
+            var pluginDir = PluginManagement.GetPluginsDirectory().FullName;
+            string[] runtimeAssemblies = Directory.GetFiles(RuntimeEnvironment.GetRuntimeDirectory(), "*.dll");
+            string[] appAssemblies = Directory.GetFiles(appDir, "*.dll");
+            //string[] plugins = Directory.GetFiles(pluginDir, "*.dll");
+            // Create the list of assembly paths consisting of runtime assemblies and the input file.
+            var paths = new List<string>(appAssemblies.Concat(runtimeAssemblies));
+
+            var resolver = new PathAssemblyResolver(paths);
+
+            // a netcore replacement for Assembly.ReflectionOnlyLoad
+            using (var mlc = new MetadataLoadContext(resolver))
+            {
+                InternalGetDependentAssembliesRecursive(assembly, mlc);
+            }
+        }
         /// <summary>
         ///     Intent: Internal recursive class to get all dependent assemblies, and all dependent assemblies of
         ///     dependent assemblies, etc.
         /// </summary>
-        private static void InternalGetDependentAssembliesRecursive(Assembly assembly)
+        private static void InternalGetDependentAssembliesRecursive(Assembly assembly, MetadataLoadContext context)
         {
-            // Load assemblies with newest versions first. Omitting the ordering results in false positives on
+           
+            //Load assemblies with newest versions first. Omitting the ordering results in false positives on
             // _missingAssemblyList.
             var referencedAssemblies = assembly.GetReferencedAssemblies()
                 .OrderByDescending(o => o.Version);
 
+
             foreach (var r in referencedAssemblies)
             {
                 if (String.IsNullOrEmpty(assembly.FullName))
@@ -102,16 +126,19 @@ private static void InternalGetDependentAssembliesRecursive(Assembly assembly)
                 {
                     try
                     {
-                        var a = Assembly.LoadFrom(r.FullName);
+                        var a = context.LoadFromAssemblyName(r.FullName);
                         _dependentAssemblyList[a.FullName.MyToName()] = a;
-                        InternalGetDependentAssembliesRecursive(a);
+                        InternalGetDependentAssembliesRecursive(a, context);
                     }
-                    catch 
+                    catch
                     {
                         _missingAssemblyList.Add(new MissingAssembly(r.FullName.Split(',')[0], assembly.FullName.MyToName()));
                     }
                 }
+                
             }
+
+            
         }
 
         private static string MyToName(this string fullName)
diff --git a/XbimXplorer/XbimXplorer.csproj b/XbimXplorer/XbimXplorer.csproj
index 398d6e9f..f75131fe 100644
--- a/XbimXplorer/XbimXplorer.csproj
+++ b/XbimXplorer/XbimXplorer.csproj
@@ -11,13 +11,20 @@
 		</Description>
 		<ApplicationIcon />
     <UseWPF>true</UseWPF>
+    <Platforms>AnyCPU;x86</Platforms>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-windows|AnyCPU'">
 		<OutputPath>..\Output\Debug\</OutputPath>
 	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-windows|x86'">
+	  <OutputPath>..\Output\Debug\</OutputPath>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0-windows|AnyCPU'">
 		<OutputPath>..\Output\Release</OutputPath>
 	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0-windows|x86'">
+	  <OutputPath>..\Output\Release</OutputPath>
+	</PropertyGroup>
 	<ItemGroup>
 		<EmbeddedResource Update="Properties\Resources.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Resources.Designer.cs" />
 		<Compile Update="Properties\Resources.Designer.cs" DesignTime="True" AutoGen="True" DependentUpon="Resources.resx" />
@@ -54,6 +61,7 @@
 		<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+		<PackageReference Include="System.Reflection.MetadataLoadContext" Version="7.0.0" />
     <PackageReference Include="Xbim.IO.Esent" Version="5.9.376-develop" />
 	</ItemGroup>
 	<ItemGroup>
diff --git a/XbimXplorer/XplorerMainWindow.xaml.cs b/XbimXplorer/XplorerMainWindow.xaml.cs
index 660ee034..96c714a6 100644
--- a/XbimXplorer/XplorerMainWindow.xaml.cs
+++ b/XbimXplorer/XplorerMainWindow.xaml.cs
@@ -322,6 +322,8 @@ private void OpenAcceptableExtension(object s, DoWorkEventArgs args)
                             {
                                 var sb = new StringBuilder();
                                 sb.AppendLine($"Error creating geometry context of '{selectedFilename}' {geomEx.StackTrace}.");
+                                var platform = typeof(XplorerMainWindow).Assembly.GetName().ProcessorArchitecture;
+                                var platform2 = typeof(Xbim3DModelContext).Assembly.GetName().ProcessorArchitecture;
                                 var newexception = new Exception(sb.ToString(), geomEx);
                                 Logger.LogError(0, newexception, "Error creating geometry context of {filename}", selectedFilename);
                             }
diff --git a/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj b/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
index 570f24c4..8987cd77 100644
--- a/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
+++ b/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
@@ -21,6 +21,7 @@
     <UseWPF>true</UseWPF>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <Title>xBIM BCF Plugin</Title>
+    <Platforms>AnyCPU;x86</Platforms>
   </PropertyGroup>
   <ItemGroup>
     <AppDesigner Include="Properties\" />

From 13fa45c36f342bb774ecfc7dd7352c8617af0523 Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Wed, 4 Jan 2023 11:49:53 +0000
Subject: [PATCH 06/18] Updated latest netcore GE-6.1.552

---
 Xbim.Presentation/Xbim.Presentation.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index eaadbdf5..2f64e2cd 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
     <PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
     <PackageReference Include="Xbim.Essentials" Version="5.9.376-develop" />
-    <PackageReference Include="Xbim.Geometry" Version="6.1.542-netcore" />
+    <PackageReference Include="Xbim.Geometry" Version="6.1.552-netcore" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.de.resx">

From 6937bbd78589aed9af95c665528068ccc8fef398 Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Thu, 5 Jan 2023 12:46:33 +0000
Subject: [PATCH 07/18] Show affected entity ID in logs Helps with diagnostics
 where there may not be any additional context

---
 Xbim.Presentation/Xbim.Presentation.csproj |  2 +-
 XbimXplorer/LogViewer/EventViewModel.cs    |  9 +++++
 XbimXplorer/LogViewer/LogViewer.xaml       |  1 +
 XbimXplorer/LogViewer/LogViewer.xaml.cs    | 46 ++++++++++++++++------
 XbimXplorer/XplorerMainWindow.xaml.cs      |  7 +++-
 5 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index 2f64e2cd..0b9ae753 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
     <PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
     <PackageReference Include="Xbim.Essentials" Version="5.9.376-develop" />
-    <PackageReference Include="Xbim.Geometry" Version="6.1.552-netcore" />
+    <PackageReference Include="Xbim.Geometry" Version="6.1.558-netcore" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.de.resx">
diff --git a/XbimXplorer/LogViewer/EventViewModel.cs b/XbimXplorer/LogViewer/EventViewModel.cs
index 6b49c6e3..86045942 100644
--- a/XbimXplorer/LogViewer/EventViewModel.cs
+++ b/XbimXplorer/LogViewer/EventViewModel.cs
@@ -29,6 +29,15 @@ public int ThreadId
             }
         }
 
+        public int? EntityLabel
+        {
+            get
+            {
+                return loggingEvent.Properties.TryGetValue("entityLabel", out LogEventPropertyValue value)
+                    ? GetIntValue(value)
+                    : null;
+            }
+        }
         private string GetTextValue(LogEventPropertyValue value)
         {
             if (value is ScalarValue scalar)
diff --git a/XbimXplorer/LogViewer/LogViewer.xaml b/XbimXplorer/LogViewer/LogViewer.xaml
index b5544bc6..e4717e87 100644
--- a/XbimXplorer/LogViewer/LogViewer.xaml
+++ b/XbimXplorer/LogViewer/LogViewer.xaml
@@ -45,6 +45,7 @@
                 <GridView>
                     <GridViewColumn Header="Time" Width="50" DisplayMemberBinding="{Binding TimeStamp}" />
                     <GridViewColumn Header="Message" Width="200" DisplayMemberBinding="{Binding Message}" />
+                    <GridViewColumn Header="Entity #" Width="75" DisplayMemberBinding="{Binding EntityLabel}" />
                     <GridViewColumn Header="Level" Width="75" DisplayMemberBinding="{Binding Level}" />
                     <GridViewColumn Header="Logger" Width="200" DisplayMemberBinding="{Binding Logger}" />
                     <GridViewColumn Header="Thread" Width="60" DisplayMemberBinding="{Binding ThreadId}" />
diff --git a/XbimXplorer/LogViewer/LogViewer.xaml.cs b/XbimXplorer/LogViewer/LogViewer.xaml.cs
index 119ae295..c93d284a 100644
--- a/XbimXplorer/LogViewer/LogViewer.xaml.cs
+++ b/XbimXplorer/LogViewer/LogViewer.xaml.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using Microsoft.Isam.Esent.Interop;
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -84,20 +85,22 @@ private void DumpEvent(EventViewModel eventViewModel, StringBuilder sb)
         {
             if (Verbose.IsChecked != null && Verbose.IsChecked.Value)
             {
-                sb.AppendFormat("==== {0}\t{1}\t{2}\r\n{3}\r\n{4}\r\n{5}\r\n\r\n",
+                sb.AppendFormat("==== {0}\t{1}\t{2}\t{3}\t{4}\t{5}\r\n{6}\r\n\r\n",
                     eventViewModel.TimeStamp,
                     eventViewModel.ThreadId,
                     eventViewModel.Level,
                     eventViewModel.Logger,
+                    eventViewModel.EntityLabel,
                     eventViewModel.Message,
                     eventViewModel.ErrorMessage
                     );
             }
             else
             {
-                sb.AppendFormat("{0}\t{1}\t{2}\r\n",
+                sb.AppendFormat("{0}\t{1}\t{2}\t{3}\r\n",
                     eventViewModel.Level,
                     eventViewModel.Logger,
+                    eventViewModel.EntityLabel,
                     eventViewModel.Message
                     );
             }
@@ -161,22 +164,31 @@ private void WindowKeyDown(object sender, System.Windows.Input.KeyEventArgs e)
         private void AttemptOpenSelection(object sender, MouseButtonEventArgs e)
         {
             var first = View.SelectedItems.OfType<EventViewModel>().FirstOrDefault();
+            
             var msg = first?.Message;
+            var ent = first?.EntityLabel;
             if (string.IsNullOrEmpty(msg))
                 return;
-            var reEntityLabel = new Regex(@"#(\d+)");
-            var mEntityLabel = reEntityLabel.Match(msg);
-            if (mEntityLabel.Success)
+
+            if(ent.HasValue)
             {
-                int eLabel;
-                if (!int.TryParse(mEntityLabel.Groups[1].Value, out eLabel))
-                    return;
-
-                var ipers = _mw.Model.Instances[eLabel];
-                if (ipers == null)
-                    return;
-                _mw.SelectedItem = ipers;
+                SelectItem(ent.Value);
             }
+            else
+            {
+                // Legacy method: extract from message
+                var reEntityLabel = new Regex(@"#(\d+)");
+                var mEntityLabel = reEntityLabel.Match(msg);
+                if (mEntityLabel.Success)
+                {
+                    int eLabel;
+                    if (!int.TryParse(mEntityLabel.Groups[1].Value, out eLabel))
+                        return;
+
+                    SelectItem(eLabel);
+                }
+            }
+            
 
             var reUrl = new Regex(@"(http([^ ]+))", RegexOptions.IgnoreCase);
             var mUrl = reUrl.Match(msg);
@@ -187,5 +199,13 @@ private void AttemptOpenSelection(object sender, MouseButtonEventArgs e)
                 System.Diagnostics.Process.Start(text);
             }
         }
+
+        private void SelectItem(int entityLabel)
+        {
+            var ipers = _mw.Model.Instances[entityLabel];
+            if (ipers == null)
+                return;
+            _mw.SelectedItem = ipers;
+        }
     }
 }
diff --git a/XbimXplorer/XplorerMainWindow.xaml.cs b/XbimXplorer/XplorerMainWindow.xaml.cs
index 96c714a6..91f46a4f 100644
--- a/XbimXplorer/XplorerMainWindow.xaml.cs
+++ b/XbimXplorer/XplorerMainWindow.xaml.cs
@@ -283,6 +283,7 @@ private void OpenAcceptableExtension(object s, DoWorkEventArgs args)
             var selectedFilename = args.Argument as string;
             try
             {
+                Logger.LogInformation("Opening model {file}", selectedFilename);
                 if (worker == null)
                     throw new Exception("Background thread could not be accessed");
                 _temporaryXbimFileName = Path.GetTempFileName();
@@ -307,7 +308,9 @@ private void OpenAcceptableExtension(object s, DoWorkEventArgs args)
                         {
                             try
                             {
-                                var context = new Xbim3DModelContext(model);
+                                var contextLogger = LoggerFactory.CreateLogger<Xbim3DModelContext>();
+                                var context = new Xbim3DModelContext(model, engineVersion: Xbim.Geometry.Abstractions.XGeometryEngineVersion.V6,
+                                     logger: contextLogger, loggerFactory: LoggerFactory);
 
                                 if (!_multiThreading)
                                     context.MaxThreads = 1;
@@ -359,6 +362,7 @@ private void OpenAcceptableExtension(object s, DoWorkEventArgs args)
                                 File.Delete(_temporaryXbimFileName); //tidy up;
                             _temporaryXbimFileName = null;
                             SetOpenedModelFileName(null);
+                            Logger.LogInformation("Cancelled opening model {file}", selectedFilename);
                         }
                         catch (Exception ex)
                         {
@@ -366,6 +370,7 @@ private void OpenAcceptableExtension(object s, DoWorkEventArgs args)
                         }
                         return;
                     }
+                    Logger.LogInformation("Finished opening model {file}", selectedFilename);
                 }
                 else
                 {

From da0c57385c14dbe20ff62e7a586460acb9a444a2 Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Sun, 15 Jan 2023 15:42:44 +0000
Subject: [PATCH 08/18] Plugins system ported to net standard approach

Now looks for 6.0.0.0 compatible plugins as 4/5.x will not be compatible with v6

Breaking change: Plugins cannot be WinExe - these can't be assembly loaded in netcore: https://stackoverflow.com/a/58291394

TODO: consider multi-targetting
TODO: Review plugin commands
---
 Xbim.Presentation/Xbim.Presentation.csproj    |   2 +-
 Xbim.WindowsUI.sln                            |  27 ++--
 XbimXplorer/Commands/wdwCommands.xaml.cs      |  18 ++-
 XbimXplorer/Dialogs/AssemblyInformation.cs    |   9 +-
 XbimXplorer/PluginSystem/PluginInformation.cs |  70 ++++++---
 .../PluginSystem/PluginInformationVm.cs       |   4 +-
 XbimXplorer/PluginSystem/PluginManagement.cs  | 133 ++++++++++++++----
 .../PluginSystem/PluginsConfig.xaml.cs        |  17 ++-
 .../PluginsConfig.xaml.version.cs             |   2 +-
 XbimXplorer/XbimXplorer.csproj                |   1 +
 XbimXplorer/XplorerMainWindow.Plugins.xaml.cs |   2 +-
 XplorerPlugin.Bcf/App.config                  |  62 --------
 XplorerPlugin.Bcf/App.xaml                    |   8 --
 XplorerPlugin.Bcf/App.xaml.cs                 |  17 ---
 XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj    |   9 +-
 15 files changed, 202 insertions(+), 179 deletions(-)
 delete mode 100644 XplorerPlugin.Bcf/App.config
 delete mode 100644 XplorerPlugin.Bcf/App.xaml
 delete mode 100644 XplorerPlugin.Bcf/App.xaml.cs

diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index 0b9ae753..92a489a0 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
     <PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
     <PackageReference Include="Xbim.Essentials" Version="5.9.376-develop" />
-    <PackageReference Include="Xbim.Geometry" Version="6.1.558-netcore" />
+    <PackageReference Include="Xbim.Geometry" Version="6.1.614-netcore" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.de.resx">
diff --git a/Xbim.WindowsUI.sln b/Xbim.WindowsUI.sln
index da4b1439..09c1143a 100644
--- a/Xbim.WindowsUI.sln
+++ b/Xbim.WindowsUI.sln
@@ -37,12 +37,12 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{89F98E53-DE4E-4427-8244-D5934AD08849}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{89F98E53-DE4E-4427-8244-D5934AD08849}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89F98E53-DE4E-4427-8244-D5934AD08849}.Debug|x86.ActiveCfg = Debug|x86
-		{89F98E53-DE4E-4427-8244-D5934AD08849}.Debug|x86.Build.0 = Debug|x86
+		{89F98E53-DE4E-4427-8244-D5934AD08849}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{89F98E53-DE4E-4427-8244-D5934AD08849}.Debug|x86.Build.0 = Debug|Any CPU
 		{89F98E53-DE4E-4427-8244-D5934AD08849}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{89F98E53-DE4E-4427-8244-D5934AD08849}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89F98E53-DE4E-4427-8244-D5934AD08849}.Release|x86.ActiveCfg = Release|x86
-		{89F98E53-DE4E-4427-8244-D5934AD08849}.Release|x86.Build.0 = Release|x86
+		{89F98E53-DE4E-4427-8244-D5934AD08849}.Release|x86.ActiveCfg = Release|Any CPU
+		{89F98E53-DE4E-4427-8244-D5934AD08849}.Release|x86.Build.0 = Release|Any CPU
 		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Debug|x86.ActiveCfg = Debug|x86
@@ -52,20 +52,23 @@ Global
 		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Release|x86.ActiveCfg = Release|x86
 		{D6CED5D7-BE37-4A32-90A5-1444C9FFDD91}.Release|x86.Build.0 = Release|x86
 		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Debug|x86.ActiveCfg = Debug|x86
-		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Debug|x86.Build.0 = Debug|x86
+		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Debug|x86.Build.0 = Debug|Any CPU
 		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Release|x86.ActiveCfg = Release|x86
-		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Release|x86.Build.0 = Release|x86
+		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Release|x86.ActiveCfg = Release|Any CPU
+		{935963BB-7EE9-4C8F-BC60-DE43961F2E98}.Release|x86.Build.0 = Release|Any CPU
 		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Debug|x86.ActiveCfg = Debug|x86
-		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Debug|x86.Build.0 = Debug|x86
+		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Debug|x86.Build.0 = Debug|Any CPU
 		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Release|x86.ActiveCfg = Release|x86
-		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Release|x86.Build.0 = Release|x86
+		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Release|x86.ActiveCfg = Release|Any CPU
+		{645DE1B1-90B9-4B04-8F65-F6C81B046B23}.Release|x86.Build.0 = Release|Any CPU
 		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Debug|x86.ActiveCfg = Debug|x86
 		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Debug|x86.Build.0 = Debug|x86
 		{6ED232C8-1056-4FB5-9B72-18D045DB833B}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/XbimXplorer/Commands/wdwCommands.xaml.cs b/XbimXplorer/Commands/wdwCommands.xaml.cs
index f0d17d8f..aad9dad2 100644
--- a/XbimXplorer/Commands/wdwCommands.xaml.cs
+++ b/XbimXplorer/Commands/wdwCommands.xaml.cs
@@ -36,6 +36,8 @@
 using Xbim.Common.ExpressValidation;
 using Xbim.Presentation.Overlay;
 using HelixToolkit.Wpf;
+using System.Threading.Tasks;
+using System.Threading;
 
 // todo: see if gemini is a good candidate for a network based ui experience in xbim.
 // https://github.com/tgjones/gemini
@@ -284,7 +286,7 @@ private void Execute()
                 mdbclosed = Regex.Match(cmd, @"^(plugin|plugins) ((?<command>install|refresh|load|list|folder|update) *)*(?<pluginName>[^ ]+)*[ ]*", RegexOptions.IgnoreCase);
                 if (mdbclosed.Success)
                 {
-                    PluginCommand(mdbclosed);
+                    _ = PluginCommand(mdbclosed);
                     continue;
                 }
 
@@ -1106,8 +1108,12 @@ private void ProcessBrepCommand(Match m)
 			}
 		}
 
-		private void PluginCommand(Match mdbclosed)
+		private async Task PluginCommand(Match mdbclosed)
 		{
+            using CancellationTokenSource cts = new CancellationTokenSource(TimeSpan.FromSeconds(60));
+            var token = cts.Token;
+
+
             var commandString = mdbclosed.Groups["command"].Value;
             var pluginName = mdbclosed.Groups["pluginName"].Value;
             if (commandString.ToLower() == "refresh")
@@ -1131,7 +1137,7 @@ private void PluginCommand(Match mdbclosed)
             else if (commandString.ToLower() == "install" || commandString.ToLower() == "update")
             {
                 var pm = new PluginManagement();
-                var plugin = pm.GetPlugins(PluginChannelOption.LatestIncludingDevelopment, PluginsConfig.NugetVersion).FirstOrDefault(x => x.PluginId == pluginName);
+                var plugin = await pm.GetPluginsAsync(PluginChannelOption.LatestIncludingDevelopment, PluginsConfig.NugetVersion, token).FirstOrDefaultAsync(x => x.PluginId == pluginName);
                 if (plugin == null)
                 {
                     ReportAdd("Plugin not found.", Brushes.Red);
@@ -1148,7 +1154,7 @@ private void PluginCommand(Match mdbclosed)
 
                 // try installing
                 ReportAdd("Plugin found; installing...", Brushes.Blue);
-                var extracted = plugin.ExtractPlugin(PluginManagement.GetPluginsDirectory());
+                var extracted = await plugin.ExtractPlugin(PluginManagement.GetPluginsDirectory());
                 if (!extracted)
                 {
                     ReportAdd("Plugin extraction failed.", Brushes.Red);
@@ -1182,7 +1188,7 @@ private void PluginCommand(Match mdbclosed)
             else if (commandString.ToLower() == "list")
             {
                 PluginManagement pm = new PluginManagement();
-                var plugins = pm.GetPlugins(PluginChannelOption.LatestIncludingDevelopment, PluginsConfig.NugetVersion).ToList();
+                var plugins = await pm.GetPluginsAsync(PluginChannelOption.LatestIncludingDevelopment, PluginsConfig.NugetVersion, token).ToListAsync();
                 if (plugins.Any())
                 {
                     ReportAdd("Beta versions in the development channel:");
@@ -1191,7 +1197,7 @@ private void PluginCommand(Match mdbclosed)
                         ReportAdd($" - {plugin.PluginId} Available: {plugin.AvailableVersion} Installed: {plugin.InstalledVersion} Loaded: {plugin.LoadedVersion}");
                     }
                 }
-                plugins = pm.GetPlugins(PluginChannelOption.LatestStable, PluginsConfig.NugetVersion).ToList();
+                plugins = await pm.GetPluginsAsync(PluginChannelOption.LatestStable, PluginsConfig.NugetVersion, token).ToListAsync();
                 if (plugins.Any())
                 {
                     ReportAdd("Versions in the stable channel:");
diff --git a/XbimXplorer/Dialogs/AssemblyInformation.cs b/XbimXplorer/Dialogs/AssemblyInformation.cs
index 563323eb..7a039d01 100644
--- a/XbimXplorer/Dialogs/AssemblyInformation.cs
+++ b/XbimXplorer/Dialogs/AssemblyInformation.cs
@@ -59,14 +59,7 @@ public static Dictionary<string, Assembly> MyGetReferencedAssembliesRecursive(th
 
             InternalGetDependentAssemblies(assembly);
 
-            //// Only include assemblies that we wrote ourselves (ignore ones from GAC).
-            //var keysToRemove = _dependentAssemblyList.Values.Where(
-            //    o => o.GlobalAssemblyCache == true).ToList();
-
-            //foreach (var k in keysToRemove)
-            //{
-            //    _dependentAssemblyList.Remove(k.FullName.MyToName());
-            //}
+           // TOOD: We used to exclude assemblies in the GAC. That's a deprecated concept in netcore. Review?
 
             return _dependentAssemblyList;
         }
diff --git a/XbimXplorer/PluginSystem/PluginInformation.cs b/XbimXplorer/PluginSystem/PluginInformation.cs
index 048f0117..1bdd2ec6 100644
--- a/XbimXplorer/PluginSystem/PluginInformation.cs
+++ b/XbimXplorer/PluginSystem/PluginInformation.cs
@@ -1,9 +1,13 @@
 using Microsoft.Extensions.Logging;
+using NuGet.Packaging;
+using NuGet.Protocol.Core.Types;
+using NuGet.Versioning;
 using System;
 using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
-using NuGet.Packaging;
-using NuGet.Versioning;
 
 namespace XbimXplorer.PluginSystem
 {
@@ -15,25 +19,26 @@ public class PluginInformation
 
         internal PluginConfiguration Config { get; set; }
         
-        public NuGetVersion AvailableVersion => _onlinePackage?.Version;
+        public NuGetVersion AvailableVersion => _onlinePackage?.Identity.Version;
         public NuGetVersion InstalledVersion => _diskManifest?.Version;
         public string LoadedVersion => MainWindow?.GetLoadedVersion(PluginId) ?? "";
 
-        private IPackageMetadata _onlinePackage;
+        private IPackageSearchMetadata _onlinePackage;
         private ManifestMetadata _diskManifest;
         private DirectoryInfo _directory;
         
-        public PluginInformation(Microsoft.Extensions.Logging.ILogger logger = null)
+        public PluginInformation(PluginManagement manager)
         {
-            Logger = logger ?? XplorerMainWindow.LoggerFactory.CreateLogger<PluginInformation>();
-        }
+            Logger = XplorerMainWindow.LoggerFactory.CreateLogger<PluginInformation>();
+			Manager = manager;
+		}
 
-        public PluginInformation(DirectoryInfo directoryInfo)
+        public PluginInformation(DirectoryInfo directoryInfo, PluginManagement manager) : this(manager)
         {
             SetDirectoryInfo(directoryInfo);
         }
 
-        public PluginInformation(IPackageMetadata p)
+        public PluginInformation(IPackageSearchMetadata p, PluginManagement manager) : this(manager)
         {
             SetPackage(p);
         }
@@ -57,19 +62,21 @@ internal void SetDirectoryInfo(DirectoryInfo directoryInfo)
 
         public ManifestMetadata Manifest => _diskManifest;
 
-        internal void DeleteFromDisk()
+		public PluginManagement Manager { get; }
+
+		internal void DeleteFromDisk()
         {
             _directory.Delete(true);
             _directory = null;
             SetDirectoryInfo(_directory);
         }
 
-        public void SetPackage(IPackageMetadata package)
+        public void SetPackage(IPackageSearchMetadata package)
         {
             _onlinePackage = package;
             if (string.IsNullOrEmpty(PluginId))
             {
-                PluginId = package.Id;
+                PluginId = package.Identity.Id;
             }
         }
 
@@ -87,8 +94,11 @@ private void SetDiskManifest(ManifestMetadata manifest)
         /// </summary>
         /// <param name="pluginDirectory">Destination folder, a subdir will be created.</param>
         /// <returns>false on error</returns>
-        public bool ExtractPlugin(DirectoryInfo pluginDirectory)
+        public async Task<bool> ExtractPlugin(DirectoryInfo pluginDirectory)
         {
+            using CancellationTokenSource cts = new CancellationTokenSource(TimeSpan.FromSeconds(60));
+            var token = cts.Token;
+           
             // ensure top leved plugin directory exists
             try
             {
@@ -117,10 +127,18 @@ public bool ExtractPlugin(DirectoryInfo pluginDirectory)
 
             // now extract files
             // 
-#if Nuget
-            foreach (var file in _onlinePackage.GetLibFiles())
+            using MemoryStream packageStream = new MemoryStream();
+            using var packageReader = await Manager.DownloadPluginAsync(_onlinePackage, packageStream, token);
+
+
+            var frameworkReference = (await packageReader.GetReferenceItemsAsync(token)).FirstOrDefault();
+
+            
+            foreach (var fileName in frameworkReference.Items)
             {
-                var destname = Path.Combine(subdir.FullName, file.EffectivePath);
+                // TODO: Currently we flatten lib files. If we want to multi-target we should preserve the lib folder structure for net48, net6 etc
+                var localPath = Path.GetFileName(fileName); 
+                var destname = Path.Combine(subdir.FullName, localPath);
                 try
                 {
                     if (File.Exists(destname))
@@ -136,8 +154,9 @@ public bool ExtractPlugin(DirectoryInfo pluginDirectory)
                 {
                     using (var fileStream = File.Create(destname))
                     {
-                        file.GetStream().Seek(0, SeekOrigin.Begin);
-                        file.GetStream().CopyTo(fileStream);
+                        var contentStream = await packageReader.GetStreamAsync(fileName, token);
+                        
+                        contentStream.CopyTo(fileStream);
                     }
                 }
                 catch (Exception ex)
@@ -146,16 +165,21 @@ public bool ExtractPlugin(DirectoryInfo pluginDirectory)
                     return false;
                 }
             }
+            
 
             // store manifest information to disk
             // 
-            var packageName = Path.Combine(subdir.FullName, $"{_onlinePackage.Id}.manifest");
+            var packageName = Path.Combine(subdir.FullName, $"{_onlinePackage.Identity.Id}.manifest");
             try
             {
-                if (!_onlinePackage.ExtractManifestFile(packageName))
+
+                var nuspecManifest = await packageReader.GetNuspecFileAsync(token);
+
+                using (var fileStream = File.Create(packageName))
                 {
-                    Logger.LogError("Error trying to create manifest file for {packageName}", packageName);
-                    return false;
+                    var contentStream = await packageReader.GetStreamAsync(nuspecManifest, token);
+
+                    contentStream.CopyTo(fileStream);
                 }
                 SetDirectoryInfo(subdir);
             }
@@ -164,7 +188,7 @@ public bool ExtractPlugin(DirectoryInfo pluginDirectory)
                 Logger.LogError(0, ex, "Error trying to create manifest file for: {packageName}", packageName);
                 return false;
             }
-#endif
+
             return true;
         }
 
diff --git a/XbimXplorer/PluginSystem/PluginInformationVm.cs b/XbimXplorer/PluginSystem/PluginInformationVm.cs
index a3eb6faf..2e10a991 100644
--- a/XbimXplorer/PluginSystem/PluginInformationVm.cs
+++ b/XbimXplorer/PluginSystem/PluginInformationVm.cs
@@ -86,12 +86,12 @@ internal void RemoveInstallation()
 
         public string Startup => _model?.Config?.OnStartup.ToString();
 
-        public void ExtractPlugin(DirectoryInfo pluginsDirectory)
+        public async Task ExtractPlugin(DirectoryInfo pluginsDirectory)
         {
             if (_model == null)
                 return;
             
-            _model.ExtractPlugin(pluginsDirectory);
+            await _model.ExtractPlugin(pluginsDirectory);
             OnPropertyChanged("");
         }
 
diff --git a/XbimXplorer/PluginSystem/PluginManagement.cs b/XbimXplorer/PluginSystem/PluginManagement.cs
index 25e36f45..16991b42 100644
--- a/XbimXplorer/PluginSystem/PluginManagement.cs
+++ b/XbimXplorer/PluginSystem/PluginManagement.cs
@@ -1,11 +1,18 @@
 using Microsoft.Extensions.Logging;
-using NuGet;
 using NuGet.Packaging;
+using NuGet.Protocol;
+using NuGet.Protocol.Core.Types;
+using NuGet.Versioning;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Xbim.Common.Metadata;
+using Xbim.Ifc4.Interfaces;
 
 namespace XbimXplorer.PluginSystem
 {
@@ -17,11 +24,13 @@ public enum PluginChannelOption
         AllCompatibleVersions
     }
 
-    internal class PluginManagement
+    public class PluginManagement
     {
         private readonly Dictionary<string, PluginInformation> _diskPlugins =
            new Dictionary<string, PluginInformation>();
 
+        private readonly SourceCacheContext _cache = new SourceCacheContext();
+
         public PluginManagement(Microsoft.Extensions.Logging.ILogger logger = null)
         {
             Logger = logger ?? XplorerMainWindow.LoggerFactory.CreateLogger<PluginManagement>();
@@ -45,7 +54,7 @@ internal void RefreshLocalPlugins()
             var dirs = PluginManagement.GetPluginDirectories();
             foreach (var directoryInfo in dirs)
             {
-                var pc = new PluginInformation(directoryInfo);
+                var pc = new PluginInformation(directoryInfo , this);
                 _diskPlugins.Add(pc.PluginId, pc);
             }
         }
@@ -87,63 +96,131 @@ internal static ManifestMetadata GetManifestMetadata(DirectoryInfo path)
 
         internal static string SelectedRepoUrl => "https://www.myget.org/F/xbim-plugins/api/v2";
 
-        internal IEnumerable<PluginInformation> GetPlugins(PluginChannelOption option, string winUiNugetVersion)
+
+        internal async Task<PackageArchiveReader> DownloadPluginAsync(IPackageSearchMetadata package, Stream packageStream, CancellationToken? cancellationToken)
+        {
+            var ct = cancellationToken?? CancellationToken.None;
+
+            var logger = NuGet.Common.NullLogger.Instance;
+                        
+            SourceRepository repository = Repository.Factory.GetCoreV3(SelectedRepoUrl);
+
+            FindPackageByIdResource resource = await repository.GetResourceAsync<FindPackageByIdResource>();
+         
+
+            await resource.CopyNupkgToStreamAsync(
+                package.Identity.Id,
+                package.Identity.Version,
+                packageStream,
+                _cache,
+                logger,
+                ct);
+
+            Console.WriteLine($"Downloaded package {package.Identity.Id} {package.Identity.Version}");
+
+            return new PackageArchiveReader(packageStream);
+
+        }
+
+        internal async IAsyncEnumerable<PluginInformation> GetPluginsAsync(PluginChannelOption option, string winUiNugetVersion, 
+            [EnumeratorCancellation] CancellationToken cancellationToken)
         {
-#if nuge
+            var logger = NuGet.Common.NullLogger.Instance;
             RefreshLocalPlugins();
-            var repo = PackageRepositoryFactory.Default.CreateRepository(SelectedRepoUrl);
             var allowDevelop = option != PluginChannelOption.LatestStable;
-            var invokingVerion = new SemanticVersion(winUiNugetVersion);
+          
+
+            SourceRepository repository = Repository.Factory.GetCoreV3(SelectedRepoUrl);
+            PackageSearchResource resource = await repository.GetResourceAsync<PackageSearchResource>();
+            SearchFilter searchFilter = new SearchFilter(includePrerelease: allowDevelop);
+
+
+            var invokingVerion = new NuGetVersion(winUiNugetVersion);
+
+            IEnumerable<IPackageSearchMetadata> results = await resource.SearchAsync(
+                "XplorerPlugin",
+                searchFilter,
+                skip: 0,
+                take: 20,
+                logger,
+                cancellationToken);
+
+            var tmpPackages = new List<IPackageSearchMetadata>();
 
-            var fnd = repo.Search("XplorerPlugin", allowDevelop);
-            var tmpPackages = new List<IPackage>();
-            foreach (var package in fnd)
+            // Use any type in the schema
+			Module mod = typeof(Xbim.Ifc4.Kernel.IfcRoot).Module;
+			ExpressMetaData meta = ExpressMetaData.GetMetadata(mod);
+
+            // Find all sub types of IfcProduct. You will probably also want to do IfcTypeObjects as well
+            var product = meta.ExpressType(typeof(Xbim.Ifc4.Kernel.IfcProduct));
+
+            foreach(var type in product.SubTypes)
             {
+				ExpressMetaProperty predefinedProp = type.Properties.Values.FirstOrDefault(v => v.Name == nameof(IIfcDoor.PredefinedType));
+                if (predefinedProp != null)
+                {
+                    // It has a PredefinedType property - get the underlyng Type
+					Type enumType = predefinedProp.PropertyInfo.PropertyType;
+                    enumType = Nullable.GetUnderlyingType(enumType) ?? enumType;
+
+                    // Get the values
+					Array enumValues = Enum.GetValues(enumType);
+                    foreach (var predefinedValue in enumValues)
+                    {
+                        Console.WriteLine("{0}: {1}", type.Name, predefinedValue);
+                    }
+
+                }
+            }
+
+            foreach (IPackageSearchMetadata package in results)
+            {
+                Console.WriteLine($"Found package {package.Identity.Id} {package.Identity.Version}");
                 // drop develop if latest stable
-                System.Diagnostics.Debug.WriteLine($"Evaluating {package}");
-                if (option == PluginChannelOption.LatestStable && !string.IsNullOrEmpty(package.Version.SpecialVersion))
+                System.Diagnostics.Debug.WriteLine($"Evaluating {package.Identity}");
+                
+                if (option == PluginChannelOption.LatestStable && package.Identity.Version.IsPrerelease)
                 {
                     continue;
                 }
                 // check it is compatible
-                var sel = package.DependencySets.SelectMany(x => x.Dependencies.Where(y => y.Id.StartsWith("Xbim.WindowsUI"))).FirstOrDefault();
-                if (sel != null && sel.VersionSpec.Satisfies(invokingVerion))
+                var sel = package.DependencySets.SelectMany(x => x.Packages.Where(y => y.Id.StartsWith("Xbim.WindowsUI"))).FirstOrDefault();
+                if (sel != null && sel.VersionRange.Satisfies(invokingVerion, VersionComparison.Version))
                 {
+                    
                     tmpPackages.Add(package);
                 }
             }
-
-            if (option == PluginChannelOption.LatestStable || option ==  PluginChannelOption.LatestIncludingDevelopment)
+            
+            if (option == PluginChannelOption.LatestStable || option == PluginChannelOption.LatestIncludingDevelopment)
             {
                 // only one per ID
-                var selPackages = new List<IPackage>();
-                var grouped = tmpPackages.GroupBy(x => x.Id);
+                var selPackages = new List<IPackageSearchMetadata>();
+                var grouped = tmpPackages.GroupBy(x => x.Identity.Id);
                 foreach (var element in grouped)
                 {
-                    var maxVersion = element.Max(x => x.Version);
-                    selPackages.Add(element.FirstOrDefault(x=>x.Version == maxVersion));
+                    var maxVersion = element.Max(x => x.Identity.Version);
+                    selPackages.Add(element.FirstOrDefault(x => x.Identity.Version == maxVersion));
                 }
                 tmpPackages = selPackages;
             }
-            
-            
+
             foreach (var package in tmpPackages)
             {
-                var pv = new PluginInformation(package);
-                if (_diskPlugins.ContainsKey(package.Id))
+                var pv = new PluginInformation(package, this);
+                if (_diskPlugins.ContainsKey(package.Identity.Id))
                 {
-                    pv.SetDirectoryInfo(_diskPlugins[package.Id]);
+                    pv.SetDirectoryInfo(_diskPlugins[package.Identity.Id]);
                 }
                 yield return pv;
             }
-#endif
-            return Enumerable.Empty<PluginInformation>();
+
         }
 
         public static string GetEntryFile(DirectoryInfo dir, string filename = null)
         {
             var f = filename == null 
-                ? Path.Combine(dir.FullName, dir.Name + ".exe") 
+                ? Path.Combine(dir.FullName, dir.Name + ".dll") 
                 : Path.Combine(dir.FullName, filename);
             return f;
         }
diff --git a/XbimXplorer/PluginSystem/PluginsConfig.xaml.cs b/XbimXplorer/PluginSystem/PluginsConfig.xaml.cs
index a5b08f70..c63ecb83 100644
--- a/XbimXplorer/PluginSystem/PluginsConfig.xaml.cs
+++ b/XbimXplorer/PluginSystem/PluginsConfig.xaml.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using Microsoft.Extensions.Logging;
@@ -25,19 +27,20 @@ public PluginsConfig()
         {
             InitializeComponent();
             Logger = XplorerMainWindow.LoggerFactory.CreateLogger<PluginsConfig>();
-            RefreshPluginList();
+            _ =RefreshPluginList();
             _mainWindow = Application.Current.MainWindow as XplorerMainWindow;
             DataContext = this;
             SelectedPlugin = new PluginInformationVm(null);
         }
 
-        private void ShowRepository()
+        private async Task ShowRepository()
         {
             var plugins = new List<PluginInformationVm>();
             try
             {
                 var option = (PluginChannelOption)Enum.Parse(typeof(PluginChannelOption), DisplayOptionText);
-                foreach (var plugin in _xplorerPlugins.GetPlugins(option, NugetVersion))
+                using CancellationTokenSource cts = new CancellationTokenSource(TimeSpan.FromSeconds(60));
+                await foreach (var plugin in _xplorerPlugins.GetPluginsAsync(option, NugetVersion, cts.Token))
                 {
                     plugins.Add(new PluginInformationVm(plugin));
                 }
@@ -64,7 +67,7 @@ private string DisplayOptionText
             }
         }
         
-        private void RefreshPluginList()
+        private async Task RefreshPluginList()
         {
             using (new WaitCursor())
             {
@@ -72,7 +75,7 @@ private void RefreshPluginList()
                     ShowDiskPlugins();
                 else
                 {
-                    ShowRepository();
+                    await ShowRepository();
                 }
                 SelectedPlugin = new PluginInformationVm(null);
             }
@@ -124,12 +127,12 @@ private void PluginList_OnDrop(object sender, DragEventArgs e)
                     Logger.LogError(0, ex, "Error processing package file {filename}.", fname);
                 }
             }
-            RefreshPluginList();
+            _ =RefreshPluginList();
         }
 
         private void DisplayOption_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
         {
-            RefreshPluginList();
+            _ = RefreshPluginList();
         }
     }
 }
diff --git a/XbimXplorer/PluginSystem/PluginsConfig.xaml.version.cs b/XbimXplorer/PluginSystem/PluginsConfig.xaml.version.cs
index ff0bdeb3..4f0d0bc3 100644
--- a/XbimXplorer/PluginSystem/PluginsConfig.xaml.version.cs
+++ b/XbimXplorer/PluginSystem/PluginsConfig.xaml.version.cs
@@ -5,6 +5,6 @@
     /// </summary>
     public partial class PluginsConfig
     {
-        public const string NugetVersion = "5.1.178-develop";
+        public const string NugetVersion = "6.0.0.0-develop";
     }
 }
diff --git a/XbimXplorer/XbimXplorer.csproj b/XbimXplorer/XbimXplorer.csproj
index f75131fe..2a9a0700 100644
--- a/XbimXplorer/XbimXplorer.csproj
+++ b/XbimXplorer/XbimXplorer.csproj
@@ -61,6 +61,7 @@
 		<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+		<PackageReference Include="System.Linq.Async.Queryable" Version="6.0.1" />
 		<PackageReference Include="System.Reflection.MetadataLoadContext" Version="7.0.0" />
     <PackageReference Include="Xbim.IO.Esent" Version="5.9.376-develop" />
 	</ItemGroup>
diff --git a/XbimXplorer/XplorerMainWindow.Plugins.xaml.cs b/XbimXplorer/XplorerMainWindow.Plugins.xaml.cs
index cb8de719..97f9c894 100644
--- a/XbimXplorer/XplorerMainWindow.Plugins.xaml.cs
+++ b/XbimXplorer/XplorerMainWindow.Plugins.xaml.cs
@@ -117,7 +117,7 @@ internal bool LoadPlugin(DirectoryInfo dir, bool forceLoad, string fileName = nu
                         reqFound = true;
                         break;
                     }
-                    if (currentDomainAssemblyName.Name.Equals(referencedRequirement.Name))
+                    if (currentDomainAssemblyName.Name.Equals(referencedRequirement.Name) && currentDomainAssemblyName.Name != "netstandard")
                     {
                         Logger.LogWarning($"Incompatible plugin components identified:" +
                                         "Plugin requires -> {required}. " +
diff --git a/XplorerPlugin.Bcf/App.config b/XplorerPlugin.Bcf/App.config
deleted file mode 100644
index 53466dcd..00000000
--- a/XplorerPlugin.Bcf/App.config
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-  </configSections>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-  </startup>
-  
-  <entityFramework>
-    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
-      <parameters>
-        <parameter value="v11.0" />
-      </parameters>
-    </defaultConnectionFactory>
-    <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
-      <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
-    </providers>
-  </entityFramework>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.0.93.0" newVersion="1.0.93.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Ionic.Zip" publicKeyToken="edbe51ad942a3f5c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.9.1.8" newVersion="1.9.1.8" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="NPOI" publicKeyToken="0df73ec7942b34e1" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.3.0" newVersion="2.1.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
diff --git a/XplorerPlugin.Bcf/App.xaml b/XplorerPlugin.Bcf/App.xaml
deleted file mode 100644
index 846819ee..00000000
--- a/XplorerPlugin.Bcf/App.xaml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Application x:Class="xBIM_BCF_Plugin.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             StartupUri="MainWindow.xaml">
-    <Application.Resources>
-         
-    </Application.Resources>
-</Application>
diff --git a/XplorerPlugin.Bcf/App.xaml.cs b/XplorerPlugin.Bcf/App.xaml.cs
deleted file mode 100644
index 4d59dcd3..00000000
--- a/XplorerPlugin.Bcf/App.xaml.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-
-namespace xBIM_BCF_Plugin
-{
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-    public partial class App : Application
-    {
-    }
-}
diff --git a/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj b/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
index 8987cd77..a968238a 100644
--- a/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
+++ b/XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net6.0-windows</TargetFrameworks>
-    <OutputType>WinExe</OutputType>
+    <!--<OutputType>WinExe</OutputType>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -18,11 +18,14 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <UseWPF>true</UseWPF>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+    -->
+    <UseWPF>true</UseWPF>
     <Title>xBIM BCF Plugin</Title>
-    <Platforms>AnyCPU;x86</Platforms>
+    <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
+
+
   <ItemGroup>
     <AppDesigner Include="Properties\" />
   </ItemGroup>

From 49c6013e1cde0017739dc8bb8ad87abcf4a86321 Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Mon, 16 Jan 2023 09:57:37 +0000
Subject: [PATCH 09/18] Build on PRs

---
 azure-pipelines.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9137c6f7..52bd88b8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -10,7 +10,11 @@ trigger:
     - README.md
     - CHANGELOG.md
     - CONTRIBUTING.md
-    
+
+pr:
+- master
+- develop
+
 pool:
   vmImage: 'windows-2019'
 

From 7ba1d8409ef87ab08016cf796a3d9728fb6af68a Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Tue, 21 Feb 2023 15:00:05 +0000
Subject: [PATCH 10/18] Updated to latest DI / XbimServices & Logging Updated
 to v6.0.0 xbim dependencies (and AssemblyVersions)

---
 Xbim.Presentation/DrawingControl3D.xaml.cs         |  3 ++-
 .../LayerStyling/BoundingBoxStyler.cs              |  3 ++-
 .../LayerStyling/IndividualElementStyler.cs        |  3 ++-
 .../LayerStyling/RandomColorStyler.cs              |  3 ++-
 .../LayerStyling/SurfaceLayerStyler.cs             |  3 ++-
 Xbim.Presentation/Xbim.Presentation.csproj         |  9 ++++++---
 Xbim.WinformsSample/FormExample.cs                 |  4 ++--
 XbimXplorer/Commands/wdwCommands.xaml.cs           | 11 ++++++-----
 XbimXplorer/XbimXplorer.csproj                     |  2 +-
 XbimXplorer/XplorerMainWindow.xaml.cs              | 14 +++++++++++---
 10 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/Xbim.Presentation/DrawingControl3D.xaml.cs b/Xbim.Presentation/DrawingControl3D.xaml.cs
index d2797f88..4afc1e49 100644
--- a/Xbim.Presentation/DrawingControl3D.xaml.cs
+++ b/Xbim.Presentation/DrawingControl3D.xaml.cs
@@ -17,6 +17,7 @@
 using System.Windows.Threading;
 using HelixToolkit.Wpf;
 using Xbim.Common;
+using Xbim.Common.Configuration;
 using Xbim.Common.Federation;
 using Xbim.Common.Geometry;
 using Xbim.Common.Metadata;
@@ -1162,7 +1163,7 @@ private WpfMeshGeometry3D GetSelectionGeometry(IPersistEntity newVal, WpfMateria
 						var gri = newVal as IIfcGeometricRepresentationItem;
 						if (gri != null)
 						{
-							var engine = new XbimGeometryEngine();
+							var engine = new XbimGeometryEngine(Model, XbimServices.Current.GetLoggerFactory());
 							var solid = engine.Create(gri, null);
 							if (solid != null)
 							{
diff --git a/Xbim.Presentation/LayerStyling/BoundingBoxStyler.cs b/Xbim.Presentation/LayerStyling/BoundingBoxStyler.cs
index 3fd2efd6..02055e32 100644
--- a/Xbim.Presentation/LayerStyling/BoundingBoxStyler.cs
+++ b/Xbim.Presentation/LayerStyling/BoundingBoxStyler.cs
@@ -8,6 +8,7 @@
 using System.Windows;
 using System.Windows.Media.Media3D;
 using Xbim.Common;
+using Xbim.Common.Configuration;
 using Xbim.Common.Federation;
 using Xbim.Common.Geometry;
 using Xbim.Ifc;
@@ -28,7 +29,7 @@ public class BoundingBoxStyler : ILayerStyler, IProgressiveLayerStyler
 
         public BoundingBoxStyler(ILogger logger = null)
         {
-            Logger = logger ?? XbimLogging.CreateLogger<BoundingBoxStyler>();
+            Logger = logger ?? XbimServices.Current.CreateLogger<BoundingBoxStyler>();
         }
 
         /// <summary>
diff --git a/Xbim.Presentation/LayerStyling/IndividualElementStyler.cs b/Xbim.Presentation/LayerStyling/IndividualElementStyler.cs
index 0704b8fd..f895c6b3 100644
--- a/Xbim.Presentation/LayerStyling/IndividualElementStyler.cs
+++ b/Xbim.Presentation/LayerStyling/IndividualElementStyler.cs
@@ -9,6 +9,7 @@
 using System.Windows.Media;
 using System.Windows.Media.Media3D;
 using Xbim.Common;
+using Xbim.Common.Configuration;
 using Xbim.Common.Federation;
 using Xbim.Common.Geometry;
 using Xbim.Ifc;
@@ -176,7 +177,7 @@ private void animationEvent(object sender, EventArgs e)
 
 		public IndividualElementStyler(ILogger logger = null)
 		{
-			Logger = logger ?? XbimLogging.CreateLogger<SurfaceLayerStyler>();
+			Logger = logger ?? XbimServices.Current.CreateLogger<SurfaceLayerStyler>();
 		}
 
 		ModelVisual3D op;
diff --git a/Xbim.Presentation/LayerStyling/RandomColorStyler.cs b/Xbim.Presentation/LayerStyling/RandomColorStyler.cs
index a590bcdf..cb1beb10 100644
--- a/Xbim.Presentation/LayerStyling/RandomColorStyler.cs
+++ b/Xbim.Presentation/LayerStyling/RandomColorStyler.cs
@@ -7,6 +7,7 @@
 using System.Windows;
 using System.Windows.Media.Media3D;
 using Xbim.Common;
+using Xbim.Common.Configuration;
 using Xbim.Common.Federation;
 using Xbim.Common.Geometry;
 using Xbim.Ifc;
@@ -24,7 +25,7 @@ public class RandomColorStyler : ILayerStyler, IProgressiveLayerStyler
 
         public RandomColorStyler(ILogger logger = null)
         {
-            Logger = logger ?? XbimLogging.CreateLogger<RandomColorStyler>();
+            Logger = logger ?? XbimServices.Current.CreateLogger<RandomColorStyler>();
         }
 
         /// <summary>
diff --git a/Xbim.Presentation/LayerStyling/SurfaceLayerStyler.cs b/Xbim.Presentation/LayerStyling/SurfaceLayerStyler.cs
index b6b5c277..4c1ddeba 100644
--- a/Xbim.Presentation/LayerStyling/SurfaceLayerStyler.cs
+++ b/Xbim.Presentation/LayerStyling/SurfaceLayerStyler.cs
@@ -7,6 +7,7 @@
 using System.Windows;
 using System.Windows.Media.Media3D;
 using Xbim.Common;
+using Xbim.Common.Configuration;
 using Xbim.Common.Federation;
 using Xbim.Common.Geometry;
 using Xbim.Ifc;
@@ -26,7 +27,7 @@ public class SurfaceLayerStyler : ILayerStyler, IProgressiveLayerStyler
 
         public SurfaceLayerStyler(ILogger logger = null)
         {
-            Logger = logger ?? XbimLogging.CreateLogger<SurfaceLayerStyler>();
+            Logger = logger ?? XbimServices.Current.CreateLogger<SurfaceLayerStyler>();
         }
 
         /// <summary>
diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index 92a489a0..8bc704b6 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -23,10 +23,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="HelixToolkit.Core.Wpf" Version="2.23.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
-    <PackageReference Include="Xbim.Essentials" Version="5.9.376-develop" />
-    <PackageReference Include="Xbim.Geometry" Version="6.1.614-netcore" />
+    <PackageReference Include="Xbim.Essentials" Version="6.0.410-develop" />
+    <PackageReference Include="Xbim.Geometry.Engine.Interop" Version="6.1.652-netcore" />
+    <PackageReference Include="Xbim.ModelGeometry.Scene" Version="6.1.652-netcore" />
+   
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.de.resx">
diff --git a/Xbim.WinformsSample/FormExample.cs b/Xbim.WinformsSample/FormExample.cs
index dff0c8e2..f6deae55 100644
--- a/Xbim.WinformsSample/FormExample.cs
+++ b/Xbim.WinformsSample/FormExample.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using Xbim.Common;
+using Xbim.Common.Configuration;
 using Xbim.Ifc;
 using Xbim.Ifc4.Interfaces;
 using Xbim.ModelGeometry.Scene;
@@ -21,8 +22,7 @@ public partial class FormExample : Form
         public FormExample(ILogger logger = null)
         {
             InitializeComponent();
-            Logger = logger ?? XbimLogging.CreateLogger<FormExample>();
-            //IfcStore.ModelProviderFactory.UseHeuristicModelProvider();
+            Logger = logger ?? XbimServices.Current.CreateLogger<FormExample>();
             _wpfControl = new WinformsAccessibleControl();
             _wpfControl.SelectionChanged += _wpfControl_SelectionChanged;
            
diff --git a/XbimXplorer/Commands/wdwCommands.xaml.cs b/XbimXplorer/Commands/wdwCommands.xaml.cs
index aad9dad2..cff480d6 100644
--- a/XbimXplorer/Commands/wdwCommands.xaml.cs
+++ b/XbimXplorer/Commands/wdwCommands.xaml.cs
@@ -38,6 +38,7 @@
 using HelixToolkit.Wpf;
 using System.Threading.Tasks;
 using System.Threading;
+using Xbim.Common.Configuration;
 
 // todo: see if gemini is a good candidate for a network based ui experience in xbim.
 // https://github.com/tgjones/gemini
@@ -809,7 +810,7 @@ private void ProcessGeometryEngineCommand(Match m)
 			var labels = GetSelection(m).ToArray();
 			if (labels.Any())
 			{
-				var engine = new XbimGeometryEngine();
+				var engine = new XbimGeometryEngine(Model, XbimServices.Current.GetLoggerFactory());
 				foreach (var label in labels)
 				{
 					var entity = Model.Instances[label];
@@ -1037,18 +1038,18 @@ private void ProcessBrepCommand(Match m)
 					if (entity is IIfcProduct)
 					{
 						var prod = (IIfcProduct)entity;
-						trsf = XbimPlacementTree.GetTransform(prod, pt, new XbimGeometryEngine());
+						trsf = XbimPlacementTree.GetTransform(prod, pt, new XbimGeometryEngine(Model, XbimServices.Current.GetLoggerFactory()));
 						entities.Clear();
 						entities.AddRange(prod.Representation?.Representations.SelectMany(x => x.Items));
 					}
 					else if (entity is IIfcRelVoidsElement)
 					{
 						var prod = ((IIfcRelVoidsElement)entity).RelatedOpeningElement;
-						trsf = XbimPlacementTree.GetTransform(prod, pt, new XbimGeometryEngine());
+						trsf = XbimPlacementTree.GetTransform(prod, pt, new XbimGeometryEngine(Model, XbimServices.Current.GetLoggerFactory()));
 						entities.Clear();
 						entities.AddRange(prod.Representation?.Representations.SelectMany(x => x.Items));
 					}
-					var engine = new XbimGeometryEngine();
+					var engine = new XbimGeometryEngine(Model, XbimServices.Current.GetLoggerFactory());
 					var ifcFile = ((IfcStore)Model).FileName;
 					foreach (var solEntity in entities)
 					{
@@ -1356,7 +1357,7 @@ private void ProcessClipCommand(Match m)
                 if (storey != null)
                 {
                     var placementTree = new XbimPlacementTree(storey.Model, App.ContextWcsAdjustment);
-                    var trsf = XbimPlacementTree.GetTransform(storey, placementTree, new XbimGeometryEngine());
+                    var trsf = XbimPlacementTree.GetTransform(storey, placementTree, new XbimGeometryEngine(storey.Model, XbimServices.Current.GetLoggerFactory()));
                     var off = trsf.OffsetZ;
                     var pt = new XbimPoint3D(0, 0, off);
 
diff --git a/XbimXplorer/XbimXplorer.csproj b/XbimXplorer/XbimXplorer.csproj
index 2a9a0700..c6fc4512 100644
--- a/XbimXplorer/XbimXplorer.csproj
+++ b/XbimXplorer/XbimXplorer.csproj
@@ -63,7 +63,7 @@
 		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
 		<PackageReference Include="System.Linq.Async.Queryable" Version="6.0.1" />
 		<PackageReference Include="System.Reflection.MetadataLoadContext" Version="7.0.0" />
-    <PackageReference Include="Xbim.IO.Esent" Version="5.9.376-develop" />
+    <PackageReference Include="Xbim.IO.Esent" Version="6.0.410-develop" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Xbim.Presentation\Xbim.Presentation.csproj" />
diff --git a/XbimXplorer/XplorerMainWindow.xaml.cs b/XbimXplorer/XplorerMainWindow.xaml.cs
index 91f46a4f..ce2f3cfc 100644
--- a/XbimXplorer/XplorerMainWindow.xaml.cs
+++ b/XbimXplorer/XplorerMainWindow.xaml.cs
@@ -47,6 +47,8 @@
 using Xbim.IO;
 using Xbim.Geometry.Engine.Interop;
 using System.Windows.Media;
+using Xbim.Common.Configuration;
+using Xbim.Geometry.Engine.Interop.Extensions;
 
 
 #endregion
@@ -119,9 +121,8 @@ private void SetOpenedModelFileName(string ifcFilename)
 
         public XplorerMainWindow(bool preventPluginLoad = false)
         {
-            // So we can use *.xbim files.
-            IfcStore.ModelProviderFactory.UseHeuristicModelProvider();
             
+
             LogSink = new InMemoryLogSink { Tag = "MainWindow" };
             LogSink.Logged += LogEvent_Added;
             LogSink.EventsLimit = 5000; // log event's minute
@@ -141,7 +142,14 @@ public XplorerMainWindow(bool preventPluginLoad = false)
                 .Enrich.FromLogContext()
                 .CreateLogger();
             // Set XBIM Essentials/Geometries's LoggerFactory - so Serilog drives everything.
-            XbimLogging.LoggerFactory = LoggerFactory;
+            
+            // So we can use *.xbim files in IfcStore
+            XbimServices.Current.ConfigureServices(s => s.AddXbimToolkit(opt => opt
+                .AddHeuristicModel()
+                .AddLoggerFactory(LoggerFactory)
+                .AddGeometryServices(builder => builder.SetVersion(Xbim.Geometry.Abstractions.XGeometryEngineVersion.V6))
+                )
+            );
 
             Logger = LoggerFactory.CreateLogger<XplorerMainWindow>();
 

From 884bb171f4f5566b832730e37ceb472dd36b8832 Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Fri, 3 Mar 2023 15:14:37 +0000
Subject: [PATCH 11/18] Updated latest GE from feature/netcore Includes SRL fix
 for Cylindrical surface in advanced breps

---
 Xbim.Presentation/Xbim.Presentation.csproj | 6 +++---
 XbimXplorer/XbimXplorer.csproj             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index 8bc704b6..2ac0dd8b 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -26,9 +26,9 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
-    <PackageReference Include="Xbim.Essentials" Version="6.0.410-develop" />
-    <PackageReference Include="Xbim.Geometry.Engine.Interop" Version="6.1.652-netcore" />
-    <PackageReference Include="Xbim.ModelGeometry.Scene" Version="6.1.652-netcore" />
+    <PackageReference Include="Xbim.Essentials" Version="6.0.414-develop" />
+    <PackageReference Include="Xbim.Geometry.Engine.Interop" Version="6.1.663-netcore" />
+    <PackageReference Include="Xbim.ModelGeometry.Scene" Version="6.1.663-netcore" />
    
   </ItemGroup>
   <ItemGroup>
diff --git a/XbimXplorer/XbimXplorer.csproj b/XbimXplorer/XbimXplorer.csproj
index c6fc4512..794b80be 100644
--- a/XbimXplorer/XbimXplorer.csproj
+++ b/XbimXplorer/XbimXplorer.csproj
@@ -63,7 +63,7 @@
 		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
 		<PackageReference Include="System.Linq.Async.Queryable" Version="6.0.1" />
 		<PackageReference Include="System.Reflection.MetadataLoadContext" Version="7.0.0" />
-    <PackageReference Include="Xbim.IO.Esent" Version="6.0.410-develop" />
+    <PackageReference Include="Xbim.IO.Esent" Version="6.0.414-develop" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Xbim.Presentation\Xbim.Presentation.csproj" />

From bd20d11a82abd9d4cec7288feb5db125e3a49548 Mon Sep 17 00:00:00 2001
From: Steve Lockley <steve.lockley@xbim.net>
Date: Mon, 27 Mar 2023 19:13:10 +0100
Subject: [PATCH 12/18] Updated geometry engine

---
 Xbim.Presentation/Xbim.Presentation.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index 2ac0dd8b..62159f20 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -27,8 +27,8 @@
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
     <PackageReference Include="Xbim.Essentials" Version="6.0.414-develop" />
-    <PackageReference Include="Xbim.Geometry.Engine.Interop" Version="6.1.663-netcore" />
-    <PackageReference Include="Xbim.ModelGeometry.Scene" Version="6.1.663-netcore" />
+    <PackageReference Include="Xbim.Geometry.Engine.Interop" Version="6.1.680-netcore" />
+    <PackageReference Include="Xbim.ModelGeometry.Scene" Version="6.1.680-netcore" />
    
   </ItemGroup>
   <ItemGroup>

From 88cc8be5872bcdc2a81cd20efd9d11274d615087 Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Wed, 12 Apr 2023 16:36:31 +0100
Subject: [PATCH 13/18] Updated latest GE

---
 Xbim.Presentation/Xbim.Presentation.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index 62159f20..746d309e 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -27,8 +27,8 @@
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
     <PackageReference Include="Xbim.Essentials" Version="6.0.414-develop" />
-    <PackageReference Include="Xbim.Geometry.Engine.Interop" Version="6.1.680-netcore" />
-    <PackageReference Include="Xbim.ModelGeometry.Scene" Version="6.1.680-netcore" />
+    <PackageReference Include="Xbim.Geometry.Engine.Interop" Version="6.1.687-netcore" />
+    <PackageReference Include="Xbim.ModelGeometry.Scene" Version="6.1.687-netcore" />
    
   </ItemGroup>
   <ItemGroup>

From 37b7951611fe3d877b7b79abced2481c55392b20 Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Wed, 12 Apr 2023 16:38:08 +0100
Subject: [PATCH 14/18] Updated 3rd party dependencies

---
 Tests/Tests.csproj             | 2 +-
 XbimXplorer/XbimXplorer.csproj | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index b8ed1290..c17f5083 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -7,7 +7,7 @@
     <Platforms>AnyCPU;x86</Platforms>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
     <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
   </ItemGroup>
diff --git a/XbimXplorer/XbimXplorer.csproj b/XbimXplorer/XbimXplorer.csproj
index 794b80be..7a24d3f8 100644
--- a/XbimXplorer/XbimXplorer.csproj
+++ b/XbimXplorer/XbimXplorer.csproj
@@ -55,9 +55,9 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="DotNetZip" Version="1.16.0" />
-		<PackageReference Include="Dirkster.AvalonDock" Version="4.71.1" />
+		<PackageReference Include="Dirkster.AvalonDock" Version="4.72.0" />
 		<PackageReference Include="HelixToolkit.Core.Wpf" Version="2.23.0" />
-		<PackageReference Include="NuGet.Protocol" Version="6.4.0" />
+		<PackageReference Include="NuGet.Protocol" Version="6.5.0" />
 		<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />

From 9385bbeff3ade7bc72173310f27f6677ee5e889e Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Fri, 1 Sep 2023 17:02:33 +0100
Subject: [PATCH 15/18] Updated latest Geometry

---
 Directory.Build.props                      | 2 +-
 Xbim.Presentation/Xbim.Presentation.csproj | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 9ede1f7f..7f67e906 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <GenerateDocumentationFile Condition=" '$(IsTestProject)' != 'true' ">true</GenerateDocumentationFile>
-    <NoWarn>CS1591</NoWarn>
+    <NoWarn>CS1591;NU1603</NoWarn>
   </PropertyGroup>
   
   <PropertyGroup>
diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index 746d309e..71b14ba4 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -27,8 +27,7 @@
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
     <PackageReference Include="Xbim.Essentials" Version="6.0.414-develop" />
-    <PackageReference Include="Xbim.Geometry.Engine.Interop" Version="6.1.687-netcore" />
-    <PackageReference Include="Xbim.ModelGeometry.Scene" Version="6.1.687-netcore" />
+    <PackageReference Include="Xbim.ModelGeometry.Scene" Version="6.1.723-netcore" />
    
   </ItemGroup>
   <ItemGroup>

From 60967e2a2d0f3a31238a73c37214679d7a96b048 Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Tue, 5 Dec 2023 12:43:42 +0000
Subject: [PATCH 16/18] Update to latest v6 GE

---
 Xbim.Presentation/Xbim.Presentation.csproj | 4 ++--
 XbimXplorer/XbimXplorer.csproj             | 4 ++--
 XbimXplorer/XplorerMainWindow.xaml.cs      | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index 71b14ba4..c7d80ba0 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -26,8 +26,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
-    <PackageReference Include="Xbim.Essentials" Version="6.0.414-develop" />
-    <PackageReference Include="Xbim.ModelGeometry.Scene" Version="6.1.723-netcore" />
+    <PackageReference Include="Xbim.Essentials" Version="6.0.436-develop" />
+    <PackageReference Include="Xbim.ModelGeometry.Scene" Version="6.1.739-netcore" />
    
   </ItemGroup>
   <ItemGroup>
diff --git a/XbimXplorer/XbimXplorer.csproj b/XbimXplorer/XbimXplorer.csproj
index 7a24d3f8..06000c48 100644
--- a/XbimXplorer/XbimXplorer.csproj
+++ b/XbimXplorer/XbimXplorer.csproj
@@ -57,13 +57,13 @@
 		<PackageReference Include="DotNetZip" Version="1.16.0" />
 		<PackageReference Include="Dirkster.AvalonDock" Version="4.72.0" />
 		<PackageReference Include="HelixToolkit.Core.Wpf" Version="2.23.0" />
-		<PackageReference Include="NuGet.Protocol" Version="6.5.0" />
+		<PackageReference Include="NuGet.Protocol" Version="6.5.1" />
 		<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
 		<PackageReference Include="System.Linq.Async.Queryable" Version="6.0.1" />
 		<PackageReference Include="System.Reflection.MetadataLoadContext" Version="7.0.0" />
-    <PackageReference Include="Xbim.IO.Esent" Version="6.0.414-develop" />
+    <PackageReference Include="Xbim.IO.Esent" Version="6.0.436-develop" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Xbim.Presentation\Xbim.Presentation.csproj" />
diff --git a/XbimXplorer/XplorerMainWindow.xaml.cs b/XbimXplorer/XplorerMainWindow.xaml.cs
index ce2f3cfc..ef2b81f6 100644
--- a/XbimXplorer/XplorerMainWindow.xaml.cs
+++ b/XbimXplorer/XplorerMainWindow.xaml.cs
@@ -48,7 +48,6 @@
 using Xbim.Geometry.Engine.Interop;
 using System.Windows.Media;
 using Xbim.Common.Configuration;
-using Xbim.Geometry.Engine.Interop.Extensions;
 
 
 #endregion

From d5bbf2ff6209ef1eb1de81ea600e9d8c2c2646cb Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Tue, 5 Dec 2023 12:50:47 +0000
Subject: [PATCH 17/18] Updated latest dependencies (net6)

---
 Tests/Tests.csproj                         | 6 +++---
 Xbim.Presentation/Xbim.Presentation.csproj | 2 +-
 XbimXplorer/Simplify/IfcSimplify.xaml.cs   | 3 +--
 XbimXplorer/XbimXplorer.csproj             | 6 +++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index c17f5083..f9ab8717 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -7,9 +7,9 @@
     <Platforms>AnyCPU;x86</Platforms>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xbim.Presentation\Xbim.Presentation.csproj" />
diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index c7d80ba0..ad5ddfbf 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -22,7 +22,7 @@
     <Resource Include="assets\*.*" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HelixToolkit.Core.Wpf" Version="2.23.0" />
+    <PackageReference Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
diff --git a/XbimXplorer/Simplify/IfcSimplify.xaml.cs b/XbimXplorer/Simplify/IfcSimplify.xaml.cs
index fc0bf89b..b16dfdf3 100644
--- a/XbimXplorer/Simplify/IfcSimplify.xaml.cs
+++ b/XbimXplorer/Simplify/IfcSimplify.xaml.cs
@@ -440,9 +440,8 @@ private void RecursiveAdd(int ifcIndex, bool includeProperties = false)
 
         private void CmdAdd_Click(object sender, RoutedEventArgs e)
         {
-            var v = SelectedIfcIndex;
             TxtHandPicked.Text += SelectedIfcIndex + Environment.NewLine;
-            RecursiveAdd(SelectedIfcIndex);
+            RecursiveAdd(SelectedIfcIndex, PreserveProps.IsChecked == false);
 
             ConsiderManualSelection();
         }
diff --git a/XbimXplorer/XbimXplorer.csproj b/XbimXplorer/XbimXplorer.csproj
index 06000c48..4f99d6e6 100644
--- a/XbimXplorer/XbimXplorer.csproj
+++ b/XbimXplorer/XbimXplorer.csproj
@@ -55,9 +55,9 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="DotNetZip" Version="1.16.0" />
-		<PackageReference Include="Dirkster.AvalonDock" Version="4.72.0" />
-		<PackageReference Include="HelixToolkit.Core.Wpf" Version="2.23.0" />
-		<PackageReference Include="NuGet.Protocol" Version="6.5.1" />
+		<PackageReference Include="Dirkster.AvalonDock" Version="4.72.1" />
+		<PackageReference Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
+		<PackageReference Include="NuGet.Protocol" Version="6.8.0" />
 		<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />

From 6a2ee1cc7262814bbc36d19d80e0111ff8d6a492 Mon Sep 17 00:00:00 2001
From: Andy Ward <andy.ward@xbim.net>
Date: Tue, 5 Dec 2023 13:13:45 +0000
Subject: [PATCH 18/18] Updated main app to .NET 8

---
 Xbim.Presentation/Xbim.Presentation.csproj |  4 ++--
 XbimXplorer/Dialogs/AboutWindow.xaml.cs    | 11 +++++++++--
 XbimXplorer/XbimXplorer.csproj             |  8 ++++----
 XbimXplorer/XplorerMainWindow.xaml.cs      | 10 +++-------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Xbim.Presentation/Xbim.Presentation.csproj b/Xbim.Presentation/Xbim.Presentation.csproj
index ad5ddfbf..e2474338 100644
--- a/Xbim.Presentation/Xbim.Presentation.csproj
+++ b/Xbim.Presentation/Xbim.Presentation.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
     <PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
     <PackageReference Include="Xbim.Essentials" Version="6.0.436-develop" />
     <PackageReference Include="Xbim.ModelGeometry.Scene" Version="6.1.739-netcore" />
diff --git a/XbimXplorer/Dialogs/AboutWindow.xaml.cs b/XbimXplorer/Dialogs/AboutWindow.xaml.cs
index 8093fad3..323a301d 100644
--- a/XbimXplorer/Dialogs/AboutWindow.xaml.cs
+++ b/XbimXplorer/Dialogs/AboutWindow.xaml.cs
@@ -82,10 +82,17 @@ public string RuntimeArchitecture
         {
             get
             {
-                return string.Format(".NET Runtime: {1} ({0})", typeof(string).Assembly.GetName().ProcessorArchitecture, System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription);
+                var architecture = GetArchitecture(Assembly.GetEntryAssembly());
+                return string.Format(".NET Runtime: {1} ({0})", architecture, System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription);
             }
         }
 
+        private ImageFileMachine GetArchitecture(Assembly assembly)
+        {
+            assembly.Modules.First().GetPEKind(out var pekind, out var machine);
+            return machine;
+        }
+
         public string AssembliesInfo
         {
             get
@@ -125,7 +132,7 @@ private void DocumentSingleAssembly(Assembly a, StringBuilder sb)
             var xa = new XbimAssemblyInfo(a);
             if (string.IsNullOrEmpty(a.Location))
                 xa.OverrideLocation = MainWindow.GetAssemblyLocation(a);
-            var assemblyDescription = $"{a.GetName().Name,-32}{xa.AssemblyVersion,16}{xa.FileVersion,16}{a.GetName().ProcessorArchitecture,6}\r\n";
+            var assemblyDescription = $"{a.GetName().Name,-32}{xa.AssemblyVersion,16}{xa.FileVersion,16}{GetArchitecture(a),6}\r\n";
             sb.Append(assemblyDescription);
         }
 
diff --git a/XbimXplorer/XbimXplorer.csproj b/XbimXplorer/XbimXplorer.csproj
index 4f99d6e6..6676fd91 100644
--- a/XbimXplorer/XbimXplorer.csproj
+++ b/XbimXplorer/XbimXplorer.csproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-windows</TargetFrameworks>
-		<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
+		<TargetFrameworks>net8.0-windows</TargetFrameworks>
+		<RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
 		<OutputType>WinExe</OutputType>
 		<Title>Xbim Xplorer</Title>
 		<Description>
@@ -59,10 +59,10 @@
 		<PackageReference Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
 		<PackageReference Include="NuGet.Protocol" Version="6.8.0" />
 		<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
-		<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+		<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
 		<PackageReference Include="System.Linq.Async.Queryable" Version="6.0.1" />
-		<PackageReference Include="System.Reflection.MetadataLoadContext" Version="7.0.0" />
+		<PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.0" />
     <PackageReference Include="Xbim.IO.Esent" Version="6.0.436-develop" />
 	</ItemGroup>
 	<ItemGroup>
diff --git a/XbimXplorer/XplorerMainWindow.xaml.cs b/XbimXplorer/XplorerMainWindow.xaml.cs
index ef2b81f6..240d8b2c 100644
--- a/XbimXplorer/XplorerMainWindow.xaml.cs
+++ b/XbimXplorer/XplorerMainWindow.xaml.cs
@@ -330,12 +330,8 @@ private void OpenAcceptableExtension(object s, DoWorkEventArgs args)
                             }
                             catch (Exception geomEx)
                             {
-                                var sb = new StringBuilder();
-                                sb.AppendLine($"Error creating geometry context of '{selectedFilename}' {geomEx.StackTrace}.");
-                                var platform = typeof(XplorerMainWindow).Assembly.GetName().ProcessorArchitecture;
-                                var platform2 = typeof(Xbim3DModelContext).Assembly.GetName().ProcessorArchitecture;
-                                var newexception = new Exception(sb.ToString(), geomEx);
-                                Logger.LogError(0, newexception, "Error creating geometry context of {filename}", selectedFilename);
+                                Logger.LogError(geomEx, "Error creating geometry context of {filename}", selectedFilename);
+                                throw;
                             }
                         }
                     }
@@ -387,10 +383,10 @@ private void OpenAcceptableExtension(object s, DoWorkEventArgs args)
             }
             catch (Exception ex)
             {
+                Logger.LogError(ex, "Error opening {filename}", selectedFilename);
                 var sb = new StringBuilder();
                 sb.AppendLine($"Error opening '{selectedFilename}' {ex.StackTrace}.");
                 var newexception = new Exception(sb.ToString(), ex);
-                Logger.LogError(0, ex, "Error opening {filename}", selectedFilename);
                 args.Result = newexception;
             }
         }