Skip to content

Commit 059d530

Browse files
Merge pull request #280 from microsoft/main
Fork Sync: Update from parent repository
2 parents b988ae2 + 77c4293 commit 059d530

File tree

6 files changed

+191
-172
lines changed

6 files changed

+191
-172
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ env:
2020
SCCACHE_CACHE_SIZE: 1G
2121
ACTIONS_CACHE_KEY_DATE: 2022-11-21-02
2222
CI: true
23-
DOTNET_VERSION: 7.0.x
2423

2524
jobs:
2625
agent:
@@ -269,8 +268,8 @@ jobs:
269268
- name: Setup .NET Core SDK
270269
uses: actions/setup-dotnet@v3
271270
with:
272-
dotnet-version: ${{env.DOTNET_VERSION}}
273-
dotnet-quality: "ga"
271+
# use global.json to install the correct version
272+
global-json-file: global.json
274273
- name: Install dependencies
275274
run: |
276275
cd src/ApiService/
@@ -364,8 +363,8 @@ jobs:
364363
- name: Setup .NET Core SDK
365364
uses: actions/setup-dotnet@v3
366365
with:
367-
dotnet-version: ${{env.DOTNET_VERSION}}
368-
dotnet-quality: "ga"
366+
# use global.json to install the correct version
367+
global-json-file: global.json
369368
- run: src/ci/dotnet-fuzzing-tools.sh
370369
shell: bash
371370
- uses: actions/upload-artifact@v3
@@ -379,8 +378,8 @@ jobs:
379378
- name: Setup .NET Core SDK
380379
uses: actions/setup-dotnet@v3
381380
with:
382-
dotnet-version: ${{env.DOTNET_VERSION}}
383-
dotnet-quality: "ga"
381+
# use global.json to install the correct version
382+
global-json-file: global.json
384383
- run: src/ci/dotnet-fuzzing-tools.ps1
385384
shell: pwsh
386385
- uses: actions/upload-artifact@v3

global.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "7.0.100",
4+
"rollForward": "latestFeature"
5+
}
6+
}

0 commit comments

Comments
 (0)