Merge pull request #35 from AlexeyZarubin/issues/34-invalid-cast-exception

Bug #34: InvalidCastException is raised when using AssemblyRunner
Merge pull request #40 from takazoe/feature/2024
2024-05-13 10:54:15 -05:00 · 2024-04-25 14:24:45 -05:00 · 2024-04-06 11:00:56 +09:00 · 2023-11-14 15:39:52 +02:00 · 2023-06-07 16:06:08 +01:00
14 changed files with 163 additions and 29 deletions
@@ -25,8 +25,6 @@ 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}"
@@ -46,6 +44,12 @@ 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
@@ -76,10 +80,6 @@ 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,6 +100,18 @@ 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
@@ -111,15 +123,26 @@ 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
@@ -0,0 +1,9 @@
+{
+  "profiles": {
+    "Profile 1": {
+      "commandName": "Executable",
+      "executablePath": "$(ProgramW6432)\\Autodesk\\Revit 2024\\Revit.exe",
+      "remoteDebugEnabled": true
+    }
+  }
+}
@@ -0,0 +1,16 @@
+<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>
@@ -30,6 +30,17 @@ 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;
    }
@@ -25,6 +25,8 @@ 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",
@@ -33,10 +35,7 @@ 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
@@ -2,5 +2,5 @@
  "startupAssemblies": [
    "C:\\Code\\Speckle-Next\\ConverterRevit\\ConverterRevitTests\\bin\\Debug\\ConverterRevitTests.dll"
  ],
-  "autoStart": true
+  "autoStart": false
 }
@@ -24,9 +24,6 @@
    <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>
@@ -8,10 +8,22 @@

  <ItemGroup>
    <PackageReference Include="ModPlus.Revit.API.2019" Version="4.0.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf.csproj" />
+    <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>
@@ -9,11 +9,23 @@

  <ItemGroup>
    <PackageReference Include="ModPlus.Revit.API.2020" Version="4.0.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
  </ItemGroup>


  <ItemGroup>
-    <ProjectReference Include="..\..\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf.csproj" />
+    <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>
@@ -14,7 +14,18 @@


  <ItemGroup>
-    <ProjectReference Include="..\..\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf.csproj" />
+    <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>
@@ -11,11 +11,23 @@
    <PackageReference Include="Speckle.Revit.API" Version="2022.0.2.1">
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
+    <PackageReference Include="xunit" Version="2.4.2" />
  </ItemGroup>


  <ItemGroup>
-    <ProjectReference Include="..\..\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf.csproj" />
+    <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>
@@ -16,7 +16,18 @@


  <ItemGroup>
-    <ProjectReference Include="..\..\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf\speckle.xunit.runner.wpf.csproj" />
+    <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>
@@ -0,0 +1,31 @@
+<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>
@@ -1,7 +1,6 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 using Xunit;
-using Xunit.Runner.Wpf.ViewModel;

 namespace xUnitRevitUtils
 {
@@ -14,7 +13,6 @@ 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;
@@ -22,14 +20,6 @@ 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
Author	SHA1	Message	Date
connorivy	90c9edc96f	Merge pull request #35 from AlexeyZarubin/issues/34-invalid-cast-exception Build / build (Release) (push) Has been cancelled Details Bug #34: InvalidCastException is raised when using AssemblyRunner	2024-05-13 10:54:15 -05:00
connorivy	689cd832b4	Merge pull request #40 from takazoe/feature/2024 Support for 2024	2024-04-25 14:24:45 -05:00
Shotaro Takazoe	c2bd5d6f47	Support for 2024	2024-04-06 11:00:56 +09:00
Oleksii Zarubin	f50e45f564	Bug #34 : InvalidCastException is raised when using AssemblyRunner 1) Fix an issue by adding an AssemblyResolve to find a missing xunit libraries.	2023-11-14 15:39:52 +02:00
Matteo Cominetti	087788f7a1	feat: update deps Publish nugets / build (push) Has been cancelled Details	2023-06-07 16:06:08 +01:00