From db4ef9f56a674117d97f439b042ffaf400f72a97 Mon Sep 17 00:00:00 2001 From: Joanna May Date: Mon, 25 Sep 2023 22:24:53 -0500 Subject: [PATCH 1/5] fix: version, environment, extensions, debugging --- .vscode/extensions.json | 13 ++++++++----- .vscode/launch.json | 4 ++-- Chickensoft.GodotGame.csproj | 4 ++-- global.json | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 5134864..5768a33 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,12 +1,15 @@ { "recommendations": [ + "alfish.godot-files", + "christian-kohler.path-intellisense", + "DavidAnson.vscode-markdownlint", + "EditorConfig.EditorConfig", + "gurumukhi.selected-lines-count", + "jjkim.gdscript", + "josefpihrt-vscode.roslynator", "ms-dotnettools.csharp", "selcukermaya.se-csproj-extensions", - "josefpihrt-vscode.roslynator", "streetsidesoftware.code-spell-checker", - "VisualStudioExptTeam.vscodeintellicode", - "DavidAnson.vscode-markdownlint", - "alfish.godot-files", - "jjkim.gdscript" + "VisualStudioExptTeam.vscodeintellicode" ] } diff --git a/.vscode/launch.json b/.vscode/launch.json index e64c100..b3e5b3c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -22,7 +22,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${env:GODOT4}", + "program": "${env:GODOT}", "args": [ "${fileDirname}/${fileBasenameNoExtension}.tscn" ], @@ -34,7 +34,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${env:GODOT4}", + "program": "${env:GODOT}", "args": [ // These command line flags are used by GoDotTest to run tests. "--run-tests", diff --git a/Chickensoft.GodotGame.csproj b/Chickensoft.GodotGame.csproj index 61485db..a06e5db 100644 --- a/Chickensoft.GodotGame.csproj +++ b/Chickensoft.GodotGame.csproj @@ -1,6 +1,6 @@ - net6.0 + net7.0 true 10.0 enable @@ -13,7 +13,7 @@ - full + portable true Chickensoft.GodotGame 1.0.0 diff --git a/global.json b/global.json index 3b0a9a1..708c08e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.414", + "version": "8.0.100-preview.7", "rollForward": "major" }, "msbuild-sdks": { From a1936ac6b4f91d756de5d9be75bc2eddc12129ae Mon Sep 17 00:00:00 2001 From: Joanna May Date: Mon, 25 Sep 2023 22:28:42 -0500 Subject: [PATCH 2/5] fix: update GODOT4 environment var to GODOT --- .vscode/launch.json | 8 ++++---- .vscode/tasks.json | 2 +- README.md | 2 +- coverage.ps1 | 4 ++-- coverage.sh | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index b3e5b3c..fa50d33 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,16 +1,16 @@ { "version": "0.2.0", "configurations": [ - // For these launch configurations to work, you need to setup a GODOT4 + // For these launch configurations to work, you need to setup a GODOT // environment variable. On mac or linux, this can be done by adding // the following to your .zshrc, .bashrc, or .bash_profile file: - // export GODOT4="/Applications/Godot.app/Contents/MacOS/Godot" + // export GODOT="/Applications/Godot.app/Contents/MacOS/Godot" { "name": "🕹 Debug Game", "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${env:GODOT4}", + "program": "${env:GODOT}", "args": [], "cwd": "${workspaceFolder}", "stopAtEntry": false, @@ -48,7 +48,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${env:GODOT4}", + "program": "${env:GODOT}", "args": [ // These command line flags are used by GoDotTest to run tests. "--run-tests=${fileBasenameNoExtension}", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 2b70a48..0276b99 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -38,7 +38,7 @@ { "label": "build-solutions", "group": "test", - "command": "dotnet restore; ${env:GODOT4} --headless --build-solutions --quit || exit 0", + "command": "dotnet restore; ${env:GODOT} --headless --build-solutions --quit || exit 0", "type": "shell", "options": { "cwd": "${workspaceFolder}" diff --git a/README.md b/README.md index 230b622..98376b2 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ Several launch profiles are included for Visual Studio Code: Note that each launch profile will trigger a build (see `./.vscode/tasks.json`) before debugging the game. -> ⚠️ **Important:** You must setup a `GODOT4` environment variable for the launch configurations above. If you haven't done so already, please see the [Chickensoft Setup Docs][setup-docs]. +> ⚠️ **Important:** You must setup a `GODOT` environment variable for the launch configurations above. If you haven't done so already, please see the [Chickensoft Setup Docs][setup-docs]. ## 🏭 CI/CD diff --git a/coverage.ps1 b/coverage.ps1 index d7fe48b..8d7f0eb 100644 --- a/coverage.ps1 +++ b/coverage.ps1 @@ -1,6 +1,6 @@ # To collect code coverage, you will need the following environment setup: # -# - A "GODOT4" environment variable pointing to the Godot executable +# - A "GODOT" environment variable pointing to the Godot executable # - ReportGenerator installed # # dotnet tool install -g dotnet-reportgenerator-globaltool @@ -20,7 +20,7 @@ dotnet build --no-restore coverlet ` "./.godot/mono/temp/bin/Debug" --verbosity detailed ` - --target $env:GODOT4 ` + --target $env:GODOT ` --targetargs "--run-tests --coverage --quit-on-finish" ` --format "opencover" ` --output "./coverage/coverage.xml" ` diff --git a/coverage.sh b/coverage.sh index 952a31f..8fbb2e8 100755 --- a/coverage.sh +++ b/coverage.sh @@ -2,7 +2,7 @@ # To collect code coverage, you will need the following environment setup: # -# - A "GODOT4" environment variable pointing to the Godot executable +# - A "GODOT" environment variable pointing to the Godot executable # - ReportGenerator installed # # dotnet tool install -g dotnet-reportgenerator-globaltool @@ -26,7 +26,7 @@ dotnet build --no-restore coverlet \ "./.godot/mono/temp/bin/Debug" --verbosity detailed \ - --target $GODOT4 \ + --target $GODOT \ --targetargs "--run-tests --coverage --quit-on-finish" \ --format "opencover" \ --output "./coverage/coverage.xml" \ From 9cc38c50fadd0544e5d2db6a2b9996f0c4a3be93 Mon Sep 17 00:00:00 2001 From: Joanna May Date: Mon, 25 Sep 2023 22:36:13 -0500 Subject: [PATCH 3/5] fix: try different .net version --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 708c08e..3e92b1c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100-preview.7", + "version": "8.0.100-rc.1", "rollForward": "major" }, "msbuild-sdks": { From 9a9fad516b595f7185480d3602fb37461a5bd40f Mon Sep 17 00:00:00 2001 From: Joanna May Date: Mon, 25 Sep 2023 22:37:59 -0500 Subject: [PATCH 4/5] fix: try .net quality --- .github/workflows/visual_tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/visual_tests.yaml b/.github/workflows/visual_tests.yaml index 0728505..1365270 100644 --- a/.github/workflows/visual_tests.yaml +++ b/.github/workflows/visual_tests.yaml @@ -39,6 +39,7 @@ jobs: with: # Use the .NET SDK from global.json in the root of the repository. global-json-file: global.json + dotnet-quality: 'preview' - name: 📦 Restore Dependencies run: dotnet restore From b1a21dda6e96a0e474aeed37294e58c4bb5879e9 Mon Sep 17 00:00:00 2001 From: Joanna May Date: Mon, 25 Sep 2023 22:43:45 -0500 Subject: [PATCH 5/5] fix: rollback to .net 7 until github updates --- .github/workflows/visual_tests.yaml | 1 - global.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/visual_tests.yaml b/.github/workflows/visual_tests.yaml index 1365270..0728505 100644 --- a/.github/workflows/visual_tests.yaml +++ b/.github/workflows/visual_tests.yaml @@ -39,7 +39,6 @@ jobs: with: # Use the .NET SDK from global.json in the root of the repository. global-json-file: global.json - dotnet-quality: 'preview' - name: 📦 Restore Dependencies run: dotnet restore diff --git a/global.json b/global.json index 3e92b1c..e24d654 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100-rc.1", + "version": "7.0.100", "rollForward": "major" }, "msbuild-sdks": {