Skip to content

Commit 8beafed

Browse files
Update to .NET SDK to 10.rc2 (#883)
* Update to .NET SDK to 10.rc2 * Tweak Makefile * Update docfx
1 parent 47c6775 commit 8beafed

File tree

8 files changed

+13
-10
lines changed

8 files changed

+13
-10
lines changed

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"isRoot": true,
44
"tools": {
55
"docfx": {
6-
"version": "2.78.3",
6+
"version": "2.78.4",
77
"commands": [
88
"docfx"
99
],
1010
"rollForward": false
1111
}
1212
}
13-
}
13+
}

.github/workflows/ci-build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
4545
with:
4646
dotnet-version: |
47-
10.0.100-rc.1.25451.107
47+
10.0.x
4848
9.0.x
4949
5050
# NetFX testing on non-Windows requires mono

.github/workflows/ci-code-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
1616
with:
1717
dotnet-version: |
18-
10.0.100-rc.1.25451.107
18+
10.0.x
1919
9.0.x
2020
2121
- name: Download test results

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
3434
with:
3535
dotnet-version: |
36-
10.0.100-rc.1.25451.107
36+
10.0.x
3737
9.0.x
3838
3939
- name: Generate documentation

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
5454
with:
5555
dotnet-version: |
56-
10.0.100-rc.1.25451.107
56+
10.0.x
5757
9.0.x
5858
5959
- name: Build

Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
88
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
9+
<!-- Temp workaround for https://github.com/dotnet/sdk/issues/51265 -->
10+
<RestoreEnablePackagePruning>false</RestoreEnablePackagePruning>
911
</PropertyGroup>
1012

1113
<PropertyGroup>

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ test: build
3434
pack: restore
3535
dotnet pack --no-restore --configuration $(CONFIGURATION)
3636

37-
generate-docs: build
37+
generate-docs: restore
38+
dotnet build -c Release
3839
dotnet docfx $(DOCS_PATH)/docfx.json --warningsAsErrors true
3940

4041
serve-docs: generate-docs
4142
dotnet docfx serve $(ARTIFACT_PATH)/_site --port 8080
4243

43-
.DEFAULT_GOAL := build
44+
.DEFAULT_GOAL := build

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.1.25451.107",
4-
"rollForward": "disable",
3+
"version": "10.0.100-rc.2",
4+
"rollForward": "minor",
55
"allowPrerelease": true
66
}
77
}

0 commit comments

Comments
 (0)