diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 5d1db430..39f873b5 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "paket": { - "version": "8.0.0-alpha002", + "version": "8.0.0", "commands": [ "paket" ] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b130b5aa..bc176287 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - name: NuGet cache uses: actions/cache@v1 @@ -37,7 +37,7 @@ jobs: git checkout "$(echo ${{github.ref}} | sed -E 's|^refs/heads/||')"; fi # .NET 8 RC2 has a bug where it restores the wrong version of tools... - dotnet tool update paket --version 8.0.0-alpha002 + dotnet tool update paket --version 8.0.0 dotnet tool update nbgv --version 3.6.133 # Ensure that the selenium chrome driver matches the installed chrome ./build.ps1 -t update-chromedriver @@ -50,13 +50,30 @@ jobs: name: nuget path: build - - name: Report tests - uses: dorny/test-reporter@v1 + - name: Upload test results if: always() + uses: actions/upload-artifact@v2 with: - name: Unit tests + name: TestResults path: tests/Unit/TestResults/*.trx - reporter: dotnet-trx + + report: + needs: build + if: github.event.pull_request.head.repo.full_name == github.repository + runs-on: ubuntu-latest + + steps: + - name: Download test results + uses: actions/download-artifact@v2 + with: + name: TestResults + + - name: Report tests + uses: dorny/test-reporter@v1 + with: + name: Unit tests + path: TestResults/*.trx + reporter: dotnet-trx prerelease: runs-on: ubuntu-latest @@ -66,7 +83,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - name: Download nupkg uses: actions/download-artifact@v1 @@ -90,7 +107,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - name: Prepare run: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 323ed366..a3b19c17 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,7 +11,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - name: Download nupkg uses: dawidd6/action-download-artifact@v2 diff --git a/build.ps1 b/build.ps1 index 0206e68b..9514a4ec 100755 --- a/build.ps1 +++ b/build.ps1 @@ -1,6 +1,6 @@ #!/usr/bin/env pwsh dotnet tool restore -dotnet paket restore +dotnet tool run paket restore dotnet run --project .build -- $args if ($LastExitCode -ne 0) { throw "Build failed" } diff --git a/global.json b/global.json index f8044b4f..35a65772 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100-rc.2.23502.2", + "version": "8.0.100", "rollForward": "feature", "allowPrerelease": true } diff --git a/src/Bolero.Html/Bolero.Html.fsproj b/src/Bolero.Html/Bolero.Html.fsproj index 136aac8c..1ee34a73 100644 --- a/src/Bolero.Html/Bolero.Html.fsproj +++ b/src/Bolero.Html/Bolero.Html.fsproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net8.0 true Library Bolero