-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11 from otakulan/feature/tgh/arm64
Add arm64 installer
- Loading branch information
Showing
6 changed files
with
34 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 15 additions & 10 deletions
25
LanpartySeating.Desktop.Installer/Lanpartyseating.Desktop.Installer.wixproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,32 @@ | ||
| <Project Sdk="WixToolset.Sdk/4.0.2"> | ||
| <Project Sdk="WixToolset.Sdk/4.0.3"> | ||
| <PropertyGroup> | ||
| <!-- Default to Version 1.0.0 if not specified via /p:Version=x.x.x from cli --> | ||
| <Version Condition=" '$(Version)' == '' ">1.0.0</Version> | ||
| <!-- Propagate version information from msbuild to the WiX project --> | ||
| <DefineConstants>$(DefineConstants);Version=$(Version)</DefineConstants> | ||
| <DefineConstants>$(DefineConstants);Version=$(Version);PublishOutput=..\Lanpartyseating.Desktop\bin\$(Configuration)\net8.0-windows\win-$(InstallerPlatform)\publish</DefineConstants> | ||
| <OutputType>package</OutputType> | ||
| <TargetFramework>net7.0-windows</TargetFramework> | ||
| <InstallerPlatform>x64</InstallerPlatform> | ||
| <TargetFramework>net8.0-windows</TargetFramework> | ||
| <!-- Default to x64 if not specified via /p:InstallerPlatform=x64 or /p:InstallerPlatform=arm64 from cli --> | ||
| <InstallerPlatform Condition=" '$(InstallerPlatform)' == '' ">x64</InstallerPlatform> | ||
| <OutputName>LanpartySeating.Desktop.Installer-$(InstallerPlatform)</OutputName> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <HarvestDirectory Include="..\Lanpartyseating.Desktop\bin\$(Configuration)\net7.0-windows\"> | ||
| <HarvestDirectory Include="..\Lanpartyseating.Desktop\bin\$(Configuration)\net8.0-windows\win-$(InstallerPlatform)\publish\"> | ||
| <DirectoryRefId>INSTALLFOLDER</DirectoryRefId> | ||
| <ComponentGroupName>ApplicationFilesComponentGroup</ComponentGroupName> | ||
| <KeepEmptyDirectories>true</KeepEmptyDirectories> | ||
| <SuppressRootDirectory>true</SuppressRootDirectory> | ||
| <Transforms>ExcludeFiles.xslt</Transforms> | ||
| <PreprocessorVariable>var.PublishOutput</PreprocessorVariable> | ||
| </HarvestDirectory> | ||
| </ItemGroup> | ||
| <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild"> | ||
| <Message Text="BeforeBuild is running" Importance="high" /> | ||
| <Message Text="InstallerPlatform is $(InstallerPlatform)" Importance="high" /> | ||
| <Exec Command="dotnet publish ..\Lanpartyseating.Desktop\Lanpartyseating.Desktop.csproj -c Release -r win-$(InstallerPlatform) -o ..\Lanpartyseating.Desktop\bin\$(Configuration)\net8.0-windows\win-$(InstallerPlatform)\publish\" /> | ||
| </Target> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\Lanpartyseating.Desktop\Lanpartyseating.Desktop.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="WixToolset.Heat" Version="4.0.2" /> | ||
| <PackageReference Include="WixToolset.Util.wixext" Version="4.0.2" /> | ||
| <PackageReference Include="WixToolset.Heat" Version="4.0.3" /> | ||
| <PackageReference Include="WixToolset.Util.wixext" Version="4.0.3" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Lanpartyseating.Desktop.Tests/Lanpartyseating.Desktop.Tests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> | ||
| <s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=10ba09a3_002D1640_002D4bef_002Db3c4_002D8eaf8e690b9b/@EntryIndexedValue"><SessionState ContinuousTestingMode="0" IsActive="True" Name="Test_When_ForThisStationCalled_Then_MatchingStationNumberAndHostnameReturnTrue" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session">
 | ||
| <TestAncestor>
 | ||
| <TestId>xUnit::8B549C98-F78C-422A-8C26-E1D7A0881CAD::net7.0-windows::Lanpartyseating.Desktop.Tests.UtilsTests.Test_When_ForThisStationCalled_Then_MatchingStationNumberAndHostnameReturnTrue</TestId>
 | ||
| <TestId>xUnit::8B549C98-F78C-422A-8C26-E1D7A0881CAD::net8.0-windows::Lanpartyseating.Desktop.Tests.UtilsTests.Test_When_ForThisStationCalled_Then_MatchingStationNumberAndHostnameReturnTrue</TestId>
 | ||
| </TestAncestor>
 | ||
| </SessionState></s:String> | ||
| <s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=27b22507_002D9043_002D43f5_002D9688_002Df4a293a50701/@EntryIndexedValue"><SessionState ContinuousTestingMode="0" Name="Test_When_ForThisStationCalled_Then_MatchingStationNumberAndHostnameReturnTrue #2" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session">
 | ||
| <TestAncestor>
 | ||
| <TestId>xUnit::8B549C98-F78C-422A-8C26-E1D7A0881CAD::net7.0-windows::Lanpartyseating.Desktop.Tests.UtilsTests.Test_When_ForThisStationCalled_Then_MatchingStationNumberAndHostnameReturnTrue</TestId>
 | ||
| <TestId>xUnit::8B549C98-F78C-422A-8C26-E1D7A0881CAD::net8.0-windows::Lanpartyseating.Desktop.Tests.UtilsTests.Test_When_ForThisStationCalled_Then_MatchingStationNumberAndHostnameReturnTrue</TestId>
 | ||
| </TestAncestor>
 | ||
| </SessionState></s:String></wpf:ResourceDictionary> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters