Skip to content

Commit 677db83

Browse files
authored
Merge branch 'main' into fix_converter_sample
2 parents d722370 + e05d627 commit 677db83

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

.github/workflows/build.yml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
merge_group:
1818

1919
env:
20-
DOTNET_VERSION: ${{ '9.0.x' }}
20+
DOTNET_VERSION: '9.0.310' # Only used by jobs that cannot access global.json (no checkout/artifact-only jobs)
2121
ENABLE_DIAGNOSTICS: true
2222
MSBUILD_VERBOSITY: normal
2323
#COREHOST_TRACE: 1
@@ -36,17 +36,17 @@ jobs:
3636

3737
# Steps represent a sequence of tasks that will be executed as part of the job
3838
steps:
39-
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
40-
uses: actions/setup-dotnet@v4
41-
with:
42-
dotnet-version: ${{ env.DOTNET_VERSION }}
43-
4439
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
4540
- name: Checkout Repository
4641
uses: actions/checkout@v4
4742
with:
4843
submodules: recursive
4944

45+
- name: Install .NET SDK
46+
uses: actions/setup-dotnet@v4
47+
with:
48+
global-json-file: global.json
49+
5050
# Restore Tools from Manifest list in the Repository
5151
- name: Restore dotnet tools
5252
run: dotnet tool restore
@@ -85,21 +85,21 @@ jobs:
8585
maximum-size: 32GB
8686
disk-root: "C:"
8787

88-
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
88+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
89+
- name: Checkout Repository
90+
uses: actions/checkout@v4
91+
with:
92+
submodules: recursive
93+
94+
- name: Install .NET SDK
8995
uses: actions/setup-dotnet@v4
9096
with:
91-
dotnet-version: ${{ env.DOTNET_VERSION }}
97+
global-json-file: global.json
9298

9399
- name: .NET Info (if diagnostics)
94100
if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
95101
run: dotnet --info
96102

97-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
98-
- name: Checkout Repository
99-
uses: actions/checkout@v4
100-
with:
101-
submodules: recursive
102-
103103
- name: Install procdump
104104
if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
105105
shell: pwsh
@@ -222,21 +222,21 @@ jobs:
222222
VERSION_PROPERTY: ${{ github.ref == 'refs/heads/main' && format('build.{0}', github.run_number) || format('pull-{0}.{1}', github.event.number, github.run_number) }}
223223

224224
steps:
225-
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
225+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
226+
- name: Checkout Repository
227+
uses: actions/checkout@v4
228+
with:
229+
submodules: recursive
230+
231+
- name: Install .NET SDK
226232
uses: actions/setup-dotnet@v4
227233
with:
228-
dotnet-version: ${{ env.DOTNET_VERSION }}
234+
global-json-file: global.json
229235

230236
- name: .NET Info (if diagnostics)
231237
if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
232238
run: dotnet --info
233239

234-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
235-
- name: Checkout Repository
236-
uses: actions/checkout@v4
237-
with:
238-
submodules: recursive
239-
240240
# Semver regex: https://regex101.com/r/Ly7O1x/3/
241241
- name: Format Date/Time of Release Package Version
242242
if: ${{ env.IS_RELEASE == 'true' }}
@@ -333,7 +333,7 @@ jobs:
333333
winui: [2, 3]
334334

335335
steps:
336-
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
336+
- name: Install .NET SDK
337337
uses: actions/setup-dotnet@v4
338338
with:
339339
dotnet-version: ${{ env.DOTNET_VERSION }}
@@ -398,7 +398,7 @@ jobs:
398398
winui: [2, 3]
399399

400400
steps:
401-
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
401+
- name: Install .NET SDK
402402
uses: actions/setup-dotnet@v4
403403
with:
404404
dotnet-version: ${{ env.DOTNET_VERSION }}
@@ -421,21 +421,21 @@ jobs:
421421
runs-on: ubuntu-latest
422422

423423
steps:
424-
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
424+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
425+
- name: Checkout Repository
426+
uses: actions/checkout@v4
427+
with:
428+
submodules: recursive
429+
430+
- name: Install .NET SDK
425431
uses: actions/setup-dotnet@v4
426432
with:
427-
dotnet-version: ${{ env.DOTNET_VERSION }}
433+
global-json-file: global.json
428434

429435
- name: .NET Info (if diagnostics)
430436
if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
431437
run: dotnet --info
432438

433-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
434-
- name: Checkout Repository
435-
uses: actions/checkout@v4
436-
with:
437-
submodules: recursive
438-
439439
# Restore Tools from Manifest list in the Repository
440440
- name: Restore dotnet tools
441441
run: dotnet tool restore

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "9.0.101",
3+
"version": "9.0.310",
44
"rollForward": "latestFeature"
55
},
6-
"msbuild-sdks":
6+
"msbuild-sdks":
77
{
88
"MSBuild.Sdk.Extras":"3.0.23"
99
}

0 commit comments

Comments
 (0)