Implemented initial minimal support for native Excel add-ins

Build/BuildPackages.bat

@@ -1,8 +1,9 @@
 setlocal
 
 set PackageVersion=%1
-set DllVersion=%2
-set MSBuildPath=%3
+set PackageNativeAOTVersion=%2
+set DllVersion=%3
+set MSBuildPath=%4
 
 set rcfile=..\Source\versioninfo.rc2
 PowerShell "(Get-Content %rcfile%) -replace '\d+,\d+,\d+,\d+', '%DllVersion%'.Replace('.',',') -replace '\d+\.\d+\.\d+\.\d+', '%DllVersion%' | Set-Content %rcfile%"
@@ -18,7 +19,7 @@ call build.bat
 @if errorlevel 1 goto end
 
 cd ..\Package
-call package.cmd %PackageVersion%
+call package.cmd %PackageVersion% %PackageNativeAOTVersion%
 @if errorlevel 1 goto end
 
 set pushfile=push.cmd

Build/build.bat

@@ -21,6 +21,9 @@ copy /Y ..\Source\ExcelDnaPack\bin\Release\net6.0-windows\ExcelDnaPack.runtimeco
 
 if not exist "..\Package\ExcelDna.AddIn\tools\net462\" mkdir "..\Package\ExcelDna.AddIn\tools\net462\"
 if not exist "..\Package\ExcelDna.AddIn\tools\net6.0-windows\" mkdir "..\Package\ExcelDna.AddIn\tools\net6.0-windows\"
+if not exist "..\Package\ExcelDna.AddIn.NativeAOT\tools\" mkdir "..\Package\ExcelDna.AddIn.NativeAOT\tools\"
+if not exist "..\Package\ExcelDna.AddIn.NativeAOT\lib\net8.0-windows\" mkdir "..\Package\ExcelDna.AddIn.NativeAOT\lib\net8.0-windows\"
+if not exist "..\Package\ExcelDna.AddIn.NativeAOT\analyzers\dotnet\cs" mkdir "..\Package\ExcelDna.AddIn.NativeAOT\analyzers\dotnet\cs"
 
 copy /Y ..\Source\ExcelDna.AddIn.Tasks\bin\Release\net462\ExcelDna.AddIn.Tasks.dll ..\Package\ExcelDna.AddIn\tools\net462\
 copy /Y ..\Source\ExcelDna.AddIn.Tasks\bin\Release\net462\ExcelDna.AddIn.Tasks.pdb ..\Package\ExcelDna.AddIn\tools\net462\
@@ -31,5 +34,11 @@ copy /Y ..\Source\ExcelDna.AddIn.Tasks\bin\Release\net462\System.Collections.Imm
 copy /Y ..\Source\ExcelDna.AddIn.Tasks\bin\Release\net6.0-windows\ExcelDna.AddIn.Tasks.dll ..\Package\ExcelDna.AddIn\tools\net6.0-windows\
 copy /Y ..\Source\ExcelDna.AddIn.Tasks\bin\Release\net6.0-windows\ExcelDna.AddIn.Tasks.pdb ..\Package\ExcelDna.AddIn\tools\net6.0-windows\
 
+copy /Y "..\Source\ExcelDna.Integration\bin\Release\net8.0-windows\ExcelDna.Integration.dll" "..\Package\ExcelDna.AddIn.NativeAOT\lib\net8.0-windows\"
+copy /Y "..\Source\ExcelDna.ManagedHost\bin\Release\net6.0-windows\ExcelDna.ManagedHost.dll" "..\Package\ExcelDna.AddIn.NativeAOT\lib\net8.0-windows\"
+copy /Y "..\Source\ExcelDna.Loader\bin\Release\net6.0-windows\ExcelDna.Loader.dll" "..\Package\ExcelDna.AddIn.NativeAOT\lib\net8.0-windows\"
+copy /Y "..\Source\ExcelDna.SourceGenerator.NativeAOT\bin\Release\netstandard2.0\ExcelDna.SourceGenerator.NativeAOT.dll" "..\Package\ExcelDna.AddIn.NativeAOT\analyzers\dotnet\cs\"
+copy /Y "..\Source\ExcelDna.Host.NativeAOT\bin\Release\x64\ExcelDna.Host.NativeAOT.x64.xll" "..\Package\ExcelDna.AddIn.NativeAOT\tools\ExcelDnaNativeAOT64.xll"
+
 copy /Y ..\Distribution\net462\ ..\Distribution\
 

