From 6c29416a2d4bea5b641145e3b675340d5f7495b8 Mon Sep 17 00:00:00 2001
From: CWXDEV <CWXDEV@outlook.com>
Date: Fri, 16 Feb 2024 19:41:21 +0000
Subject: [PATCH] fix script to publish launcher before copying files

---
 project/Aki.Build/Aki.Build.csproj       | 11 +++--------
 project/Aki.Launcher/Aki.Launcher.csproj |  2 +-
 project/build.bat                        |  5 +++--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/project/Aki.Build/Aki.Build.csproj b/project/Aki.Build/Aki.Build.csproj
index 8d19cda..f9c6177 100644
--- a/project/Aki.Build/Aki.Build.csproj
+++ b/project/Aki.Build/Aki.Build.csproj
@@ -2,17 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Aki.ByteBanger\Aki.ByteBanger.csproj" />
-    <ProjectReference Include="..\Aki.Launcher.Base\Aki.Launcher.Base.csproj" />
-    <ProjectReference Include="..\Aki.Launcher\Aki.Launcher.csproj" />
-  </ItemGroup>
-
     <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-        <Exec Command="../build.bat" WorkingDirectory="$(ProjectDir)" />
+      <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="../build.bat" WorkingDirectory="$(ProjectDir)" />
     </Target>
 
 </Project>
diff --git a/project/Aki.Launcher/Aki.Launcher.csproj b/project/Aki.Launcher/Aki.Launcher.csproj
index 29ff631..f15c8bd 100644
--- a/project/Aki.Launcher/Aki.Launcher.csproj
+++ b/project/Aki.Launcher/Aki.Launcher.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
-    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     <Nullable>enable</Nullable>
     <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
diff --git a/project/build.bat b/project/build.bat
index f6005eb..f08f3c2 100644
--- a/project/build.bat
+++ b/project/build.bat
@@ -2,7 +2,8 @@
 :: Set some Vars to use
 set buildFolder=..\Build
 set akiDataFolder=..\Build\Aki_Data
-set projReleaseFolder=.\bin\Release\net6.0\win10-x64
+set projReleaseFolder=.\bin\Release\net6.0\win-x64
+set launcherExeFolder=..\Aki.Launcher\bin\Release\net6.0\win-x64\publish
 set launcherAssetFolder=..\Aki.Launcher\Aki_Data
 set licenseFile=..\..\LICENSE.md
 
@@ -23,7 +24,7 @@ echo --------------- Done Creating Output Build Folders ---------------
 echo --------------- Moving DLLs to %buildFolder% ---------------
 
 :: Move DLLs/exe/json project's bin\Release folder to the build folder
-xcopy "%projReleaseFolder%\Aki.Launcher.exe" %buildFolder%
+xcopy "%launcherExeFolder%\Aki.Launcher.exe" %buildFolder%
 xcopy "%launcherAssetFolder%" "%buildFolder%\Aki_Data" /s /e
 
 :: If any new Dll's need to be copied, add here