From a0027e13b90ae7f7374497639f993a384fc3992f Mon Sep 17 00:00:00 2001
From: Christoph Wille <christoph.wille@gmail.com>
Date: Sat, 5 Aug 2023 15:19:10 +0200
Subject: [PATCH] DefineConstants overrides defined constants in all projects;
 use property to amend constants.

---
 .github/workflows/build-ilspy.yml      | 2 +-
 ILSpy.Installer/ILSpy.Installer.csproj | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-ilspy.yml b/.github/workflows/build-ilspy.yml
index 2b6b3ed2c..89291c79b 100644
--- a/.github/workflows/build-ilspy.yml
+++ b/.github/workflows/build-ilspy.yml
@@ -95,7 +95,7 @@ jobs:
       run: |
         msbuild ILSpy.Installer.sln /t:Restore /p:Configuration="Release" /p:Platform="Any CPU"
         msbuild ILSpy.Installer.sln /p:Configuration="Release" /p:Platform="Any CPU"
-        msbuild ILSpy.Installer.sln /p:Configuration="Release" /p:Platform="Any CPU" /p:DefineConstants="ARM64"
+        msbuild ILSpy.Installer.sln /p:Configuration="Release" /p:Platform="Any CPU" /p:PlatformForInstaller="ARM64"
 
     - name: Build VS Extensions (for 2017-2019 and 2022)
       if: matrix.configuration == 'release'  
diff --git a/ILSpy.Installer/ILSpy.Installer.csproj b/ILSpy.Installer/ILSpy.Installer.csproj
index 6567b67ae..0697d3872 100644
--- a/ILSpy.Installer/ILSpy.Installer.csproj
+++ b/ILSpy.Installer/ILSpy.Installer.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -6,6 +6,10 @@
     <StartupObject>ILSpy.Installer.Builder</StartupObject>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);$(PlatformForInstaller)</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="WixSharp" Version="1.22.0" />
     <PackageReference Include="WixSharp.wix.bin" Version="3.14.0" />