Packaging fixes (trimmed builds apparently do not cope well for this …

…project :|), also fixed steam exe auto-detect.
TLeonardUK · Sep 11, 2021 · ded808c · ded808c
1 parent 2e3a35c
commit ded808c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -65,7 +65,7 @@ jobs:
         replacements: '1.0.0.0=${{env.VERSION_NUMBER}}'
 
     - name: Package DotNet
-      run: dotnet publish ./Source/Loader/Loader.csproj -r win-x64 -c Release --output ${{github.workspace}}/Bin/Loader/Package/ /p:PublishSingleFile=true /p:PublishTrimmed=true /p:IncludeNativeLibrariesForSelfExtract=true /p:Version=${{env.VERSION_NUMBER}}${{env.VERSION_NUMBER_POSTFIX}} /p:FileVersion=${{env.VERSION_NUMBER}} /p:AssemblyVersion=${{env.VERSION_NUMBER}}
+      run: dotnet publish ./Source/Loader/Loader.csproj -r win-x64 -c Release --output ${{github.workspace}}/Bin/Loader/Package/ /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true /p:Version=${{env.VERSION_NUMBER}}${{env.VERSION_NUMBER_POSTFIX}} /p:FileVersion=${{env.VERSION_NUMBER}} /p:AssemblyVersion=${{env.VERSION_NUMBER}}
 
     - name: Build
       working-directory: ${{env.GITHUB_WORKSPACE}}

diff --git a/Source/Loader/Forms/MainForm.cs b/Source/Loader/Forms/MainForm.cs
@@ -114,7 +114,7 @@ private void BuildServerList()
 
         private void OnLoaded(object sender, EventArgs e)
         {
-            string PredictedInstallPath = SteamUtils.GetGameInstallPath("DARK SOULS III") + @"Game\DarkSoulsIII.exe";
+            string PredictedInstallPath = SteamUtils.GetGameInstallPath("DARK SOULS III") + @"\Game\DarkSoulsIII.exe";
             if (!File.Exists(ProgramSettings.Default.exe_location) && File.Exists(PredictedInstallPath))
             {
                 ProgramSettings.Default.exe_location = PredictedInstallPath;

diff --git a/Source/Loader/Utils/SteamUtils.cs b/Source/Loader/Utils/SteamUtils.cs
@@ -57,8 +57,7 @@ public static string GetGameInstallPath(string FolderName)
                 }
 
                 string Key = Trimmed.Substring(IndexKeyStart + 1, IndexKeyEnd - IndexKeyStart - 1);
-                int LibraryNumber = 0;
-                if (!int.TryParse(Key, out LibraryNumber))
+                if (Key != "path")
                 {
                     continue;
                 }