refactor: Rewrite Loader in C#

dev/Directory.Build.props

@@ -2,8 +2,6 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-<!--    <TargetFramework>net48</TargetFramework>-->
-<!--    <TargetFrameworks>net48;net8.0-windows</TargetFrameworks>-->
     <PlatformTarget>x64</PlatformTarget>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>

dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitConsts.cs

@@ -170,6 +170,12 @@ public static class PyRevitConsts {
         public const string BundleScriptGrasshopperXPostfix = ".ghx";
         public const string BundleScriptRevitFamilyPostfix = ".rfa";
 
+        // loader settings
+        public const string ConfigsNewLoaderKey = "new_loader";
+        public const bool ConfigsNewLoaderDefault = false;
+        public const string ConfigsUseRoslynKey = "use_roslyn_loader";
+        public const bool ConfigsUseRoslynDefault = false;
+
         // theme
         public static SolidColorBrush PyRevitAccentBrush = new SolidColorBrush(Color.FromArgb(0xFF, 0xf3, 0x9c, 0x12));
         public static SolidColorBrush PyRevitBackgroundBrush = new SolidColorBrush(Color.FromArgb(0xFF, 0x2c, 0x3e, 0x50));

dev/pyRevitLoader/Directory.Build.props

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
+    <PropertyGroup Condition="'$(MSBuildProjectName)' != 'pyRevitAssemblyBuilder'">
         <UseRevit>true</UseRevit>
         <UseWpf>true</UseWpf>
         <UseWindowsForms>true</UseWindowsForms>
+        <UseAssemblyBuilder>true</UseAssemblyBuilder>
         <TargetFrameworks>net48;net8.0-windows</TargetFrameworks>
-
         <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     </PropertyGroup>
 

dev/pyRevitLoader/Directory.Build.targets

@@ -6,7 +6,7 @@
         <None Remove="obj\**" />
     </ItemGroup>
 
-    <ItemGroup Condition="$(UseRunner)=='' OR $(UseRunner)==False">
+    <ItemGroup Condition="$(UseLoader)==True">
         <Compile Include="..\Source\PyRevitLoaderApplication.cs" Link="Source\PyRevitLoaderApplication.cs"/>
         <Compile Include="..\Source\ScriptExecutor.cs" Link="Source\ScriptExecutor.cs"/>
     </ItemGroup>
@@ -17,7 +17,7 @@
         <Compile Include="..\Source\ScriptExecutor.cs" Link="Source\ScriptExecutor.cs"/>
     </ItemGroup>
 
-    <ItemGroup Condition="$(IronPythonVersion.Contains('PR'))">
+    <ItemGroup Condition="'$(UseIronPython)' != 'false' AND $(IronPythonVersion.Contains('PR'))">
         <Reference Include="IronPython" HintPath="$(PyRevitEnginesDir)\$(IronPythonVersion)\pyRevitLabs.IronPython.dll"/>
         <Reference Include="IronPython.Modules" HintPath="$(PyRevitEnginesDir)\$(IronPythonVersion)\pyRevitLabs.IronPython.Modules.dll"/>
         <Reference Include="IronPython.SQLite" HintPath="$(PyRevitEnginesDir)\$(IronPythonVersion)\pyRevitLabs.IronPython.SQLite.dll"/>
@@ -26,22 +26,39 @@
         <Reference Include="Microsoft.Scripting" HintPath="$(PyRevitEnginesDir)\$(IronPythonVersion)\pyRevitLabs.Microsoft.Scripting.dll"/>
     </ItemGroup>
 
-    <ItemGroup Condition="!$(IronPythonVersion.Contains('PR'))">
+    <ItemGroup Condition="'$(UseIronPython)' != 'false' AND !$(IronPythonVersion.Contains('PR'))">
         <PackageReference Include="IronPython" Version="$(Version)"/>
     </ItemGroup>
 
     <ItemGroup>
         <Reference Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" Include="Microsoft.CSharp"/>
     </ItemGroup>
-
-    <ItemGroup>
+
+    <ItemGroup Condition="'$(UseAssemblyBuilder)' == 'true'">
+        <ProjectReference Include="..\pyRevitAssemblyBuilder\pyRevitAssemblyBuilder.csproj" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(UseExtensionParser)' == 'true'">
+        <ProjectReference Include="..\pyRevitExtensionParser\pyRevitExtensionParser.csproj" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(UseIronPython)' != 'false'">
         <EmbeddedResource Include="$(IronPythonStdLibDir)\$(IronPythonStdLib)"/>
     </ItemGroup>
-
+
+    <ItemGroup Condition="'$(UseRoslyn)' == 'true'">
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(UseILPack)' == 'true'">
+        <PackageReference Include="Lokad.ILPack" Version="0.3.0" ExcludeAssets="runtime" />
+    </ItemGroup>
+
     <Target Name="Deploy" AfterTargets="AfterBuild">
         <ItemGroup>
             <AllFilesToCopy Include="$(TargetDir)\**\*.dll"
-                            Exclude="$(TargetDir)\**\Xceed.Wpf.AvalonDock.dll" />
+                            Exclude="$(TargetDir)\**\Xceed.Wpf.AvalonDock.dll"
+                            Condition="'$(IsTestProject)' != 'true'"/>
         </ItemGroup>
         <Copy SourceFiles="@(AllFilesToCopy)" 
                 DestinationFolder="$(PyRevitEnginesDir)\$(IronPythonVersion)" />

dev/pyRevitLoader/Source/PyRevitLoaderApplication.cs

@@ -3,6 +3,9 @@
 using System.Reflection;
 using Autodesk.Revit.UI;
 using Autodesk.Revit.Attributes;
+using pyRevitAssemblyBuilder.AssemblyMaker;
+using pyRevitAssemblyBuilder.SessionManager;
+using pyRevitExtensionParser.Config;
 
 /* Note:
  * It is necessary that this code object do not have any references to IronPython.
@@ -28,7 +31,21 @@ Result IExternalApplication.OnStartup(UIControlledApplication application)
 
             try
             {
-                return ExecuteStartupScript(application);
+                // we need a UIApplication object to assign as `__revit__` in python...
+                var versionNumber = application.ControlledApplication.VersionNumber;
+                var fieldName = int.Parse(versionNumber) >= 2017 ? "m_uiapplication" : "m_application";
+                var fi = application.GetType().GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Instance);
+
+                var uiApplication = (UIApplication)fi.GetValue(application);
+
+                var executor = new ScriptExecutor(uiApplication);
+                var result = ExecuteStartupScript(application);
+                if (result == Result.Failed)
+                {
+                    TaskDialog.Show("Error Loading pyRevit", executor.Message);
+                }
+
+                return result;
             }
             catch (Exception ex)
             {
@@ -49,11 +66,28 @@ private static void LoadAssembliesInFolder(string folder)
                 }
                 catch
                 {
+
                 }
             }
         }
 
         private static Result ExecuteStartupScript(UIControlledApplication uiControlledApplication)
+        {
+            // defy the method of loading the assembly
+            // based on the config file setup
+            var config = PyRevitConfig.Load();
+            switch (config.NewLoader)
+            {
+                case true when config.NewLoaderRoslyn:
+                    return ExecuteStartUpCsharp(uiControlledApplication, AssemblyBuildStrategy.Roslyn);
+                case true:
+                    return ExecuteStartUpCsharp(uiControlledApplication, AssemblyBuildStrategy.ILPack);
+                default:
+                    return ExecuteStartUpPython(uiControlledApplication);
+            }
+        }
+
+        public static Result ExecuteStartUpPython(UIControlledApplication uiControlledApplication)
         {
             // we need a UIApplication object to assign as `__revit__` in python...
             var versionNumber = uiControlledApplication.ControlledApplication.VersionNumber;
@@ -76,18 +110,60 @@ private static Result ExecuteStartupScript(UIControlledApplication uiControlledA
 
             return result;
         }
+        public static Result ExecuteStartUpCsharp(UIControlledApplication uiControlledApplication, AssemblyBuildStrategy loadingMethod)
+        {
+            try
+            {
+                var versionNumber = uiControlledApplication.ControlledApplication.VersionNumber;
+                var fieldName = int.Parse(versionNumber) >= 2017 ? "m_uiapplication" : "m_application";
+                var fi = uiControlledApplication.GetType().GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Instance);
+                var uiApplication = (UIApplication)fi.GetValue(uiControlledApplication);
+
+                // Instantiate all services
+                var assemblyBuilder = new AssemblyBuilderService(versionNumber, loadingMethod);
+                var extensionManager = new ExtensionManagerService();
+                var hookManager = new HookManager();
+                var uiManager = new UIManagerService(uiApplication);
+
+                var sessionManager = new SessionManagerService(
+                    assemblyBuilder,
+                    extensionManager,
+                    hookManager,
+                    uiManager
+                );
 
+                sessionManager.LoadSession();
+
+                // execute light version of StartupScript python script  
+                Result result = Result.Succeeded;
+                var startupScript = GetStartupScriptPath();
+                if (startupScript != null)
+                {
+                    var executor = new ScriptExecutor(uiApplication); // uiControlledApplication);
+                    result = executor.ExecuteScript(startupScript);
+                    if (result == Result.Failed)
+                    {
+                        TaskDialog.Show("Error Loading pyRevit", executor.Message);
+                    }
+                }
+                return Result.Succeeded;
+            }
+            catch (Exception ex)
+            {
+                TaskDialog.Show("Error Starting pyRevit Session", ex.ToString());
+                return Result.Failed;
+            }
+        }
         private static string GetStartupScriptPath()
         {
             var loaderDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
             var dllDir = Path.GetDirectoryName(loaderDir);
             return Path.Combine(dllDir, string.Format("{0}.py", Assembly.GetExecutingAssembly().GetName().Name));
         }
-
         Result IExternalApplication.OnShutdown(UIControlledApplication application)
         {
             // FIXME: deallocate the python shell...
             return Result.Succeeded;
         }
     }
-}
+}