Updating to dotnet 6.0.

PixelVision8 · Nov 11, 2021 · 7de78a0 · 7de78a0
1 parent 84d7d77
commit 7de78a0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/pixel-vision-8-release-builder.yml b/.github/workflows/pixel-vision-8-release-builder.yml
@@ -64,11 +64,11 @@ jobs:
           echo "CURRENT=${my_array[0]:1}.$((${my_array[1]} - 1)).$((${my_array[2]}))" >> $GITHUB_ENV
           echo "PREVIOUS=${my_array[0]:1}.$((${my_array[1]} - 2)).0" >> $GITHUB_ENV
 
-     # Setup dotnet v5.0.x
+     # Setup dotnet v6.0.x
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
 
       - name: Use Node.js
         uses: actions/setup-node@v1

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "gulp-build",
-            "program": "${workspaceFolder}/App/bin/Debug/net5.0/SpaceStation8.dll",
+            "program": "${workspaceFolder}/App/bin/Debug/SpaceStation8.dll",
             "args": ["Game"],
             "cwd": "${workspaceFolder}/",
             "console": "internalConsole",

diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/App/SpaceStation8.CoreDesktop.csproj b/App/SpaceStation8.CoreDesktop.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <DefineConstants>OPENGL;OPENAL;XNADESIGNPROVIDED;LINUX;DESKTOPGL;SUPPORTS_EFX;NETSTANDARD;STBSHARP_INTERNAL</DefineConstants>
     <OutputType>winexe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <UseAppHost>true</UseAppHost>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 	  <IsPackable>true</IsPackable>
@@ -12,6 +12,8 @@
     <PublishTrimmed>true</PublishTrimmed>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
 
   <PropertyGroup>