diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d32441dbf..38214d47a 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,11 +3,11 @@ "isRoot": true, "tools": { "docfx": { - "version": "2.78.3", + "version": "2.78.4", "commands": [ "docfx" ], "rollForward": false } } -} \ No newline at end of file +} diff --git a/.github/workflows/ci-build-test.yml b/.github/workflows/ci-build-test.yml index e982bc8e3..cd9fb02b5 100644 --- a/.github/workflows/ci-build-test.yml +++ b/.github/workflows/ci-build-test.yml @@ -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 diff --git a/.github/workflows/ci-code-coverage.yml b/.github/workflows/ci-code-coverage.yml index e8ffbad2f..a7b42f466 100644 --- a/.github/workflows/ci-code-coverage.yml +++ b/.github/workflows/ci-code-coverage.yml @@ -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 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 63e0bbd9a..871a2fbeb 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 492e04bd3..3964faf10 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/Directory.Build.props b/Directory.Build.props index b0cf7f215..bd2aed325 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,6 +6,8 @@ enable false false + + false diff --git a/Makefile b/Makefile index b9d0ffdd7..f300ca158 100644 --- a/Makefile +++ b/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 \ No newline at end of file +.DEFAULT_GOAL := build diff --git a/global.json b/global.json index 1e2b44cb4..f0e6e07f6 100644 --- a/global.json +++ b/global.json @@ -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 } }