From 10abdb0b77b0705688c7dcb4974a38fa173c7d28 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 28 Jul 2024 15:44:04 +0300
Subject: [PATCH] Add unciv version as env variable referenced in build

---
 .github/workflows/CI.yml | 1 +
 Unciv.wixproj            | 7 -------
 unciv.wxs                | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 Unciv.wixproj

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 3ebd47c..0362bb2 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -29,6 +29,7 @@ jobs:
         
       - name: Build WiX on Windows
         run: |
+          set UNCIV_VERSION=4.12.14
           wix build .\unciv.wxs
           dir
         
diff --git a/Unciv.wixproj b/Unciv.wixproj
deleted file mode 100644
index 81e25c2..0000000
--- a/Unciv.wixproj
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project Sdk="WixToolset.Sdk/5.0.0" ToolsVersion="5.0">
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Firewall.wixext" Version="5.0.0" />
-    <PackageReference Include="WixToolset.Util.wixext" Version="5.0.0" />
-    <PackageReference Include="WixToolset.Heat" Version="5.0.0" />
-  </ItemGroup>
-</Project>
diff --git a/unciv.wxs b/unciv.wxs
index 8826eb2..d5d9087 100644
--- a/unciv.wxs
+++ b/unciv.wxs
@@ -5,7 +5,7 @@
     <Package Language="1033"
              Manufacturer="Yair Morgenstern"
              Name="$(var.Name)"
-             Version="4.12.13"
+             Version="$(env.UNCIV_VERSION)"
             UpgradeCode="74d42802-054a-4869-a703-658c361fe94c">
         <Icon Id="icon.ico" SourceFile="files/Unciv.ico"/>
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." Schedule="afterInstallInitialize" />