MasterBuild/MasterBuild.cmd

@@ -1,6 +1,7 @@
 setlocal
 
 set PackageVersion=1.9.0-alpha3
+set PackageNativeAOTVersion=0.1.0
 set PackageReferenceVersion=1.9.0-alpha3
 set DllVersion=1.9.0.3
 
@@ -24,7 +25,7 @@ PowerShell "(Get-Content %targetsfile%) -replace '_VERSION_', '%PackageReference
 @if errorlevel 1 goto end
 
 cd %rootPath%\ExcelDna\Build
-call BuildPackages.bat %PackageVersion% %DllVersion% %MSBuildPath%
+call BuildPackages.bat %PackageVersion% %PackageNativeAOTVersion% %DllVersion% %MSBuildPath%
 @if errorlevel 1 goto end
 
 cd %rootPath%\Registration\Build

Package/ExcelDna.AddIn.NativeAOT/ExcelDna.AddIn.NativeAOT.nuspec

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata minClientVersion="2.5">
+        <id>ExcelDna.AddIn.NativeAOT</id>
+        <version>$ExcelDnaNativeAOTVersion$</version>
+        <title>Excel-DNA Add-In NativeAOT</title>
+        <authors>Govert van Drimmelen</authors>
+        <owners>Govert van Drimmelen</owners>
+        <projectUrl>http://excel-dna.net</projectUrl>
+        <repository type="git" url="https://github.com/Excel-DNA/ExcelDna" />
+        <icon>images\ExcelDna-nu.png</icon>
+        <license type="expression">Zlib</license>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>
+          Excel-DNA eases the development of Excel add-ins using .NET.
+          Add-ins created with Excel-DNA can export high-performance user-defined functions and macros, and can be packed into a single file for easy distribution and installation.
+
+          Excel versions 2007 through 2021 / Office 365 can be targeted with a single add-in.
+          Advanced Excel features are supported, including multi-threaded recalculation, registration-free RTD servers and customized Ribbon and Task Pane interfaces and asynchronous functions.
+
+          Excel-DNA supports .NET Framework version 4.6.2 to 4.8.1, and .NET 6.0+
+
+          The Excel-DNA Runtime is free for all use, and distributed under a permissive open-source license that also allows commercial use.</description>
+        <summary>Excel-DNA is an independent project to integrate .NET into Excel.</summary>
+        <tags>excel exceldna udf excel-dna</tags>
+      <dependencies>
+        <group targetFramework="net8.0-windows7.0" />
+      </dependencies>
+    </metadata>
+    <files>
+      <file src="..\..\Distribution\net462\ExcelDna.Integration.dll" target="tools\net462\ExcelDna.Integration.dll" />
+      <file src="..\ExcelDna.AddIn\tools\net462\ExcelDna.AddIn.Tasks.dll" target="tools\net462\ExcelDna.AddIn.Tasks.dll" />
+      <file src="..\ExcelDna.AddIn\tools\net462\EnvDTE.dll" target="tools\net462\EnvDTE.dll" />
+      <file src="..\ExcelDna.AddIn\tools\net462\Newtonsoft.Json.dll" target="tools\net462\Newtonsoft.Json.dll" />
+      <file src="..\ExcelDna.AddIn\tools\net462\Microsoft.Extensions.DependencyModel.dll" target="tools\net462\Microsoft.Extensions.DependencyModel.dll" />
+
+      <file src="..\..\Distribution\net6.0-windows\ExcelDna.Integration.dll" target="tools\net6.0-windows7.0\ExcelDna.Integration.dll" />
+      <file src="..\ExcelDna.AddIn\tools\net6.0-windows\ExcelDna.AddIn.Tasks.dll" target="tools\net6.0-windows7.0\ExcelDna.AddIn.Tasks.dll" />
+      <file src="..\ExcelDna.AddIn\tools\net6.0-windows\AsmResolver.dll" target="tools\net6.0-windows7.0\AsmResolver.dll" />
+      <file src="..\ExcelDna.AddIn\tools\net6.0-windows\AsmResolver.PE.dll" target="tools\net6.0-windows7.0\AsmResolver.PE.dll" />
+      <file src="..\ExcelDna.AddIn\tools\net6.0-windows\AsmResolver.PE.File.dll" target="tools\net6.0-windows7.0\AsmResolver.PE.File.dll" />
+
+      <file src="lib\net8.0-windows\ExcelDna.Integration.dll" target="lib\net8.0-windows7.0\ExcelDna.Integration.dll" />
+      <file src="lib\net8.0-windows\ExcelDna.ManagedHost.dll" target="lib\net8.0-windows7.0\ExcelDna.ManagedHost.dll" />
+      <file src="lib\net8.0-windows\ExcelDna.Loader.dll" target="lib\net8.0-windows7.0\ExcelDna.Loader.dll" />
+
+      <file src="analyzers\dotnet\cs\ExcelDna.SourceGenerator.NativeAOT.dll" target="analyzers\dotnet\cs" />
+
+      <file src="build\ExcelDna.AddIn.NativeAOT.props" target="build" />
+      <file src="build\ExcelDna.AddIn.NativeAOT.targets" target="build" />
+      <file src="tools\ExcelDnaNativeAOT64.xll" target="tools" />
+      <file src="..\images\ExcelDna-nu.png" target="images\" />
+    </files>
+</package>

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

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

