spt/launcher
spt/launcher
0
0
Fork 0
mirror of https://github.com/sp-tarkov/launcher.git synced 2025-02-12 17:10:44 -05:00
Code

Merge pull request 'Migrate launcher to .net 8' (!45) from net8 into 3.8.0

Browse Source 
Reviewed-on: SPT-AKI/Launcher#45
This commit is contained in:
chomp 2024-03-09 14:01:00 +00:00
commit 50d16d8408
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project/Aki.Build/Aki.Build.csproj
View File

@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="dotnet publish ../Aki.Launcher/Aki.Launcher.csproj -c Release -f net6.0 -r win-x64 /p:IncludeNativeLibrariesForSelfExtract=true -p:PublishSingleFile=true --self-contained false"/>
<Exec Command="dotnet publish ../Aki.Launcher/Aki.Launcher.csproj -c Release -f net8.0 -r win-x64 /p:IncludeNativeLibrariesForSelfExtract=true -p:PublishSingleFile=true --self-contained false"/>
<Exec Command="pwsh -NoProfile -ExecutionPolicy Bypass ../build.ps1" WorkingDirectory="$(ProjectDir)" />
</Target>

2
project/Aki.ByteBanger/Aki.ByteBanger.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
</Project>

2
project/Aki.Launcher.Base/Aki.Launcher.Base.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Aki.Launch</RootNamespace>
</PropertyGroup>

2
project/Aki.Launcher/Aki.Launcher.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
<Nullable>enable</Nullable>

6
project/build.ps1
View File

@ -1,6 +1,6 @@
$buildFolder = "..\Build"
$akiDataFolder = "..\Build\Aki_Data"
$launcherExeFolder = "..\Aki.Launcher\bin\Release\net6.0\win-x64\publish"
$launcherExeFolder = "..\Aki.Launcher\bin\Release\net8.0\win-x64\publish"
$launcherAssetFolder = "..\Aki.Launcher\Aki_Data"
$licenseFile = "..\..\LICENSE.md"
@ -14,8 +14,8 @@ foreach ($folder in $foldersToCreate) {
}
# Move built files to the build folder
Copy-Item -Path "$launcherExeFolder\Aki.Launcher.exe" -Destination "$buildFolder"
Copy-Item -Path "$launcherAssetFolder" -Destination "$buildFolder" -Recurse
Copy-Item -Path "$launcherExeFolder\Aki.Launcher.exe" -Destination "$buildFolder" -Force
Copy-Item -Path "$launcherAssetFolder" -Destination "$buildFolder" -Recurse -Force
# If any new DLLs need to be copied, add here
# Write the contents of the license file to a txt in the build folder