Run installer

.github/workflows/Installer.yml

@@ -16,20 +16,20 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v4
       with:
         submodules: recursive
         fetch-depth: 0
 
     # Install the .NET Core workload
     - name: Install .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 5.0.x
 
     # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
     - name: Setup MSBuild.exe (Windows OS)
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v2
       env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: true # So the PATH can be set by this step
       if: ${{ matrix.os == 'windows-2019' }}
@@ -41,13 +41,13 @@ jobs:
     - name: Build
       env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: true # So gitversion can set environment vars during the build
-      run: msbuild src/WeSay.sln /p:Configuration=Release
+      run: msbuild src/WeSay.sln /p:Configuration=Release /p:Platform=x86
 
     - name: Build Installer
       run: msbuild build/Installer.targets /p:Configuration=Release /p:Platform=x86 /t:BuildRelease
 
     - name: Publish Installer
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: WeSayInstallers
         path: BuildDir/WeSay*.exe

build/Installer.targets

@@ -189,6 +189,8 @@
 	<Target Name="PrepareRedistributables" >
 		<PropertyGroup>
 			<WixLibsDir>$(RootDir)/../genericinstaller/libs</WixLibsDir>
+			<!-- When changing this, be sure to delete the previous ChorusMergeModule manually, as normal cleanup doesn't affect generated files within sub-repo's. -->
+			<ChorusMergeModuleVersion>5.0.0-beta.20</ChorusMergeModuleVersion>
 		</PropertyGroup>
 		<ItemGroup>
 			<OverrideFiles Include="$(RootDir)/../src/Installer/*.wxi" />
@@ -203,7 +205,8 @@
 			LocalFilename="$(WixLibsDir)/vcredist_2012_x86.exe" />	<!-- VisualC++ 11 runtime -->
 		<DownloadFileOnce Address="https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe"
 			LocalFilename="$(WixLibsDir)/vcredist_2013_x86.exe" />	<!-- VisualC++ 12 runtime -->
-		<DownloadFileOnce Address="https://build.palaso.org/guestAuth/repository/download/Chorus_Win32masterContinuous/latest.lastSuccessful/ChorusMergeModule.msm?branch=%3Cdefault%3E"
+		<!-- This needs to work in tandem with Installer.wxs to install the full set of dependencies. -->
+		<DownloadFileOnce Address="https://build.palaso.org/guestAuth/repository/download/Chorus_Win32masterContinuous/$(ChorusMergeModuleVersion)/ChorusMergeModule.msm?branch=%3Cdefault%3E"
 			LocalFileName="$(WixLibsDir)/ChorusMergeModule.msm" />
 		<Copy SourceFiles="@(OverrideFiles)" OverwriteReadonlyFiles="true" DestinationFolder="$(OverridesDestDir)"/>
 	</Target>
@@ -305,11 +308,11 @@
 		<PropertyGroup>
 			<MsiFile>$(SafeApplicationName)_$(BuildVersion).msi</MsiFile>
 			<BaseBuildDir>$(RootDir)/../genericinstaller/BaseInstallerBuild</BaseBuildDir>
-			<BaseBuildArgs>"$(ProductName)" $(SafeApplicationName) $(BuildVersion) $(ProductIdGuid) $(UpgradeCodeGuid) "$(AppBuildDir)/$(BinDirSuffix)" "$(AppBuildDir)/$(DataDirSuffix)" $(CopyrightYear) "$(Manufacturer)" "x86" "$(CertPath)" "@(CertPass)"</BaseBuildArgs>
+			<BaseBuildArgs>"$(ProductName)" $(SafeApplicationName) $(BuildVersion) $(ProductIdGuid) $(UpgradeCodeGuid) "$(AppBuildDir)/$(BinDirSuffix)" "$(AppBuildDir)/$(DataDirSuffix)" $(CopyrightYear) "$(Manufacturer)" -arch "x86"</BaseBuildArgs>
 		</PropertyGroup>
 		<!-- Suppress ICE30 because we install the specific version of AutoFac that we need and not the Chorus Merge Module version -->
 		<!-- Since Chorus does have one, we end up with an ICE warning for double ref counting -->
