Skip to content

Make the .NET global.json file global #3297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 30, 2025
Merged

Make the .NET global.json file global #3297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45b638f
Make the .NET global.json file global
kim Sep 26, 2025
291c4ac
fixup! Make the .NET global.json file global
kim Sep 26, 2025
4234784
Merge branch 'master' into kim/global-global-json
kim Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
- name: Install .NET toolchain
uses: actions/setup-dotnet@v3
with:
global-json-file: modules/global.json
global-json-file: global.json
env:
DOTNET_INSTALL_DIR: ~/.dotnet

Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- uses: dsherret/rust-toolchain-file@v1
- uses: actions/setup-dotnet@v4
with:
global-json-file: modules/global.json
global-json-file: global.json
- name: Install psql (Windows)
if: runner.os == 'Windows'
run: choco install psql -y --no-progress
Expand Down Expand Up @@ -97,13 +97,13 @@ jobs:

- uses: actions/setup-dotnet@v3
with:
global-json-file: modules/global.json
global-json-file: global.json

- name: Create /stdb dir
run: |
sudo mkdir /stdb
sudo chmod 777 /stdb

- name: Run cargo test
#Note: Unreal tests will be run separately
run: cargo test --all -- --skip unreal
Expand All @@ -130,6 +130,10 @@ jobs:
- uses: dsherret/rust-toolchain-file@v1
- run: echo ::add-matcher::.github/workflows/rust_matcher.json

- uses: actions/setup-dotnet@v3
with:
global-json-file: global.json

- name: Run cargo fmt
run: cargo fmt --all -- --check

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/csharp-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v3
with:
global-json-file: modules/global.json
global-json-file: global.json

- name: Override NuGet packages
run: |
Expand Down
6 changes: 0 additions & 6 deletions crates/cli/src/subcommands/project/csharp/global._json
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions crates/cli/src/subcommands/project/csharp/global._json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../../../global.json
7 changes: 0 additions & 7 deletions demo/Blackholio/server-csharp/global.json
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions demo/Blackholio/server-csharp/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../global.json
0 modules/global.json → global.json
View file
Open in desktop
File renamed without changes.
6 changes: 0 additions & 6 deletions sdks/csharp/examples~/quickstart-chat/server/global.json
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions sdks/csharp/examples~/quickstart-chat/server/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../../global.json
6 changes: 0 additions & 6 deletions sdks/csharp/examples~/regression-tests/server/global.json
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions sdks/csharp/examples~/regression-tests/server/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../../global.json
Loading