Update to .NET SDK to 10.rc2 (#883)
* Update to .NET SDK to 10.rc2 * Tweak Makefile * Update docfx
This commit is contained in:
parent
47c6775377
commit
8beafedddb
8 changed files with 13 additions and 10 deletions
|
|
@ -3,11 +3,11 @@
|
|||
"isRoot": true,
|
||||
"tools": {
|
||||
"docfx": {
|
||||
"version": "2.78.3",
|
||||
"version": "2.78.4",
|
||||
"commands": [
|
||||
"docfx"
|
||||
],
|
||||
"rollForward": false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
2
.github/workflows/ci-build-test.yml
vendored
2
.github/workflows/ci-build-test.yml
vendored
|
|
@ -44,7 +44,7 @@ jobs:
|
|||
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
|
||||
with:
|
||||
dotnet-version: |
|
||||
10.0.100-rc.1.25451.107
|
||||
10.0.x
|
||||
9.0.x
|
||||
|
||||
# NetFX testing on non-Windows requires mono
|
||||
|
|
|
|||
2
.github/workflows/ci-code-coverage.yml
vendored
2
.github/workflows/ci-code-coverage.yml
vendored
|
|
@ -15,7 +15,7 @@ jobs:
|
|||
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
|
||||
with:
|
||||
dotnet-version: |
|
||||
10.0.100-rc.1.25451.107
|
||||
10.0.x
|
||||
9.0.x
|
||||
|
||||
- name: Download test results
|
||||
|
|
|
|||
2
.github/workflows/docs.yml
vendored
2
.github/workflows/docs.yml
vendored
|
|
@ -33,7 +33,7 @@ jobs:
|
|||
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
|
||||
with:
|
||||
dotnet-version: |
|
||||
10.0.100-rc.1.25451.107
|
||||
10.0.x
|
||||
9.0.x
|
||||
|
||||
- name: Generate documentation
|
||||
|
|
|
|||
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
|
|
@ -53,7 +53,7 @@ jobs:
|
|||
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
|
||||
with:
|
||||
dotnet-version: |
|
||||
10.0.100-rc.1.25451.107
|
||||
10.0.x
|
||||
9.0.x
|
||||
|
||||
- name: Build
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
<Nullable>enable</Nullable>
|
||||
<IsPackable>false</IsPackable>
|
||||
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
|
||||
<!-- Temp workaround for https://github.com/dotnet/sdk/issues/51265 -->
|
||||
<RestoreEnablePackagePruning>false</RestoreEnablePackagePruning>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
5
Makefile
5
Makefile
|
|
@ -34,10 +34,11 @@ test: build
|
|||
pack: restore
|
||||
dotnet pack --no-restore --configuration $(CONFIGURATION)
|
||||
|
||||
generate-docs: build
|
||||
generate-docs: restore
|
||||
dotnet build -c Release
|
||||
dotnet docfx $(DOCS_PATH)/docfx.json --warningsAsErrors true
|
||||
|
||||
serve-docs: generate-docs
|
||||
dotnet docfx serve $(ARTIFACT_PATH)/_site --port 8080
|
||||
|
||||
.DEFAULT_GOAL := build
|
||||
.DEFAULT_GOAL := build
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "10.0.100-rc.1.25451.107",
|
||||
"rollForward": "disable",
|
||||
"version": "10.0.100-rc.2",
|
||||
"rollForward": "minor",
|
||||
"allowPrerelease": true
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue