Skip to content

Commit

Permalink
Merge pull request #32 from chickensoft-games/chore/dotnet-8
Browse files Browse the repository at this point in the history
fix: version, environment, extensions, debugging
  • Loading branch information
jolexxa authored Sep 26, 2023
2 parents 60ee607 + b1a21dd commit f9e6203
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 20 deletions.
13 changes: 8 additions & 5 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -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"
]
}
12 changes: 6 additions & 6 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -22,7 +22,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${env:GODOT4}",
"program": "${env:GODOT}",
"args": [
"${fileDirname}/${fileBasenameNoExtension}.tscn"
],
Expand All @@ -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",
Expand All @@ -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}",
Expand Down
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions Chickensoft.GodotGame.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Godot.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading>
<LangVersion>10.0</LangVersion>
<Nullable>enable</Nullable>
Expand All @@ -13,7 +13,7 @@
<!--
<CompilerGeneratedFilesOutputPath>.generated</CompilerGeneratedFilesOutputPath>
-->
<DebugType>full</DebugType>
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
<Title>Chickensoft.GodotGame</Title>
<Version>1.0.0</Version>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions coverage.ps1
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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" `
Expand Down
4 changes: 2 additions & 2 deletions coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.414",
"version": "7.0.100",
"rollForward": "major"
},
"msbuild-sdks": {
Expand Down

0 comments on commit f9e6203

Please sign in to comment.