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,7 +3,7 @@
|
||||||
"isRoot": true,
|
"isRoot": true,
|
||||||
"tools": {
|
"tools": {
|
||||||
"docfx": {
|
"docfx": {
|
||||||
"version": "2.78.3",
|
"version": "2.78.4",
|
||||||
"commands": [
|
"commands": [
|
||||||
"docfx"
|
"docfx"
|
||||||
],
|
],
|
||||||
|
|
|
||||||
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
|
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
|
||||||
with:
|
with:
|
||||||
dotnet-version: |
|
dotnet-version: |
|
||||||
10.0.100-rc.1.25451.107
|
10.0.x
|
||||||
9.0.x
|
9.0.x
|
||||||
|
|
||||||
# NetFX testing on non-Windows requires mono
|
# 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
|
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
|
||||||
with:
|
with:
|
||||||
dotnet-version: |
|
dotnet-version: |
|
||||||
10.0.100-rc.1.25451.107
|
10.0.x
|
||||||
9.0.x
|
9.0.x
|
||||||
|
|
||||||
- name: Download test results
|
- 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
|
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
|
||||||
with:
|
with:
|
||||||
dotnet-version: |
|
dotnet-version: |
|
||||||
10.0.100-rc.1.25451.107
|
10.0.x
|
||||||
9.0.x
|
9.0.x
|
||||||
|
|
||||||
- name: Generate documentation
|
- 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
|
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
|
||||||
with:
|
with:
|
||||||
dotnet-version: |
|
dotnet-version: |
|
||||||
10.0.100-rc.1.25451.107
|
10.0.x
|
||||||
9.0.x
|
9.0.x
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,8 @@
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<IsPackable>false</IsPackable>
|
<IsPackable>false</IsPackable>
|
||||||
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
|
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
|
||||||
|
<!-- Temp workaround for https://github.com/dotnet/sdk/issues/51265 -->
|
||||||
|
<RestoreEnablePackagePruning>false</RestoreEnablePackagePruning>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
||||||
3
Makefile
3
Makefile
|
|
@ -34,7 +34,8 @@ test: build
|
||||||
pack: restore
|
pack: restore
|
||||||
dotnet pack --no-restore --configuration $(CONFIGURATION)
|
dotnet pack --no-restore --configuration $(CONFIGURATION)
|
||||||
|
|
||||||
generate-docs: build
|
generate-docs: restore
|
||||||
|
dotnet build -c Release
|
||||||
dotnet docfx $(DOCS_PATH)/docfx.json --warningsAsErrors true
|
dotnet docfx $(DOCS_PATH)/docfx.json --warningsAsErrors true
|
||||||
|
|
||||||
serve-docs: generate-docs
|
serve-docs: generate-docs
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"sdk": {
|
"sdk": {
|
||||||
"version": "10.0.100-rc.1.25451.107",
|
"version": "10.0.100-rc.2",
|
||||||
"rollForward": "disable",
|
"rollForward": "minor",
|
||||||
"allowPrerelease": true
|
"allowPrerelease": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue