it should work now

space-wizards · Nov 9, 2021 · 76e23e0 · 76e23e0
1 parent 4799279
commit 76e23e0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/SS14.Launcher/Models/Connector.cs b/SS14.Launcher/Models/Connector.cs
@@ -358,7 +358,7 @@ private static async Task<ProcessStartInfo> GetLoaderStartInfo()
             basePath = Path.GetFullPath(Path.Combine(
                 LauncherPaths.DirLauncherInstall,
                 "..", "..", "..", "..",
-                "SS14.Loader", "bin", "Debug", "net5.0"));
+                "SS14.Loader", "bin", "Debug", "net6.0"));
         }
 
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
@@ -451,4 +451,4 @@ public ConnectException(ConnectionStatus status, Exception inner)
             Status = status;
         }
     }
-}
+}
diff --git a/publish_linux.sh b/publish_linux.sh
@@ -17,8 +17,8 @@ mkdir -p bin/publish/Linux/bin/loader
 mkdir -p bin/publish/Linux/dotnet
 
 cp PublishFiles/SS14.Launcher PublishFiles/SS14.desktop bin/publish/Linux/
-cp SS14.Launcher/bin/Release/net5.0/linux-x64/publish/* bin/publish/Linux/bin/
-cp SS14.Loader/bin/Release/net5.0/linux-x64/publish/* bin/publish/Linux/bin/loader
+cp SS14.Launcher/bin/Release/net6.0/linux-x64/publish/* bin/publish/Linux/bin/
+cp SS14.Loader/bin/Release/net6.0/linux-x64/publish/* bin/publish/Linux/bin/loader
 cp -r Dependencies/dotnet/linux/* bin/publish/Linux/dotnet/
 
 cd bin/publish/Linux

diff --git a/publish_osx.sh b/publish_osx.sh
@@ -21,8 +21,8 @@ mkdir -p "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/bin
 mkdir -p "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/bin/loader/Space Station 14.app/Contents/Resources/bin/"
 
 cp -r Dependencies/dotnet/mac/* "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/dotnet/"
-cp -r SS14.Launcher/bin/Release/net5.0/osx-x64/publish/* "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/bin/"
-cp -r SS14.Loader/bin/Release/net5.0/osx-x64/publish/* "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/bin/loader/Space Station 14.app/Contents/Resources/bin/"
+cp -r SS14.Launcher/bin/Release/net6.0/osx-x64/publish/* "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/bin/"
+cp -r SS14.Loader/bin/Release/net6.0/osx-x64/publish/* "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/bin/loader/Space Station 14.app/Contents/Resources/bin/"
 pushd bin/publish/macOS
 zip -r ../../../SS14.Launcher_macOS.zip *
 popd
diff --git a/publish_windows.sh b/publish_windows.sh
@@ -12,8 +12,8 @@ dotnet publish SS14.Launcher/SS14.Launcher.csproj /p:FullRelease=True -c Release
 dotnet publish SS14.Loader/SS14.Loader.csproj -c Release --no-self-contained -r win-x64 /nologo
 dotnet publish SS14.Launcher.Bootstrap/SS14.Launcher.Bootstrap.csproj -c Release /nologo
 
-./exe_set_subsystem.py "SS14.Launcher/bin/Release/net5.0/win-x64/publish/SS14.Launcher.exe" 2
-./exe_set_subsystem.py "SS14.Loader/bin/Release/net5.0/win-x64/publish/SS14.Loader.exe" 2
+./exe_set_subsystem.py "SS14.Launcher/bin/Release/net6.0/win-x64/publish/SS14.Launcher.exe" 2
+./exe_set_subsystem.py "SS14.Loader/bin/Release/net6.0/win-x64/publish/SS14.Loader.exe" 2
 
 # Create intermediate directories.
 mkdir -p bin/publish/Windows/bin
@@ -22,8 +22,8 @@ mkdir -p bin/publish/Windows/dotnet
 
 cp -r Dependencies/dotnet/windows/* bin/publish/Windows/dotnet
 cp "SS14.Launcher.Bootstrap/bin/Release/net45/publish/Space Station 14 Launcher.exe" bin/publish/Windows
-cp SS14.Launcher/bin/Release/net5.0/win-x64/publish/* bin/publish/Windows/bin
-cp SS14.Loader/bin/Release/net5.0/win-x64/publish/* bin/publish/Windows/bin/loader
+cp SS14.Launcher/bin/Release/net6.0/win-x64/publish/* bin/publish/Windows/bin
+cp SS14.Loader/bin/Release/net6.0/win-x64/publish/* bin/publish/Windows/bin/loader
 
 pushd bin/publish/Windows
 zip -r ../../../SS14.Launcher_Windows.zip *