try fix build idk

This commit is contained in:
Bluzume 2021-10-26 02:39:28 -04:00
parent 99f10ead55
commit bbdca23379
4 changed files with 42 additions and 26 deletions

View file

@ -5,6 +5,14 @@
<LangVersion>8.0</LangVersion>
<Platforms>x64;x86;ARM;ARM64</Platforms>
<Configurations>Windows;Debug;Linux;MacOS</Configurations>
<DefineConstants Condition="'$(Platform)'=='x86'">ARCH_x86</DefineConstants>
<DefineConstants Condition="'$(Platform)'=='x64'">ARCH_x86_64</DefineConstants>
<DefineConstants Condition="'$(Platform)'=='ARM'">ARCH_ARM</DefineConstants>
<DefineConstants Condition="'$(Platform)'=='ARM64'">ARCH_ARM64</DefineConstants>
<DefineConstants Condition="'$(Configuration)'=='Linux'">OS_LINUX</DefineConstants>
<DefineConstants Condition="'$(Configuration)'=='MacOS'">OS_MACOS</DefineConstants>
<DefineConstants Condition="'$(Configuration)'=='Windows'">OS_WINDOWS</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
@ -26,8 +34,8 @@
copy "$(SolutionDir)..\HorseIsleData\HI1.MAP" "$(TargetDir)HI1.MAP" /Y
</PostBuildEvent>
<PostBuildEvent Condition="'$(OS)' != 'Windows_NT'">
cp -f "$(MSBuildThisFileDirectory)../../HorseIsleData/gamedata.json" "$(TargetDir)gamedata.json"
cp -f "$(MSBuildThisFileDirectory)../../HorseIsleData/HI1.MAP" "$(TargetDir)HI1.MAP"
cp -f "$(SolutionDir)../HorseIsleData/gamedata.json" "$(TargetDir)gamedata.json"
cp -f "$(SolutionDir)./HorseIsleData/HI1.MAP" "$(TargetDir)HI1.MAP"
</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
@ -42,50 +50,40 @@
<StartupObject>HISP.Program</StartupObject>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|x86'">
<ApplicationIcon>icon.ico</ApplicationIcon>
<TargetFramework>net5.0</TargetFramework>
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
<Optimize>true</Optimize>
<PlatformTarget>x86</PlatformTarget>
<DefineConstants>OS_WINDOWS;ARCH_X86</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|x64'">
<ApplicationIcon>icon.ico</ApplicationIcon>
<TargetFramework>net5.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<Optimize>true</Optimize>
<PlatformTarget>x64</PlatformTarget>
<DefineConstants>OS_WINDOWS;ARCH_X86_64</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|ARM'">
<RuntimeIdentifier>win-arm</RuntimeIdentifier>
<Optimize>true</Optimize>
<PlatformTarget>arm</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux|x64'">
<TargetFramework>net5.0</TargetFramework>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<Optimize>true</Optimize>
<PlatformTarget>x64</PlatformTarget>
<DefineConstants>OS_LINUX;ARCH_X86_64</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MacOS|x64'">
<TargetFramework>net5.0</TargetFramework>
<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
<Optimize>true</Optimize>
<PlatformTarget>x64</PlatformTarget>
<DefineConstants>OS_MACOS;ARCH_x86_64</DefineConstants>
</PropertyGroup>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux|ARM'">
<TargetFramework>net5.0</TargetFramework>
<RuntimeIdentifier>linux-arm</RuntimeIdentifier>
<PlatformTarget>arm</PlatformTarget>
<Optimize>true</Optimize>
<PlatformTarget>ARM</PlatformTarget>
<DefineConstants>OS_LINUX;ARCH_ARM</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux|ARM64'">
<TargetFramework>net5.0</TargetFramework>
<RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
<PlatformTarget>arm64</PlatformTarget>
<Optimize>true</Optimize>
<PlatformTarget>ARM64</PlatformTarget>
<DefineConstants>OS_LINUX;ARCH_ARM64</DefineConstants>
</PropertyGroup>
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<Exec Command="git rev-parse --verify HEAD&gt;&quot;$(ProjectDir)Resources\GitCommit&quot;" />
</Target>

View file

@ -2,6 +2,6 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ActiveDebugProfile>HorseIsleServer</ActiveDebugProfile>
<_LastSelectedProfileId>C:\Users\SilicaAndPina\Documents\HISP\HorseIsleServer\HorseIsleServer\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
<_LastSelectedProfileId>C:\Users\Silica\Documents\GitHub\HISP\HorseIsleServer\HorseIsleServer\Properties\PublishProfiles\Win32.pubxml</_LastSelectedProfileId>
</PropertyGroup>
</Project>

View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration>Windows</Configuration>
<Platform>ARM</Platform>
<PublishDir>bin\arm\Windows\net5.0\windows-arm\publish\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net5.0</TargetFramework>
<RuntimeIdentifier>win-arm</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed>
</PropertyGroup>
</Project>

View file

@ -1 +1 @@
0cad1e0fac960fe59b55444cf1f0fd423d2e4951
99f10ead55e2e76a0c31216d2aa6b8aa3b9d33c4