Package/ExcelDna.AddIn.NativeAOT/build/ExcelDna.AddIn.NativeAOT.targets

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <ExcelDnaToolsPath Condition="$(ExcelDnaToolsPath) == '' Or $(ExcelDnaToolsPath) == '*Undefined*'">$(MSBuildThisFileDirectory)..\tools\</ExcelDnaToolsPath>
+  </PropertyGroup>
+
+	<PropertyGroup Condition="'$(MSBuildRuntimeType)' == 'Core'">
+		<ExcelDnaTasksPath>$(ExcelDnaToolsPath)net6.0-windows7.0\</ExcelDnaTasksPath>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(MSBuildRuntimeType)' != 'Core'">
+		<ExcelDnaTasksPath>$(ExcelDnaToolsPath)net462\</ExcelDnaTasksPath>
+	</PropertyGroup>
+
+	<UsingTask TaskName="ExcelDna.AddIn.Tasks.PackExcelAddInNativeAOT" AssemblyFile="$(ExcelDnaTasksPath)ExcelDna.AddIn.Tasks.dll" />
+
+  <!--
+    Default values for configuration properties - in case they were not set in via .props file or command-line
+  -->
+  <PropertyGroup>
+    <ExcelDnaPackRunMultithreaded Condition="'$(ExcelDnaPackRunMultithreaded)' == ''">true</ExcelDnaPackRunMultithreaded>
+  </PropertyGroup>
+
+	<Target Name="ExcelDnaAddInNativeAOTPublish" AfterTargets="Publish">
+		<PackExcelAddInNativeAOT
+			Xll64FilePath="$(ExcelDnaToolsPath)ExcelDnaNativeAOT64.xll"
+			ProjectName="$(MSBuildProjectName)"
+			PublishDir="$(PublishDir)"
+			RunMultithreaded="$(ExcelDnaPackRunMultithreaded)"
+			PackManagedOnWindows="$(ExcelDnaPackManagedResourcePackingOnWindows)"
+		>
+		</PackExcelAddInNativeAOT>
+	</Target>
+
+</Project>

Package/package.cmd

@@ -5,6 +5,7 @@ set currentPath=%~dp0
 set basePath=%currentPath:~0,-1%
 set outputPath=%basePath%\nupkg
 set ExcelDnaVersion=%1
+set ExcelDnaNativeAOTVersion=%2
 
 if exist "%outputPath%\*.nupkg" del "%outputPath%\*.nupkg"
 
@@ -18,6 +19,9 @@ nuget.exe pack "%basePath%\ExcelDna.Templates\ExcelDna.Templates.nuspec" -BasePa
 nuget.exe pack "%basePath%\ExcelDna.AddIn\ExcelDna.AddIn.nuspec" -BasePath "%basePath%\ExcelDna.AddIn" -OutputDirectory "%outputPath%" -Verbosity detailed -NonInteractive -Prop ExcelDnaVersion="%ExcelDnaVersion%"
 @if errorlevel 1 goto end
 
