diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index fa4d1de082a..53e16d4a60f 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 424bc0b21fa..64b538b6013 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/csharp-test.yml b/.github/workflows/csharp-test.yml index 2017060baa7..4d8175907e8 100644 --- a/.github/workflows/csharp-test.yml +++ b/.github/workflows/csharp-test.yml @@ -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: | diff --git a/crates/cli/src/subcommands/project/csharp/global._json b/crates/cli/src/subcommands/project/csharp/global._json deleted file mode 100644 index 4e550c173fd..00000000000 --- a/crates/cli/src/subcommands/project/csharp/global._json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "sdk": { - "version": "8.0.400", - "rollForward": "latestMinor" - } -} diff --git a/crates/cli/src/subcommands/project/csharp/global._json b/crates/cli/src/subcommands/project/csharp/global._json new file mode 120000 index 00000000000..c246c932c31 --- /dev/null +++ b/crates/cli/src/subcommands/project/csharp/global._json @@ -0,0 +1 @@ +../../../../../../global.json \ No newline at end of file diff --git a/demo/Blackholio/server-csharp/global.json b/demo/Blackholio/server-csharp/global.json deleted file mode 100644 index f575e66bb0c..00000000000 --- a/demo/Blackholio/server-csharp/global.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "sdk": { - "version": "8.0.0", - "rollForward": "latestMinor", - "allowPrerelease": false - } -} \ No newline at end of file diff --git a/demo/Blackholio/server-csharp/global.json b/demo/Blackholio/server-csharp/global.json new file mode 120000 index 00000000000..2738b3f5b04 --- /dev/null +++ b/demo/Blackholio/server-csharp/global.json @@ -0,0 +1 @@ +../../../global.json \ No newline at end of file diff --git a/modules/global.json b/global.json similarity index 100% rename from modules/global.json rename to global.json diff --git a/sdks/csharp/examples~/quickstart-chat/server/global.json b/sdks/csharp/examples~/quickstart-chat/server/global.json deleted file mode 100644 index 4e550c173fd..00000000000 --- a/sdks/csharp/examples~/quickstart-chat/server/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "sdk": { - "version": "8.0.400", - "rollForward": "latestMinor" - } -} diff --git a/sdks/csharp/examples~/quickstart-chat/server/global.json b/sdks/csharp/examples~/quickstart-chat/server/global.json new file mode 120000 index 00000000000..09dc3a51884 --- /dev/null +++ b/sdks/csharp/examples~/quickstart-chat/server/global.json @@ -0,0 +1 @@ +../../../../../global.json \ No newline at end of file diff --git a/sdks/csharp/examples~/regression-tests/server/global.json b/sdks/csharp/examples~/regression-tests/server/global.json deleted file mode 100644 index 4e550c173fd..00000000000 --- a/sdks/csharp/examples~/regression-tests/server/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "sdk": { - "version": "8.0.400", - "rollForward": "latestMinor" - } -} diff --git a/sdks/csharp/examples~/regression-tests/server/global.json b/sdks/csharp/examples~/regression-tests/server/global.json new file mode 120000 index 00000000000..09dc3a51884 --- /dev/null +++ b/sdks/csharp/examples~/regression-tests/server/global.json @@ -0,0 +1 @@ +../../../../../global.json \ No newline at end of file