From 5366ac9ed72a1e508603bc218b8fc4db3f8d7c2f Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Mon, 10 Mar 2025 00:36:45 +0100
Subject: [PATCH] Windows Distribution Fixes

---
 app/build.gradle.kts           | 5 ++++-
 app/windows/Processing.wixproj | 4 ++++
 app/windows/Processing.wxs     | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 13d2a66fd..e4941d2d8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -145,10 +145,13 @@ tasks.register<Exec>("packageCustomDmg"){
 
 tasks.register<Exec>("packageCustomMsi"){
     workingDir = file("windows")
+    group = "compose desktop"
+
     commandLine(
         "dotnet",
         "build",
-        "/p:Platform=x64"
+        "/p:Platform=x64",
+        "/p:DefineConstants=\"Version=$version;\""
     )
 }
 
diff --git a/app/windows/Processing.wixproj b/app/windows/Processing.wixproj
index 20751a6a9..3dcd4695f 100644
--- a/app/windows/Processing.wixproj
+++ b/app/windows/Processing.wixproj
@@ -1,4 +1,8 @@
 <Project Sdk="WixToolset.Sdk/5.0.1">
+    <PropertyGroup>
+        <OutputPath>..\build\compose\binaries\main\msi</OutputPath>
+        <OutputName>Processing-$(Version)</OutputName>
+    </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="WixToolset.UI.wixext" Version="5.0.1" />
     </ItemGroup>
diff --git a/app/windows/Processing.wxs b/app/windows/Processing.wxs
index e3d6bc5e1..c74613e80 100644
--- a/app/windows/Processing.wxs
+++ b/app/windows/Processing.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <Package Name="Processing" Manufacturer="Processing Foundation" Version="0.0.1" UpgradeCode="34577f3b-7cbe-4c5e-827d-5fe5ce9d371c">
+  <Package Name="Processing" Manufacturer="Processing Foundation" Version="$(Version)" UpgradeCode="34577f3b-7cbe-4c5e-827d-5fe5ce9d371c">
     <Icon Id="icon.ico" SourceFile="..\..\build\windows\processing.ico" />
     <Property Id="ARPPRODUCTICON" Value="icon.ico" />
 
@@ -10,7 +10,7 @@
     <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
     <WixVariable Id="WixUIDialogBmp" Value="background.png" />
     <WixVariable Id="WixUIBannerBmp" Value="banner.png" />
-    <Feature Id="MainApplication" Title="Main Application" Level="1">
+    <Feature Id="MainApplication" Title="Processing" Level="1">
         <Files Include="..\build\compose\binaries\main\app\Processing\**" />
         <ComponentRef Id="ApplicationShortcut" />
     </Feature>