+nuget.exe pack "%basePath%\ExcelDna.AddIn.NativeAOT\ExcelDna.AddIn.NativeAOT.nuspec" -BasePath "%basePath%\ExcelDna.AddIn.NativeAOT" -OutputDirectory "%outputPath%" -Verbosity detailed -NonInteractive -Prop ExcelDnaNativeAOTVersion="%ExcelDnaNativeAOTVersion%"
+@if errorlevel 1 goto end
+
 nuget.exe pack "%basePath%\ExcelDna.Integration\ExcelDna.Integration.nuspec" -BasePath "%basePath%\ExcelDna.Integration" -OutputDirectory "%outputPath%" -Verbosity detailed -NonInteractive -Prop ExcelDnaVersion="%ExcelDnaVersion%" -Symbols -SymbolPackageFormat snupkg
 @if errorlevel 1 goto end
 

Source/ExcelDna.AddIn.Tasks/ExcelDna.AddIn.Tasks.csproj

@@ -62,6 +62,14 @@
       <Link>ExcelDna.AddIn.props</Link>
       <SubType>Designer</SubType>
     </None>
+    <None Include="..\..\Package\ExcelDna.AddIn.NativeAOT\build\ExcelDna.AddIn.NativeAOT.targets">
+      <Link>ExcelDna.AddIn.NativeAOT.targets</Link>
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="..\..\Package\ExcelDna.AddIn.NativeAOT\build\ExcelDna.AddIn.NativeAOT.props">
+      <Link>ExcelDna.AddIn.NativeAOT.props</Link>
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
 
   <Import Project="..\ExcelDna.PackedResources\ExcelDna.PackedResources.projitems" Label="Shared" />

Source/ExcelDna.AddIn.Tasks/PackExcelAddInNativeAOT.cs

