Removed WindowsForms dependency for NativeAOT

Package/ExcelDna.AddIn.NativeAOT/build/ExcelDna.AddIn.NativeAOT.props

@@ -1,7 +1,5 @@
 <Project>
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<UseWindowsForms>true</UseWindowsForms>
-		<SelfContained>true</SelfContained>
 	</PropertyGroup>
 </Project>

Source/ExcelDna.Integration/ComInterop/Generator/ExcelRibbon.cs

@@ -2,6 +2,7 @@
 
 using ExcelDna.Integration.ComInterop.Generator.Interfaces;
 using ExcelDna.Integration.Extensibility;
+using ExcelDna.Integration.Win32;
 using System;
 using System.Linq;
 using System.Reflection;
@@ -36,7 +37,7 @@ public int GetTypeInfo(uint iTInfo, uint lcid, out nint ppTInfo)
         public int GetIDsOfNames(Guid riid, [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.LPWStr, SizeParamIndex = 2)] string[] rgszNames, uint cNames, uint lcid, [In][Out][MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 2)] int[] rgDispId)
         {
             for (int i = 0; i < cNames; ++i)
-                rgDispId[i] = Array.FindIndex(methods, m => m.Name == rgszNames[i]);
+                rgDispId[i] = (rgszNames[i] == "LoadImage") ? methods.Length : Array.FindIndex(methods, m => m?.Name == rgszNames[i]);
 
             return 0;
         }
@@ -49,6 +50,12 @@ public int Invoke(int dispIdMember, Guid riid, uint lcid, INVOKEKIND wFlags, [Ma
                 methods[dispIdMember].Invoke(customRibbon, [ribbonControl]);
             }
 
+            if (dispIdMember == methods.Length && pDispParams.cArgs == 1)
+            {
+                string resourceName = pDispParams.rgvarg[0].Value as string;
+                Dispatcher.SetResult(pVarResult, new DispatchObject(Picture.LoadAsIPictureDisp(LoadCustomRibbonResource(resourceName))));
+            }
+
             return 0;
         }
 
@@ -80,6 +87,18 @@ public int GetCustomUI([MarshalAs(UnmanagedType.BStr)] string RibbonID, [Marshal
             return 0;
         }
         #endregion
+
+        private byte[] LoadCustomRibbonResource(string name)
+        {
+            using (var stream = customRibbon.GetType().Assembly.GetManifestResourceStream(name))
+            {
+                using (System.IO.MemoryStream memoryStream = new())
+                {
+                    stream.CopyTo(memoryStream);
+                    return memoryStream.ToArray();
+                }
+            }
+        }
     }
 }
 

Source/ExcelDna.Integration/CustomUI/ExcelCommandBars.cs

@@ -8,14 +8,19 @@
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Windows.Forms;
 using System.Xml;
 using System.Xml.Serialization;
 using ExcelDna.Serialization;
 
+#if USE_WINDOWS_FORMS
+using System.Windows.Forms;
+#endif
+
 namespace ExcelDna.Integration.CustomUI
 {
+#if USE_WINDOWS_FORMS
     public delegate Bitmap GetImageDelegate(string imageName);
+#endif
 
     //public class ExcelCommandBars
     //{
@@ -54,9 +59,12 @@ public static CommandBars GetCommandBars()
 
         public static void LoadCommandBars(string xmlCustomUI)
         {
+#if USE_WINDOWS_FORMS
             LoadCommandBars(xmlCustomUI, delegate (string imageName) { return null; });
+#endif
         }
 
+#if USE_WINDOWS_FORMS
         public static void LoadCommandBars(string xmlCustomUI, GetImageDelegate getImage)
         {
             string dnaLibraryWrapper = string.Format(@"<DnaLibrary><CustomUI>{0}</CustomUI></DnaLibrary>", xmlCustomUI);
@@ -92,6 +100,7 @@ internal static void LoadCommandBars(XmlNode xmlCustomUI, GetImageDelegate getIm
                 Debug.Print("ExcelCommandBars: Error adding controls: {0}", e);
             }
         }
+#endif
 
         public static void UnloadCommandBars()
         {
@@ -117,6 +126,7 @@ public static void UnloadCommandBars()
             loadedCustomUIs.Clear();
         }
 
+#if USE_WINDOWS_FORMS
         private static void AddCommandBarControls(Application excelApp, XmlNodeList xmlNodes, GetImageDelegate getImage)
         {
             foreach (XmlNode childNode in xmlNodes)
@@ -151,6 +161,7 @@ private static void AddCommandBarControls(Application excelApp, XmlNodeList xmlN
                 }
             }
         }
