diff --git a/.github/workflows/pixel-vision-8-release-builder.yml b/.github/workflows/pixel-vision-8-release-builder.yml index 434e942..ce7397a 100755 --- 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 index ebb73f2..607c81a 100755 --- 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 deleted file mode 100755 index 21f8a7d..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Lua.diagnostics.globals": [ - "hitRect", - "mapLoader" - ] -} \ No newline at end of file diff --git a/App/SpaceStation8.CoreDesktop.csproj b/App/SpaceStation8.CoreDesktop.csproj index 86112a4..e5e0588 100755 --- a/App/SpaceStation8.CoreDesktop.csproj +++ b/App/SpaceStation8.CoreDesktop.csproj @@ -3,7 +3,7 @@ OPENGL;OPENAL;XNADESIGNPROVIDED;LINUX;DESKTOPGL;SUPPORTS_EFX;NETSTANDARD;STBSHARP_INTERNAL winexe - net5.0 + net6.0 true false true @@ -12,6 +12,8 @@ true false true + false + false