mirror of
https://github.com/sp-tarkov/launcher.git
synced 2025-02-12 16:50:43 -05:00
Merge pull request 'update all build stuff to net8.0' (!44) from waffle.lord/Launcher:net8 into net8
Reviewed-on: SPT-AKI/Launcher#44
This commit is contained in:
commit
02a4748efd
@ -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>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<RootNamespace>Aki.Launch</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user