+#endif
 
         private static void RemoveCommandBarControls(Application excelApp, XmlNodeList xmlNodes)
         {
@@ -234,14 +245,15 @@ private static CommandBar GetCommandBarFromIdOrName(Application excelApp, XmlAtt
         //    }
         //}
 
-
+#if USE_WINDOWS_FORMS
         private static void AddControls(CommandBarControls parentControls, XmlNodeList xmlNodes, GetImageDelegate getImage)
         {
             foreach (XmlNode childNode in xmlNodes)
             {
                 AddControl(parentControls, childNode, getImage);
             }
         }
+#endif
 
         private static void RemoveControls(CommandBarControls parentControls, XmlNodeList xmlNodes)
         {
@@ -251,6 +263,7 @@ private static void RemoveControls(CommandBarControls parentControls, XmlNodeLis
             }
         }
 
+#if USE_WINDOWS_FORMS
         private static void AddControl(CommandBarControls parentControls, XmlNode xmlNode, GetImageDelegate getImage)
         {
             if (xmlNode.Name == "popup")
@@ -268,6 +281,7 @@ private static void AddControl(CommandBarControls parentControls, XmlNode xmlNod
                 ApplyControlAttributes(newButton, xmlNode, getImage);
             }
         }
+#endif
 
         private static void RemoveControl(CommandBarControls parentControls, XmlNode xmlNode)
         {
@@ -313,6 +327,7 @@ private static object ReadControlBeforeAttribute(XmlNode xmlNode)
             return before;
         }
 
+#if USE_WINDOWS_FORMS
         private static void ApplyControlAttributes(CommandBarControl control, XmlNode xmlNode, GetImageDelegate getImage)
         {
             foreach (XmlAttribute att in xmlNode.Attributes)
@@ -449,6 +464,7 @@ private static void ApplyControlAttribute(CommandBarControl control, string attr
                     break;
             }
         }
+#endif
 
         // Some minimal wrappers for the office types.
         private class Application
@@ -951,6 +967,7 @@ internal CommandBarButton(object commandBarCom)
         {
         }
 
+#if USE_WINDOWS_FORMS
         public void SetButtonImage(Bitmap buttonImage)
         {
             // TODO: Consider using Picture property for Excel 2002+ (and Mask?)
@@ -964,6 +981,7 @@ public void SetButtonImage(Bitmap buttonImage)
             Clipboard.Clear();
             // Clipboard.SetDataObject(oldContent);
         }
+#endif
 
         public int FaceId
         {

Source/ExcelDna.Integration/CustomUI/ExcelRibbon.cs

@@ -71,7 +71,11 @@ public virtual string GetCustomUI(string RibbonID)
         public virtual object LoadImage(string imageId)
         {
             // Default implementation ...
+#if USE_WINDOWS_FORMS
             return DnaLibrary.GetImage(imageId);
+#else
+            return null;
+#endif
         }
 
         // RunTagMacro helper function

Source/ExcelDna.Integration/DnaLibrary.cs

@@ -60,6 +60,16 @@ internal static FileInfo XllPathInfo
             }
         }
 
+        private static bool _IsNativeAOTActive;
+        [XmlIgnore]
+        internal static bool IsNativeAOTActive
+        {
+            get
+            {
+                return _IsNativeAOTActive;
+            }
+        }
+
         private string _Name;
         [XmlAttribute]
         public string Name
@@ -236,10 +246,12 @@ internal List<ExportedAssembly> GetAssemblies(string pathResolveRoot)
                         assemblies.AddRange(lib.GetAssemblies(pathResolveRoot, this));
                     }
                 }
+#if USE_WINDOWS_FORMS
                 foreach (Project proj in GetProjects())
                 {
                     assemblies.AddRange(proj.GetAssemblies(pathResolveRoot, this));
                 }
