.NET 7 BABYYYYYYY

.github/workflows/build-test.yml

@@ -15,9 +15,9 @@ jobs:
       with:
         submodules: 'recursive'
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.*
+        dotnet-version: 7.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/publish-release.yml

@@ -14,10 +14,10 @@ jobs:
       uses: actions/checkout@v2
       with:
         submodules: 'recursive'
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.*
+        dotnet-version: 7.0.x
     - name: Create build
       run: ./publish.sh
 

Launcher.props

@@ -1,6 +1,13 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <!--
+        Me from the present putting a note so me from the future doesn't oopsie like me from the past did:
+        Other places this value needs to be updated:
+        1. Packaging scripts.
+        2. Download .NET runtime script.
+        3. Local dev SS14.Loader launching code.z
+        -->
+        <TargetFramework>net7.0</TargetFramework>
         <Version>0.19.0</Version>
     </PropertyGroup>
 </Project>

download_net_runtime.py

@@ -12,12 +12,12 @@
 PLATFORM_LINUX = "linux"
 PLATFORM_MACOS = "mac"
 
-DOTNET_RUNTIME_VERSION = "6.0.4"
+DOTNET_RUNTIME_VERSION = "7.0.0"
 
 DOTNET_RUNTIME_DOWNLOADS = {
-    PLATFORM_LINUX: "https://download.visualstudio.microsoft.com/download/pr/5b08d331-15ac-4a53-82a5-522fa45b1b99/65ae300dd160ae0b88b91dd78834ce3e/dotnet-runtime-6.0.4-linux-x64.tar.gz",
-    PLATFORM_WINDOWS: "https://download.visualstudio.microsoft.com/download/pr/3feaabc7-1786-4012-8e00-d664f00581e9/8d9b529256502637663ddd4048de04dc/dotnet-runtime-6.0.4-win-x64.zip",
-    PLATFORM_MACOS: "https://download.visualstudio.microsoft.com/download/pr/c0bc0428-852d-4884-b536-3d0969a400ba/fe0a9a221c3e665e88b7020633f2cf8e/dotnet-runtime-6.0.4-osx-x64.tar.gz"
+    PLATFORM_LINUX: "https://download.visualstudio.microsoft.com/download/pr/d4b0a69b-29cd-40ef-9e95-a8d16f0ff346/5844add76ae3917af9efd59d95e3cbd4/dotnet-runtime-7.0.0-linux-x64.tar.gz",
+    PLATFORM_WINDOWS: "https://download.visualstudio.microsoft.com/download/pr/243bac9c-0559-4d5e-9ab3-60aa92ef51bd/1bb509033e17301021a458b4214f0931/dotnet-runtime-7.0.0-win-x64.zip",
+    PLATFORM_MACOS: "https://download.visualstudio.microsoft.com/download/pr/93aca2a1-570c-4db7-90a1-de89a3a53f27/2d443a62676d498918def9188859f900/dotnet-runtime-7.0.0-osx-x64.tar.gz"
 }
 
 p = os.path.join

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/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 SS14.Launcher/bin/Release/net7.0/linux-x64/publish/* bin/publish/Linux/bin/
+cp SS14.Loader/bin/Release/net7.0/linux-x64/publish/* bin/publish/Linux/bin/loader
 cp -r Dependencies/dotnet/linux/* bin/publish/Linux/dotnet/
 
 cd bin/publish/Linux

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/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/"
+cp -r SS14.Launcher/bin/Release/net7.0/osx-x64/publish/* "bin/publish/macOS/Space Station 14 Launcher.app/Contents/Resources/bin/"
+cp -r SS14.Loader/bin/Release/net7.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

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/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
+./exe_set_subsystem.py "SS14.Launcher/bin/Release/net7.0/win-x64/publish/SS14.Launcher.exe" 2
+./exe_set_subsystem.py "SS14.Loader/bin/Release/net7.0/win-x64/publish/SS14.Loader.exe" 2
 
 # Create intermediate directories.
 mkdir -p bin/publish/Windows/bin
@@ -23,8 +23,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.Bootstrap/console.bat" bin/publish/Windows
-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
+cp SS14.Launcher/bin/Release/net7.0/win-x64/publish/* bin/publish/Windows/bin
+cp SS14.Loader/bin/Release/net7.0/win-x64/publish/* bin/publish/Windows/bin/loader
 
 pushd bin/publish/Windows
 zip -r ../../../SS14.Launcher_Windows.zip *