Specified the WindowsTargetPlatformVersion property in msbuild instea…

…d of vcxproj.
nathancorvussolis · Jul 25, 2024 · 05d5208 · 05d5208
1 parent a778104
commit 05d5208
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 20 deletions.
diff --git a/imcrvtip/imcrvtip.vcxproj b/imcrvtip/imcrvtip.vcxproj
@@ -48,9 +48,6 @@
     <RootNamespace>imcrvtip</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)'=='ARM'" Label="Globals">
-    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>

diff --git a/installer/_build_msi.cmd b/installer/_build_msi.cmd
@@ -13,16 +13,16 @@ if not defined SIGNCOMMAND set SignOutput=false
 set BUILDCOMMAND=dotnet build installer-msi.wixproj -nologo -verbosity:normal -target:Build
 
 echo build x86.msi
-%BUILDCOMMAND% -property:TargetPlatform=x86 -property:InstallerPlatform=x86 -property:BaseIntermediateOutputPath=%OutDir%\x86\
+%BUILDCOMMAND% -property:PackagePlatform=x86 -property:InstallerPlatform=x86 -property:BaseIntermediateOutputPath=%OutDir%\x86\
 
 echo build x64.msi
-%BUILDCOMMAND% -property:TargetPlatform=x64 -property:InstallerPlatform=x64 -property:BaseIntermediateOutputPath=%OutDir%\x64\
+%BUILDCOMMAND% -property:PackagePlatform=x64 -property:InstallerPlatform=x64 -property:BaseIntermediateOutputPath=%OutDir%\x64\
 
 echo build arm32.msi
-%BUILDCOMMAND% -property:TargetPlatform=arm32 -property:InstallerPlatform=arm64 -property:BaseIntermediateOutputPath=%OutDir%\arm32\
+%BUILDCOMMAND% -property:PackagePlatform=arm32 -property:InstallerPlatform=arm64 -property:BaseIntermediateOutputPath=%OutDir%\arm32\
 
 echo build arm64.msi
-%BUILDCOMMAND% -property:TargetPlatform=arm64 -property:InstallerPlatform=arm64 -property:BaseIntermediateOutputPath=%OutDir%\arm64\
+%BUILDCOMMAND% -property:PackagePlatform=arm64 -property:InstallerPlatform=arm64 -property:BaseIntermediateOutputPath=%OutDir%\arm64\
 
 popd
 endlocal
diff --git a/installer/_solution_build.cmd b/installer/_solution_build.cmd
@@ -16,7 +16,7 @@ rem x64
 %BUILDCOMMAND% -property:Platform=x64
 
 rem ARM32
-%BUILDCOMMAND% -property:Platform=ARM
+%BUILDCOMMAND% -property:Platform=ARM -property:WindowsTargetPlatformVersion=10.0.22621.0
 
 rem ARM64
 %BUILDCOMMAND% -property:Platform=ARM64

diff --git a/installer/_solution_build_debug.cmd b/installer/_solution_build_debug.cmd
@@ -16,7 +16,7 @@ rem x64
 %BUILDCOMMAND% -property:Platform=x64
 
 rem ARM32
-%BUILDCOMMAND% -property:Platform=ARM
+%BUILDCOMMAND% -property:Platform=ARM -property:WindowsTargetPlatformVersion=10.0.22621.0
 
 rem ARM64
 %BUILDCOMMAND% -property:Platform=ARM64

diff --git a/installer/installer-msi.wixproj b/installer/installer-msi.wixproj
@@ -12,28 +12,28 @@
     <SignOutput />
     -->
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetPlatform)'=='x86'">
+  <PropertyGroup Condition="'$(PackagePlatform)'=='x86'">
     <OutputName>x86</OutputName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetPlatform)'=='x64'">
+  <PropertyGroup Condition="'$(PackagePlatform)'=='x64'">
     <OutputName>x64</OutputName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetPlatform)'=='arm32'">
+  <PropertyGroup Condition="'$(PackagePlatform)'=='arm32'">
     <OutputName>arm32</OutputName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetPlatform)'=='arm64'">
+  <PropertyGroup Condition="'$(PackagePlatform)'=='arm64'">
     <OutputName>arm64</OutputName>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetPlatform)'=='x86'">
+  <ItemGroup Condition="'$(PackagePlatform)'=='x86'">
     <Compile Include="installer-x86.wxs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetPlatform)'=='x64'">
+  <ItemGroup Condition="'$(PackagePlatform)'=='x64'">
     <Compile Include="installer-x64.wxs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetPlatform)'=='arm32'">
+  <ItemGroup Condition="'$(PackagePlatform)'=='arm32'">
     <Compile Include="installer-arm32.wxs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetPlatform)'=='arm64'">
+  <ItemGroup Condition="'$(PackagePlatform)'=='arm64'">
     <Compile Include="installer-arm64.wxs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/libinput/libinput.vcxproj b/libinput/libinput.vcxproj
@@ -49,9 +49,6 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>libinput</ProjectName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)'=='ARM'" Label="Globals">
-    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>