+#endif
             }
             catch (Exception e)
             {
@@ -283,13 +295,13 @@ internal void Initialize()
             var excelFunctionExecutionHandlerSelectors = new List<Registration.FunctionExecutionHandlerSelector>();
             var excelFunctionProcessors = new List<ExtendedRegistration.ExcelFunctionProcessor>();
             AssemblyLoader.ProcessAssemblies(_exportedAssemblies, _methods, excelParameterConversions, excelReturnConversions, excelFunctionProcessors, _excelFunctionsExtendedRegistration, excelFunctionExecutionHandlerSelectors, _addIns, rtdServerTypes, comClassTypes);
-            AssemblyLoader.GetExcelParameterConversions(NativeAOT.ExcelParameterConversions, excelParameterConversions);
-            AssemblyLoader.GetExcelReturnConversions(NativeAOT.ExcelReturnConversions, excelReturnConversions);
-            AssemblyLoader.GetExcelFunctionExecutionHandlerSelectors(NativeAOT.ExcelFunctionExecutionHandlerSelectors, excelFunctionExecutionHandlerSelectors);
+            AssemblyLoader.GetExcelParameterConversions(Registration.StaticRegistration.ExcelParameterConversions, excelParameterConversions);
+            AssemblyLoader.GetExcelReturnConversions(Registration.StaticRegistration.ExcelReturnConversions, excelReturnConversions);
+            AssemblyLoader.GetExcelFunctionExecutionHandlerSelectors(Registration.StaticRegistration.ExcelFunctionExecutionHandlerSelectors, excelFunctionExecutionHandlerSelectors);
             _extendedRegistrationConfiguration = new ExtendedRegistration.Registration.Configuration() { ParameterConversions = excelParameterConversions, ReturnConversions = excelReturnConversions, ExcelFunctionProcessors = excelFunctionProcessors, ExcelFunctionExecutionHandlerSelectors = excelFunctionExecutionHandlerSelectors };
 
-            NativeAOT.ExcelAddIns.ForEach(i => AssemblyLoader.GetExcelAddIns(null, i, _addIns));
-            ObjectHandles.ObjectHandleRegistration.ProcessAssemblyAttributes(NativeAOT.AssemblyAttributes);
+            Registration.StaticRegistration.ExcelAddIns.ForEach(i => AssemblyLoader.GetExcelAddIns(null, i, _addIns));
+            ObjectHandles.ObjectHandleRegistration.ProcessAssemblyAttributes(Registration.StaticRegistration.AssemblyAttributes);
 
             // Register RTD Server Types (i.e. remember that these types are available as RTD servers, with relevant ProgId etc.)
             RtdRegistration.RegisterRtdServerTypes(rtdServerTypes.Select(i => new TypeHelperDynamic(i)));
@@ -331,7 +343,7 @@ internal void AutoOpen()
             RegistrationInfo.Register();
             SynchronizationManager.Install(true);
 
-            AssemblyLoader.GetExcelMethods(NativeAOT.MethodsForRegistration, true, _methods, _excelFunctionsExtendedRegistration);
+            AssemblyLoader.GetExcelMethods(Registration.StaticRegistration.MethodsForRegistration, true, _methods, _excelFunctionsExtendedRegistration);
 
             // Register my Methods
             List<MethodInfo> commands = _methods.Where(Registration.ExcelCommandRegistration.IsCommand).ToList();
@@ -451,7 +463,9 @@ internal void LoadCustomUI()
                 {
                     if (xmlCustomUI.LocalName == "commandBars")
                     {
+#if USE_WINDOWS_FORMS
                         ExcelCommandBarUtil.LoadCommandBars(xmlCustomUI, this.GetImage);
+#endif
                     }
                 }
             }
@@ -476,7 +490,7 @@ internal IEnumerable<Assembly> GetExportedAssemblies()
 
         // Statics
         private static DnaLibrary rootLibrary;