@@ -0,0 +1,85 @@
+using System;
+using Microsoft.Build.Framework;
+using ExcelDna.AddIn.Tasks.Logging;
+using ExcelDna.AddIn.Tasks.Utils;
+using ExcelDna.PackedResources.Logging;
+using System.IO;
+
+namespace ExcelDna.AddIn.Tasks
+{
+    public class PackExcelAddInNativeAOT : AbstractTask
+    {
+        private readonly IBuildLogger _log;
+        private readonly IExcelDnaFileSystem _fileSystem;
+
+        public PackExcelAddInNativeAOT()
+        {
+            _log = new BuildLogger(this, "PackExcelAddInNativeAOT");
+            _fileSystem = new ExcelDnaPhysicalFileSystem();
+        }
+
+        internal PackExcelAddInNativeAOT(IBuildLogger log, IExcelDnaFileSystem fileSystem)
+        {
+            _log = log ?? throw new ArgumentNullException(nameof(log));
+            _fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
+        }
+
+        public override bool Execute()
+        {
+            try
+            {
+                _log.Debug("Running PackExcelAddInNativeAOT Task");
+
+                bool useManagedResourceResolver = false;
+#if NETCOREAPP
+                useManagedResourceResolver = PackManagedOnWindows || !OperatingSystem.IsWindows();
+#endif
+
+                string mainNativeAssembly = Path.Combine(PublishDir, ProjectName + ".dll");
+                string xllOutput = Path.Combine(PublishDir, ProjectName + "-AddIn64.xll");
+                File.Copy(Xll64FilePath, xllOutput, true);
+
+                int result = ExcelDna.PackedResources.ExcelDnaPack.PackNativeAOT(mainNativeAssembly, xllOutput, RunMultithreaded, useManagedResourceResolver, _log);
+                if (result != 0)
+                    throw new ApplicationException($"Pack failed with exit code {result}.");
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _log.Error(ex, ex.Message);
+                _log.Error(ex, ex.ToString());
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// The 64-bit .xll file path
+        /// </summary>
+        [Required]
+        public string Xll64FilePath { get; set; }
+
+        /// <summary>
+        /// The name of the project being compiled
+        /// </summary>
+        [Required]
+        public string ProjectName { get; set; }
+
+        /// <summary>
+        /// The output location for the publish target; includes the trailing backslash (\).
+        /// </summary>
+        [Required]
+        public string PublishDir { get; set; }
+
+        /// <summary>
+        /// Use multi threading
+        /// </summary>
+        [Required]
+        public bool RunMultithreaded { get; set; }
+
+        /// <summary>
+        /// Enable/disable cross-platform resource packing implementation when executing on Windows.
+        /// </summary>
+        public bool PackManagedOnWindows { get; set; }
+    }
+}

Source/ExcelDna.AddIn.Tasks/Properties/ExcelDna.AddIn.Tasks.targets

@@ -22,6 +22,7 @@
 
     <ItemGroup>
       <ExcelDnaTestFilesToCopyToRoot Include="..\..\Package\ExcelDna.AddIn\**\*.*" />
+      <ExcelDnaTestFilesToCopyToRoot Include="..\..\Package\ExcelDna.AddIn.NativeAOT\**\*.*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(ExcelDnaTestFilesToCopyToRoot)"
@@ -52,6 +53,46 @@
 		OverwriteReadOnlyFiles="true"
 		SkipUnchangedFiles="true" />
 
+	<Copy 
+        Condition="Exists('$(ProjectDir)..\ExcelDna.Host.NativeAOT\bin\$(Configuration)\x64\ExcelDna.Host.NativeAOT.x64.xll')"
+        SourceFiles="$(ProjectDir)..\ExcelDna.Host.NativeAOT\bin\$(Configuration)\x64\ExcelDna.Host.NativeAOT.x64.xll"
+        DestinationFiles="$(ExcelDnaTestPackageDir)tools\ExcelDnaNativeAOT64.xll"
+        ContinueOnError="false"
+        OverwriteReadOnlyFiles="true"
+        SkipUnchangedFiles="true" />
+
+	<Copy 
+		Condition="Exists('$(ProjectDir)..\ExcelDna.SourceGenerator.NativeAOT\bin\$(Configuration)\netstandard2.0\ExcelDna.SourceGenerator.NativeAOT.dll')"
+		SourceFiles="$(ProjectDir)..\ExcelDna.SourceGenerator.NativeAOT\bin\$(Configuration)\netstandard2.0\ExcelDna.SourceGenerator.NativeAOT.dll"
+		DestinationFiles="$(ExcelDnaTestPackageDir)analyzers\ExcelDna.SourceGenerator.NativeAOT.dll"
+		ContinueOnError="false"
+		OverwriteReadOnlyFiles="true"
+		SkipUnchangedFiles="true" />
+
+	<Copy 
+		Condition="Exists('$(ProjectDir)..\ExcelDna.ManagedHost\bin\$(Configuration)\net6.0-windows\ExcelDna.ManagedHost.dll')"
+		SourceFiles="$(ProjectDir)..\ExcelDna.ManagedHost\bin\$(Configuration)\net6.0-windows\ExcelDna.ManagedHost.dll"
+		DestinationFiles="$(ExcelDnaTestPackageDir)tools\net6.0-windows\ExcelDna.ManagedHost.dll"
+		ContinueOnError="false"
+		OverwriteReadOnlyFiles="true"
+		SkipUnchangedFiles="true" />
+
+	<Copy 
+		Condition="Exists('$(ProjectDir)..\ExcelDna.Loader\bin\$(Configuration)\net6.0-windows\ExcelDna.Loader.dll')"
+		SourceFiles="$(ProjectDir)..\ExcelDna.Loader\bin\$(Configuration)\net6.0-windows\ExcelDna.Loader.dll"
+		DestinationFiles="$(ExcelDnaTestPackageDir)tools\net6.0-windows\ExcelDna.Loader.dll"
+		ContinueOnError="false"
+		OverwriteReadOnlyFiles="true"
+		SkipUnchangedFiles="true" />
+
+	<Copy 
+		Condition="Exists('$(ProjectDir)..\ExcelDna.Integration\bin\$(Configuration)\net8.0-windows\ExcelDna.Integration.dll')"
+		SourceFiles="$(ProjectDir)..\ExcelDna.Integration\bin\$(Configuration)\net8.0-windows\ExcelDna.Integration.dll"
+		DestinationFiles="$(ExcelDnaTestPackageDir)tools\net8.0-windows7.0\ExcelDna.Integration.dll"
+		ContinueOnError="false"
+		OverwriteReadOnlyFiles="true"
+		SkipUnchangedFiles="true" />
+
 	<Copy 
 		Condition="Exists('$(ProjectDir)..\ExcelDna\x64\$(Configuration)\ExcelDna64.xll')"
 		SourceFiles="$(ProjectDir)..\ExcelDna\x64\$(Configuration)\ExcelDna64.xll"