Merge remote-tracking branch 'origin/master' into connor/allow-view-model-access

xUnitRevit.sln

@@ -25,6 +25,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xUnitRevitUtils2020", "xUni
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xUnitRevitUtils2019", "xUnitRevitUtils\xUnitRevitUtils2019\xUnitRevitUtils2019.csproj", "{469F8B29-F14E-49E8-B145-8C4FEF9D68CA}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "speckle.xunit.runner.wpf", "speckle.xunit.runner.wpf\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf.csproj", "{B6404BAD-9314-45F9-9F4D-A644D986FC37}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extra", "Extra", "{B01105F5-963D-42C3-BFA7-2D26AC375D07}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xUnitRevitRunner", "xUnitRevitRunner", "{CF685C5E-70E1-40C5-BCFD-1E27695F0364}"
@@ -44,12 +46,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xUnitRevitRunner2022", "xUn
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xUnitRevitRunner2023", "xUnitRevitRunner\xUnitRevitRunner2023\xUnitRevitRunner2023.csproj", "{97D93392-9484-484F-9F5F-60C5F3D67045}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "speckle.xunit.runner.wpf", "speckle.xunit.runner.wpf\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf.csproj", "{54B0C195-2AF8-47EE-805A-07F8FD1E7CAA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xUnitRevitUtils2024", "xUnitRevitUtils\xUnitRevitUtils2024\xUnitRevitUtils2024.csproj", "{DE7A457B-8591-486F-B7D5-D609741680CC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xUnitRevitRunner2024", "xUnitRevitRunner\xUnitRevitRunner2024\xUnitRevitRunner2024.csproj", "{166086EC-696B-48D3-96A1-697C6C3936E7}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -80,6 +76,10 @@ Global
 		{469F8B29-F14E-49E8-B145-8C4FEF9D68CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{469F8B29-F14E-49E8-B145-8C4FEF9D68CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{469F8B29-F14E-49E8-B145-8C4FEF9D68CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6404BAD-9314-45F9-9F4D-A644D986FC37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6404BAD-9314-45F9-9F4D-A644D986FC37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6404BAD-9314-45F9-9F4D-A644D986FC37}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6404BAD-9314-45F9-9F4D-A644D986FC37}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E3A15534-FB02-4CE2-8126-22E60EB1922E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E3A15534-FB02-4CE2-8126-22E60EB1922E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E3A15534-FB02-4CE2-8126-22E60EB1922E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -100,18 +100,6 @@ Global
 		{97D93392-9484-484F-9F5F-60C5F3D67045}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{97D93392-9484-484F-9F5F-60C5F3D67045}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{97D93392-9484-484F-9F5F-60C5F3D67045}.Release|Any CPU.Build.0 = Release|Any CPU
-		{54B0C195-2AF8-47EE-805A-07F8FD1E7CAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54B0C195-2AF8-47EE-805A-07F8FD1E7CAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54B0C195-2AF8-47EE-805A-07F8FD1E7CAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{54B0C195-2AF8-47EE-805A-07F8FD1E7CAA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE7A457B-8591-486F-B7D5-D609741680CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE7A457B-8591-486F-B7D5-D609741680CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE7A457B-8591-486F-B7D5-D609741680CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE7A457B-8591-486F-B7D5-D609741680CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{166086EC-696B-48D3-96A1-697C6C3936E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{166086EC-696B-48D3-96A1-697C6C3936E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{166086EC-696B-48D3-96A1-697C6C3936E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{166086EC-696B-48D3-96A1-697C6C3936E7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -123,26 +111,15 @@ Global
 		{441C42B5-400D-4EA3-9F2A-26B80CF37E8E} = {EDC05463-E574-4FF0-8518-D93D70EC138C}
 		{6118A3C3-479F-4CA9-BB00-9FCBF55BF8B8} = {EDC05463-E574-4FF0-8518-D93D70EC138C}
 		{469F8B29-F14E-49E8-B145-8C4FEF9D68CA} = {EDC05463-E574-4FF0-8518-D93D70EC138C}
+		{B6404BAD-9314-45F9-9F4D-A644D986FC37} = {B01105F5-963D-42C3-BFA7-2D26AC375D07}
 		{2B4F4767-CF26-485B-ADB3-751250EB1CDB} = {CF685C5E-70E1-40C5-BCFD-1E27695F0364}
 		{E3A15534-FB02-4CE2-8126-22E60EB1922E} = {CF685C5E-70E1-40C5-BCFD-1E27695F0364}
 		{3782DB94-2F99-4449-B727-D5E4172964AD} = {CF685C5E-70E1-40C5-BCFD-1E27695F0364}
 		{66615756-3C3F-4A46-9C00-D6BA2493B6FA} = {CF685C5E-70E1-40C5-BCFD-1E27695F0364}
 		{72816F5F-F86C-4A84-A4BB-9C05F2CD5320} = {CF685C5E-70E1-40C5-BCFD-1E27695F0364}
 		{97D93392-9484-484F-9F5F-60C5F3D67045} = {CF685C5E-70E1-40C5-BCFD-1E27695F0364}
-		{54B0C195-2AF8-47EE-805A-07F8FD1E7CAA} = {B01105F5-963D-42C3-BFA7-2D26AC375D07}
-		{DE7A457B-8591-486F-B7D5-D609741680CC} = {EDC05463-E574-4FF0-8518-D93D70EC138C}
-		{166086EC-696B-48D3-96A1-697C6C3936E7} = {CF685C5E-70E1-40C5-BCFD-1E27695F0364}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1CD726E4-6BBA-4FC3-9C57-0981EF1A9475}
 	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		xUnitRevitRunner\xUnitRevitRunnerShared\xUnitRevitRunnerShared.projitems*{166086ec-696b-48d3-96a1-697c6c3936e7}*SharedItemsImports = 5
-		xUnitRevitRunner\xUnitRevitRunnerShared\xUnitRevitRunnerShared.projitems*{2b4f4767-cf26-485b-adb3-751250eb1cdb}*SharedItemsImports = 13
-		xUnitRevitRunner\xUnitRevitRunnerShared\xUnitRevitRunnerShared.projitems*{3782db94-2f99-4449-b727-d5e4172964ad}*SharedItemsImports = 5
-		xUnitRevitRunner\xUnitRevitRunnerShared\xUnitRevitRunnerShared.projitems*{66615756-3c3f-4a46-9c00-d6ba2493b6fa}*SharedItemsImports = 5
-		xUnitRevitRunner\xUnitRevitRunnerShared\xUnitRevitRunnerShared.projitems*{72816f5f-f86c-4a84-a4bb-9c05f2cd5320}*SharedItemsImports = 5
-		xUnitRevitRunner\xUnitRevitRunnerShared\xUnitRevitRunnerShared.projitems*{97d93392-9484-484f-9f5f-60c5f3d67045}*SharedItemsImports = 5
-		xUnitRevitRunner\xUnitRevitRunnerShared\xUnitRevitRunnerShared.projitems*{e3a15534-fb02-4ce2-8126-22e60eb1922e}*SharedItemsImports = 5
-	EndGlobalSection
 EndGlobal

xUnitRevitRunner/xUnitRevitRunner2024/Properties/launchSettings.json

@@ -1,9 +0,0 @@
-{
-  "profiles": {
-    "Profile 1": {
-      "commandName": "Executable",
-      "executablePath": "$(ProgramW6432)\\Autodesk\\Revit 2024\\Revit.exe",
-      "remoteDebugEnabled": true
-    }
-  }
-}

xUnitRevitRunner/xUnitRevitRunner2024/xUnitRevitRunner2024.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
-    <RevitVersion>2024</RevitVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Speckle.Revit.API" Version="2024.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-
-    <ProjectReference Include="..\..\xUnitRevitUtils\xUnitRevitUtils2024\xUnitRevitUtils2024.csproj" />
-  </ItemGroup>
-</Project>

xUnitRevitRunner/xUnitRevitRunnerShared/App.cs

@@ -30,17 +30,6 @@ namespace xUnitRevit
         xUnitRevitButton.SetContextualHelp(new ContextualHelp(ContextualHelpType.Url, "https://speckle.systems"));
       }
 
-      AppDomain.CurrentDomain.AssemblyResolve += delegate (object sender, ResolveEventArgs e)
-      {
-        String currentFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-        AssemblyName requestedName = new AssemblyName(e.Name);
-        if (requestedName.Name == "xunit.abstractions" || requestedName.Name == "xunit.runner.utility.net452")
-        {
-          var resolvedAssembly = Assembly.LoadFrom(Path.Combine(currentFolder, requestedName.Name + ".dll"));
-          return resolvedAssembly;
-        }
-        return null;
-      };
 
       return Result.Succeeded;
     }

xUnitRevitRunner/xUnitRevitRunnerShared/Runner.cs

@@ -25,8 +25,6 @@ namespace xUnitRevit
         var queue = new List<Action>();
         var eventHandler = ExternalEvent.Create(new ExternalEventHandler(queue));
 
-        xru.Initialize(uiapp, SynchronizationContext.Current, eventHandler, queue);
-
         var main = new MainWindow
         {
           Title = "xUnit Revit Runner by Speckle",
@@ -35,7 +33,10 @@ namespace xUnitRevit
 
         //pre-load asssemblies, if you're a lazy developer
         if (main.DataContext is MainViewModel mainViewModel)
+        {
+          xru.Initialize(uiapp, SynchronizationContext.Current, eventHandler, queue, mainViewModel);
           mainViewModel.StartupAssemblies = Config.StartupAssemblies.ToList();
+        }
         main.Show();
       }
       catch

xUnitRevitRunner/xUnitRevitRunnerShared/config_sample.json

@@ -2,5 +2,5 @@
   "startupAssemblies": [
     "C:\\Code\\Speckle-Next\\ConverterRevit\\ConverterRevitTests\\bin\\Debug\\ConverterRevitTests.dll"
   ],
-  "autoStart": false
+  "autoStart": true
 }

xUnitRevitRunner/xUnitRevitRunnerShared/xUnitRevitRunnerShared.projitems

@@ -24,6 +24,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Runner.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)config.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="$(MSBuildThisFileDirectory)xUnitRevitRunner.addin">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

xUnitRevitUtils/xUnitRevitUtils2019/xUnitRevitUtils2019.csproj

@@ -8,22 +8,10 @@
 
   <ItemGroup>
     <PackageReference Include="ModPlus.Revit.API.2019" Version="4.0.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="IDisposableAnalyzers" Version="4.0.6">
+    <ProjectReference Include="..\..\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf.csproj" />
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="Meziantou.Analyzer" Version="2.0.60">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="Roslynator.Analyzers" Version="4.3.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
 </Project>

xUnitRevitUtils/xUnitRevitUtils2020/xUnitRevitUtils2020.csproj

@@ -9,23 +9,11 @@
 
   <ItemGroup>
     <PackageReference Include="ModPlus.Revit.API.2020" Version="4.0.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
   </ItemGroup>
 
 
   <ItemGroup>
-    <PackageReference Update="IDisposableAnalyzers" Version="4.0.6">
+    <ProjectReference Include="..\..\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf.csproj" />
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="Meziantou.Analyzer" Version="2.0.60">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="Roslynator.Analyzers" Version="4.3.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
 </Project>

xUnitRevitUtils/xUnitRevitUtils2021/xUnitRevitUtils2021.csproj

@@ -14,18 +14,7 @@
 
 
   <ItemGroup>
-    <PackageReference Update="IDisposableAnalyzers" Version="4.0.6">
+    <ProjectReference Include="..\..\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf.csproj" />
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="Meziantou.Analyzer" Version="2.0.60">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="Roslynator.Analyzers" Version="4.3.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
 </Project>

xUnitRevitUtils/xUnitRevitUtils2022/xUnitRevitUtils2022.csproj

@@ -11,23 +11,11 @@
     <PackageReference Include="Speckle.Revit.API" Version="2022.0.2.1">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.4.2" />
   </ItemGroup>
 
 
   <ItemGroup>
-    <PackageReference Update="IDisposableAnalyzers" Version="4.0.6">
+    <ProjectReference Include="..\..\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf.csproj" />
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="Meziantou.Analyzer" Version="2.0.60">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="Roslynator.Analyzers" Version="4.3.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
 </Project>

xUnitRevitUtils/xUnitRevitUtils2023/xUnitRevitUtils2023.csproj

@@ -16,18 +16,7 @@
 
 
   <ItemGroup>
-    <PackageReference Update="IDisposableAnalyzers" Version="4.0.6">
+    <ProjectReference Include="..\..\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf.csproj" />
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="Meziantou.Analyzer" Version="2.0.60">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="Roslynator.Analyzers" Version="4.3.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
 </Project>

xUnitRevitUtils/xUnitRevitUtils2024/xUnitRevitUtils2024.csproj

@@ -1,31 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-	  <Description>xUnit runner utilities for Revit 2024</Description>
-    <PackageId>xUnitRevitUtils.2024</PackageId>
-  </PropertyGroup>
-
-
-  <ItemGroup>
-    <PackageReference Include="Speckle.Revit.API" Version="2024.0.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-  </ItemGroup>
-
-
-  <ItemGroup>
-    <PackageReference Update="IDisposableAnalyzers" Version="4.0.6">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="Meziantou.Analyzer" Version="2.0.60">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="Roslynator.Analyzers" Version="4.3.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-</Project>

xUnitRevitUtils/xUnitRevitUtilsShared/xru.cs

@@ -1,6 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 using Xunit;
+using Xunit.Runner.Wpf.ViewModel;
 
 namespace xUnitRevitUtils
 {
@@ -13,6 +14,7 @@ namespace xUnitRevitUtils
     private static IList<Action> Queue { get; set; }
     private static ExternalEvent EventHandler { get; set; }
     public static SynchronizationContext UiContext { get; set; }
+    public static MainViewModel MainViewModel { get; set; }
     public static void Initialize(UIApplication uiapp, SynchronizationContext uiContext, ExternalEvent eventHandler, IList<Action> queue)
     {
       Uiapp = uiapp;
@@ -20,6 +22,14 @@ namespace xUnitRevitUtils
       EventHandler = eventHandler;
       Queue = queue;
     }
+    public static void Initialize(UIApplication uiapp, SynchronizationContext uiContext, ExternalEvent eventHandler, IList<Action> queue, MainViewModel vm)
+    {
+      Uiapp = uiapp;
+      UiContext = uiContext;
+      EventHandler = eventHandler;
+      Queue = queue;
+      MainViewModel = vm;
+    }
 
     #region utility methods