-		<Exec WorkingDirectory="$(BaseBuildDir)" Command="(set SuppressICE=-sice:ICE30) &amp; buildBaseInstaller.bat $(BaseBuildArgs)" />
+		<Exec WorkingDirectory="$(BaseBuildDir)" Command="(set SuppressICE=-sice:ICE30) &amp; (set FILESTOSIGNLATER=$(MsiFile)) &amp; buildBaseInstaller.bat $(BaseBuildArgs)" />
 
 		<ItemGroup>
 			<InstallerFiles Include="$(BaseBuildDir)/**/$(SafeApplicationName)_*.exe"/>
@@ -327,7 +330,7 @@
 		<PropertyGroup>
 			<MspFile>$(SafeApplicationName)_$(BuildVersion).msp</MspFile>
 			<PatchDir>$(RootDir)/$(SafeApplicationName)/WixInstaller/CreateUpdatePatch</PatchDir>
-			<PatchArgs>"$(ProductName)$(SafeApplicationName)" $(SafeApplicationName) $(BaseVersion) $(BuildVersion) "$(AppBuildMasterDir)/$(BinDirSuffix)" "$(AppBuildDir)/$(BinDirSuffix)" "$(AppBuildMasterDir)/$(DataDirSuffix)" "$(AppBuildDir)/$(DataDirSuffix)" $(ProductIdGuid) $(UpgradeCodeGuid) $(CompGGS) "$(Manufacturer)" "$(CertPath)" "@(CertPass)"</PatchArgs>
+			<PatchArgs>"$(ProductName)$(SafeApplicationName)" $(SafeApplicationName) $(BaseVersion) $(BuildVersion) "$(AppBuildMasterDir)/$(BinDirSuffix)" "$(AppBuildDir)/$(BinDirSuffix)" "$(AppBuildMasterDir)/$(DataDirSuffix)" "$(AppBuildDir)/$(DataDirSuffix)" $(ProductIdGuid) $(UpgradeCodeGuid) $(CompGGS) "$(Manufacturer)"</PatchArgs>
 		</PropertyGroup>
 
 		<Exec WorkingDirectory="$(PatchDir)" Command="buildPatch.bat $(PatchArgs)"/>

src/Installer/Installer.wixproj

@@ -66,16 +66,6 @@
 	<Compile Include="Installer.wxs" />
 	<Compile Include="CommonDir.wxs" />
   </ItemGroup>
-  <ItemGroup>
-	<WixExtension Include="WixUtilExtension">
-	  <HintPath>C:\Program Files\Windows Installer XML v3.5\bin\WixUtilExtension.dll</HintPath>
-	  <Name>WixUtilExtension</Name>
-	</WixExtension>
-	<WixExtension Include="WixNetFxExtension">
-	  <HintPath>C:\Program Files\Windows Installer XML v3.5\bin\WixNetFxExtension.dll</HintPath>
-	  <Name>WixNetFxExtension</Name>
-	</WixExtension>
-  </ItemGroup>
   <ItemGroup>
 	<Content Include="..\..\doc\Welcome.htm" />
   </ItemGroup>

src/Installer/Installer.wxs

@@ -8,7 +8,7 @@
 <!-- good intro to the component vs. file thing, and why each file here is a separate component:
 http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx -->
 
-	<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
+	<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
 		<Product Id="$(var.Property_ProductCode)" Name="WeSay $(var.Property_ProductVersion)" Language="1033"
 				   Version="$(var.Property_ProductVersion)" Manufacturer="SIL"

src/LiftWordList2Json/LiftWordList2Json.csproj

@@ -43,7 +43,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\output\Release</OutputPath>