-        internal static void InitializeRootLibrary(string xllPath)
+        internal static void InitializeRootLibrary(string xllPath, bool isNativeAOTActive)
         {
             // Loads the primary .dna library
             // Load sequence is:
@@ -486,7 +500,10 @@ internal static void InitializeRootLibrary(string xllPath)
             // CAREFUL: Sequence here is fragile - this is the first place where we start logging
             _XllPath = xllPath;
             _xllPathPathInfo = new FileInfo(xllPath);
+            _IsNativeAOTActive = isNativeAOTActive;
+#if USE_WINDOWS_FORMS
             Logging.LogDisplay.CreateInstance();
+#endif
             Logger.Initialization.Verbose("Enter DnaLibrary.InitializeRootLibrary");
             byte[] dnaBytes = ExcelIntegration.GetDnaFileBytes("__MAIN__");
             if (dnaBytes != null)
@@ -508,7 +525,7 @@ internal static void InitializeRootLibrary(string xllPath)
             // If there have been problems, ensure that there is at lease some current library.
             if (rootLibrary == null)
             {
-                if (!NativeAOT.IsActive)
+                if (!IsNativeAOTActive)
                     Logger.Initialization.Error("No Dna Library found.");
                 rootLibrary = new DnaLibrary();
             }
@@ -551,7 +568,7 @@ public static DnaLibrary LoadFrom(string fileName)
 
             if (!File.Exists(fileName))
             {
-                if (!NativeAOT.IsActive)
+                if (!IsNativeAOTActive)
                     Logger.Initialization.Error("The required .dna script file {0} does not exist.", fileName);
                 return null;
             }
@@ -724,6 +741,7 @@ public static string ResolvePath(string path, string dnaDirectory)
             return null;
         }
 
+#if USE_WINDOWS_FORMS
         public Bitmap GetImage(string imageId)
         {
             // We expect these to be small images.
@@ -765,6 +783,7 @@ public Bitmap GetImage(string imageId)
             }
             return null;
         }
+#endif
 
     }
 

Source/ExcelDna.Integration/Excel.cs

@@ -52,8 +52,10 @@ private static extern int AccessibleObjectFromWindow(
 
         private static bool checkForIllegalCrossThreadCalls;
 
-        internal static void Initialize()
+        internal static void Initialize(IntPtr hModuleXll)
         {
+            ModuleXll = hModuleXll;
+
             // NOTE: Sequence here is important - Getting the Window Handle sometimes uses the _mainNativeThreadId
             _mainManagedThreadId = Thread.CurrentThread.ManagedThreadId;
             _mainNativeThreadId = GetCurrentThreadId();
@@ -76,6 +78,8 @@ internal static bool IsMainThread
             }
         }
 
+        internal static IntPtr ModuleXll { get; private set; }
+
         public static int MainManagedThreadId
         {
             get { return _mainManagedThreadId; }
@@ -459,7 +463,6 @@ private static object GetApplicationFromWindow(IntPtr hWndMain, bool allowProtec
 
                 // Marshal to .NET, then call .Application
                 object obj = ComInterop.Util.TypeAdapter.GetObject(pUnk);
-                Marshal.Release(pUnk);
 
                 try
                 {

Source/ExcelDna.Integration/ExcelDna.Integration.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
 
     <TargetFrameworks>net462;net6.0-windows;net8.0-windows</TargetFrameworks>
-    <UseWindowsForms>true</UseWindowsForms>
 
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -21,6 +20,16 @@
     <DefineConstants>$(DefineConstants);COM_GENERATED</DefineConstants>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
+    <Compile Remove="LogDisplay.cs" />
+    <Compile Remove="LogDisplay.Designer.cs" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' != 'net8.0-windows'">
+    <UseWindowsForms>true</UseWindowsForms>
+    <DefineConstants>$(DefineConstants);USE_WINDOWS_FORMS</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <Reference Include="System.Windows.Forms" />
     <Reference Include="Microsoft.VisualBasic" />
@@ -30,4 +39,11 @@
     <PackageReference Include="ExcelDna.Interop" Version="15.0.1" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.205">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>

Source/ExcelDna.Integration/ExcelIntegration.cs

@@ -198,11 +198,11 @@ internal static Assembly LoadFromAssemblyBytes(byte[] assemblyBytes, byte[] pdbB
             return _integrationHost.LoadFromAssemblyBytes(assemblyBytes, pdbBytes);
         }
 
-        internal static void Initialize(string xllPath)
+        internal static void Initialize(string xllPath, bool isNativeAOTActive, IntPtr hModuleXll)
         {
-            ExcelDnaUtil.Initialize();  // Set up window handle
+            ExcelDnaUtil.Initialize(hModuleXll);  // Set up window handle
             Logging.TraceLogger.Initialize();
-            DnaLibrary.InitializeRootLibrary(xllPath);
+            DnaLibrary.InitializeRootLibrary(xllPath, isNativeAOTActive);
         }
 
         // Called via Reflection from Loader