Skip to content

Commit da0b0e5

Browse files
authored
Merge branch 'main' into fix/markdown/multithreaded
2 parents 9cdd6e8 + 5edacbe commit da0b0e5

File tree

2 files changed

+35
-32
lines changed

2 files changed

+35
-32
lines changed

.github/workflows/build.yml

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ on:
2424
merge_group:
2525

2626
env:
27-
DOTNET_VERSION: ${{ '9.0.x' }}
27+
DOTNET_VERSION: '9.0.310' # Only used by jobs that cannot access global.json (no checkout/artifact-only jobs)
28+
2829
ENABLE_DIAGNOSTICS: true
2930
#COREHOST_TRACE: 1
3031
MSBUILD_VERBOSITY: normal
@@ -40,11 +41,6 @@ jobs:
4041

4142
# Steps represent a sequence of tasks that will be executed as part of the job
4243
steps:
43-
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
44-
uses: actions/setup-dotnet@v4
45-
with:
46-
dotnet-version: ${{ env.DOTNET_VERSION }}
47-
4844
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
4945
- name: Checkout Repository
5046
uses: actions/checkout@v4
@@ -54,6 +50,11 @@ jobs:
5450
fetch-depth: 0
5551
fetch-tags: true
5652

53+
- name: Install .NET SDK
54+
uses: actions/setup-dotnet@v4
55+
with:
56+
global-json-file: global.json
57+
5758
# Restore Tools from Manifest list in the Repository
5859
- name: Restore dotnet tools
5960
run: dotnet tool restore
@@ -145,11 +146,11 @@ jobs:
145146
Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps' -Name 'DumpCount' -Type DWord -Value '10'
146147
Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps' -Name 'DumpType' -Type DWord -Value '2'
147148
148-
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
149+
- name: Install .NET SDK
149150
if: ${{ env.ENABLE_DIAGNOSTICS == 'true' && env.HAS_BUILDABLE_COMPONENTS == 'true' }}
150151
uses: actions/setup-dotnet@v4
151152
with:
152-
dotnet-version: ${{ env.DOTNET_VERSION }}
153+
global-json-file: global.json
153154

154155
- name: .NET Info (if diagnostics)
155156
if: ${{ env.ENABLE_DIAGNOSTICS == 'true' && env.HAS_BUILDABLE_COMPONENTS == 'true' }}
@@ -270,15 +271,6 @@ jobs:
270271
VERSION_PROPERTY: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/rel/') || startsWith(github.ref, 'refs/tags/release/')) && format('build.{0}', github.run_number) || format('pull-{0}.{1}', github.event.number, github.run_number) }}
271272

272273
steps:
273-
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
274-
uses: actions/setup-dotnet@v4
275-
with:
276-
dotnet-version: ${{ env.DOTNET_VERSION }}
277-
278-
- name: .NET Info (if diagnostics)
279-
if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
280-
run: dotnet --info
281-
282274
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
283275
- name: Checkout Repository
284276
uses: actions/checkout@v4
@@ -287,7 +279,16 @@ jobs:
287279
ref: ${{ github.sha }}
288280
fetch-depth: 0
289281
fetch-tags: true
290-
282+
283+
- name: Install .NET SDK
284+
uses: actions/setup-dotnet@v4
285+
with:
286+
global-json-file: global.json
287+
288+
- name: .NET Info (if diagnostics)
289+
if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
290+
run: dotnet --info
291+
291292
- name: Format Date/Time for Package Version (Tag builds only)
292293
if: ${{ startsWith(github.ref, 'refs/tags/') }}
293294
run: |
@@ -396,7 +397,7 @@ jobs:
396397
winui: [0, 2, 3]
397398

398399
steps:
399-
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
400+
- name: Install .NET SDK
400401
uses: actions/setup-dotnet@v4
401402
with:
402403
dotnet-version: ${{ env.DOTNET_VERSION }}
@@ -461,7 +462,7 @@ jobs:
461462
winui: [0, 2, 3]
462463

463464
steps:
464-
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
465+
- name: Install .NET SDK
465466
uses: actions/setup-dotnet@v4
466467
with:
467468
dotnet-version: ${{ env.DOTNET_VERSION }}
@@ -486,15 +487,6 @@ jobs:
486487
HEADS_DIRECTORY: tooling/ProjectHeads
487488

488489
steps:
489-
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
490-
uses: actions/setup-dotnet@v4
491-
with:
492-
dotnet-version: ${{ env.DOTNET_VERSION }}
493-
494-
- name: .NET Info (if diagnostics)
495-
if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
496-
run: dotnet --info
497-
498490
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
499491
- name: Checkout Repository
500492
uses: actions/checkout@v4
@@ -504,6 +496,15 @@ jobs:
504496
fetch-depth: 0
505497
fetch-tags: true
506498

499+
- name: Install .NET SDK
500+
uses: actions/setup-dotnet@v4
501+
with:
502+
global-json-file: global.json
503+
504+
- name: .NET Info (if diagnostics)
505+
if: ${{ env.ENABLE_DIAGNOSTICS == 'true' }}
506+
run: dotnet --info
507+
507508
# Restore Tools from Manifest list in the Repository
508509
- name: Restore dotnet tools
509510
run: dotnet tool restore
@@ -530,3 +531,5 @@ jobs:
530531
with:
531532
name: linux-logs
532533
path: ./**/*.*log
534+
535+

global.json

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

0 commit comments

Comments
 (0)