Skip to content

feat: Add Node.js and Playwright to installer; fix: Excel/Options/OPEN registry key sequence #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kaspermarstal merged 2 commits into from
Jun 17, 2025
Merged

feat: Add Node.js and Playwright to installer; fix: Excel/Options/OPEN registry key sequence #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20fa617
feat: Add Node.js and Playwright to installer; fix: Excel/Options/OPE…
kaspermarstal Jun 16, 2025
7d6ed22
style: dotnet format
kaspermarstal Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions Cellm.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "Cellm.Installer", "src\Cell
{AE73B93E-AB99-41B9-8367-46EEFD550CB8} = {AE73B93E-AB99-41B9-8367-46EEFD550CB8}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cellm.Installer.CustomActions", "src\Cellm.Installers\CustomActions\Cellm.Installer.CustomActions.csproj", "{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -72,6 +74,22 @@ Global
{4093A018-63AF-AE62-A7BB-2AC5BB7229DA}.Release|x64.Build.0 = Release|x64
{4093A018-63AF-AE62-A7BB-2AC5BB7229DA}.Release|x86.ActiveCfg = Release|x86
{4093A018-63AF-AE62-A7BB-2AC5BB7229DA}.Release|x86.Build.0 = Release|x86
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Debug|ARM64.Build.0 = Debug|Any CPU
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Debug|x64.ActiveCfg = Debug|Any CPU
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Debug|x64.Build.0 = Debug|Any CPU
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Debug|x86.ActiveCfg = Debug|Any CPU
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Debug|x86.Build.0 = Debug|Any CPU
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Release|Any CPU.Build.0 = Release|Any CPU
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Release|ARM64.ActiveCfg = Release|Any CPU
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Release|ARM64.Build.0 = Release|Any CPU
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Release|x64.ActiveCfg = Release|Any CPU
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Release|x64.Build.0 = Release|Any CPU
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Release|x86.ActiveCfg = Release|Any CPU
{02AB9A3F-CF5E-8F75-666D-6D8AE65C85E1}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
14 changes: 7 additions & 7 deletions src/Cellm.Installers/AppComponents.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/UtilExtension">
<Fragment>
<ComponentGroup Id="AppComponents" Directory="INSTALLFOLDER">
<Component Id="CellmAddIn" Guid="421F66BC-6680-4FC9-9311-27E6996C562C">
<File Id="CellmAddIn64PackedXll" Name="Cellm-AddIn64-packed.xll" Source="..\Cellm\bin\$(Configuration)\net9.0-windows\publish\Cellm-AddIn64-packed.xll" />

Check warning on line 5 in src/Cellm.Installers/AppComponents.wxs

View workflow job for this annotation

GitHub Actions / Build 

ICE91: The file 'CellmAddIn64PackedXll' will be installed to the per user directory 'INSTALLFOLDER' that doesn't vary based on ALLUSERS value. This file won't be copied to each user's profile even if a per machine installation is desired.

Check warning on line 5 in src/Cellm.Installers/AppComponents.wxs

View workflow job for this annotation

GitHub Actions / Build 

ICE91: The file 'CellmAddIn64PackedXll' will be installed to the per user directory 'INSTALLFOLDER' that doesn't vary based on ALLUSERS value. This file won't be copied to each user's profile even if a per machine installation is desired.
<File Id="AppSettings" Name="appsettings.json" Source="..\Cellm\bin\$(Configuration)\net9.0-windows\appsettings.json" />

Check warning on line 6 in src/Cellm.Installers/AppComponents.wxs

View workflow job for this annotation

GitHub Actions / Build 

ICE91: The file 'AppSettings' will be installed to the per user directory 'INSTALLFOLDER' that doesn't vary based on ALLUSERS value. This file won't be copied to each user's profile even if a per machine installation is desired.

Check warning on line 6 in src/Cellm.Installers/AppComponents.wxs

View workflow job for this annotation

GitHub Actions / Build 

ICE91: The file 'AppSettings' will be installed to the per user directory 'INSTALLFOLDER' that doesn't vary based on ALLUSERS value. This file won't be copied to each user's profile even if a per machine installation is desired.
<RegistryKey Root="HKCU" Key="Software\TokenFactory\Cellm">
<RegistryValue Type="string" Name="CellmInstalled" Value="yes" KeyPath="yes" />
</RegistryKey>
<RemoveFolder Id='RemoveInstallFolder' Directory='INSTALLFOLDER' On='uninstall' />
<RemoveFolder Id="RemoveInstallFolder" Directory="INSTALLFOLDER" On="uninstall" />
</Component>

<Component Id="CellmAddInOffice12RegistryKey" Guid="A1126967-D155-4817-82D2-CC8D38DC7FB5" Condition="OFFICE12INSTALLED">
<RegistryKey Root="HKCU" Key="Software\Microsoft\Office\12.0\Excel\Options">
<RegistryValue Type="string" Name="OPEN" Value="/R [INSTALLFOLDER]Cellm-AddIn64-packed.xll" KeyPath="yes" />
<RegistryValue Type="string" Name="[Office12NextOpen]" Value="/R [INSTALLFOLDER]Cellm-AddIn64-packed.xll" KeyPath="yes" />
</RegistryKey>
</Component>

<Component Id="CellmAddInOffice14RegistryKey" Guid="5C22D506-FCFC-46AC-82B0-211F61391AE0" Condition="OFFICE14INSTALLED">
<RegistryKey Root="HKCU" Key="Software\Microsoft\Office\14.0\Excel\Options">
<RegistryValue Type="string" Name="OPEN" Value="/R [INSTALLFOLDER]Cellm-AddIn64-packed.xll" KeyPath="yes" />
<RegistryValue Type="string" Name="[Office14NextOpen]" Value="/R [INSTALLFOLDER]Cellm-AddIn64-packed.xll" KeyPath="yes" />
</RegistryKey>
</Component>

<Component Id="CellmAddInOffice15RegistryKey" Guid="27522B4F-788C-4B7A-9EC2-476A67DEF021" Condition="OFFICE15INSTALLED">
<RegistryKey Root="HKCU" Key="Software\Microsoft\Office\15.0\Excel\Options">
<RegistryValue Type="string" Name="OPEN" Value="/R [INSTALLFOLDER]Cellm-AddIn64-packed.xll" KeyPath="yes" />
<RegistryValue Type="string" Name="[Office15NextOpen]" Value="/R [INSTALLFOLDER]Cellm-AddIn64-packed.xll" KeyPath="yes" />
</RegistryKey>
</Component>

<Component Id="CellmAddInOffice16RegistryKey" Guid="0411319A-EF99-4D96-8D68-93D675050458" Condition="OFFICE16INSTALLED">
<RegistryKey Root="HKCU" Key="Software\Microsoft\Office\16.0\Excel\Options">
<RegistryValue Type="string" Name="OPEN" Value="/R [INSTALLFOLDER]Cellm-AddIn64-packed.xll" KeyPath="yes" />
<RegistryValue Type="string" Name="[Office16NextOpen]" Value="/R [INSTALLFOLDER]Cellm-AddIn64-packed.xll" KeyPath="yes" />
</RegistryKey>
</Component>
</ComponentGroup>

<netfx:DotNetCompatibilityCheck Property="DOTNETRUNTIMECHECK" RollForward="major" Platform="x64" RuntimeType="desktop" Version="9.0.0" />
<Launch Condition="Installed OR DOTNETRUNTIMECHECK=0" Message="Cellm requires .NET 9.0 or greater. Download the .NET 9.0 x64 Desktop Runtime from https://dotnet.microsoft.com/." />
<Launch Condition="Installed OR DOTNETRUNTIMECHECK=0" Message="Cellm requires .NET 9 x64 or greater. Download the .NET 9 x64 Desktop Runtime from https://dotnet.microsoft.com/." />
</Fragment>
</Wix>
12 changes: 11 additions & 1 deletion src/Cellm.Installers/Cellm.Installer.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,14 @@
<PackageReference Include="WixToolset.Netfx.wixext" Version="6.0.0" />
<PackageReference Include="WixToolset.UI.wixext" Version="6.0.0" />
</ItemGroup>
</Project>
<ItemGroup>
<ProjectReference Include="CustomActions\Cellm.Installer.CustomActions.csproj">
<Name>CustomActions</Name>
<Project>{C062B6CD-25A0-4EA2-B04E-EF8A6A48930B}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
</ItemGroup>
</Project>
19 changes: 19 additions & 0 deletions src/Cellm.Installers/CustomActions/Cellm.Installer.CustomActions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Content Include="CustomAction.config" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="WixToolset.Dtf.CustomAction" Version="6.0.1" />
<PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="6.0.1" />
</ItemGroup>

<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="System.Net.Http" />
</ItemGroup>
</Project>
6 changes: 6 additions & 0 deletions src/Cellm.Installers/CustomActions/CustomAction.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
</configuration>
Loading