diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index e0d46651d..1b2221ab4 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -9,7 +9,7 @@ ] }, "fsdocs-tool": { - "version": "17.2.3", + "version": "19.1.1", "commands": [ "fsdocs" ] diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 6d4149325..3890b2152 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -23,9 +23,11 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.100 + dotnet-version: | + 8.0.x + 7.0.x - name: Restore run: git submodule update --init --recursive - name: Build with dotnet @@ -42,14 +44,13 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup .NET Core 7 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 7.0.100 - - name: Setup .NET Core 6 - uses: actions/setup-dotnet@v1 + - name: Setup .NET Core + uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.201 + dotnet-version: | + 8.0.x + 7.0.x + 6.0.x - name: Restore run: git submodule update --init --recursive - name: Extract branch name @@ -85,18 +86,14 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 - - name: Setup .NET Core 7 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 7.0.100 - - name: Setup .NET Core 6 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.201 - - name: Setup .NET Core 5 - uses: actions/setup-dotnet@v1 + - name: Setup .NET Core + uses: actions/setup-dotnet@v3 with: - dotnet-version: 5.0.405 + dotnet-version: | + 8.0.x + 7.0.x + 6.0.x + 5.0.x - name: Restore run: git submodule update --init --recursive - name: Build All Docs diff --git a/.github/workflows/fable.yml b/.github/workflows/fable.yml index e4c036c29..d5a88505e 100644 --- a/.github/workflows/fable.yml +++ b/.github/workflows/fable.yml @@ -17,14 +17,13 @@ jobs: run: git submodule update --init --recursive - name: Remove global json run: rm global.json - - name: Setup .NET Core 7 - uses: actions/setup-dotnet@v1 + - name: Setup .NET Core + uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.200 - - name: Setup .NET Core 6 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.201 + dotnet-version: | + 8.0.x + 7.0.x + 6.0.x - name: Restore tools run: dotnet tool restore - name: Install fable @@ -49,14 +48,13 @@ jobs: run: git submodule update --init --recursive - name: Remove global json run: rm global.json - - name: Setup .NET Core 7 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 7.0.200 - - name: Setup .NET Core 6 - uses: actions/setup-dotnet@v1 + - name: Setup .NET Core + uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.201 + dotnet-version: | + 8.0.x + 7.0.x + 6.0.x - name: Restore tools run: dotnet tool restore - name: Install jq @@ -88,14 +86,13 @@ jobs: - name: Remove global json in subfolder run: rm global.json working-directory: tests/FSharpPlusFable.Tests - - name: Setup .NET Core 7 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 7.0.200 - - name: Setup .NET Core 6 - uses: actions/setup-dotnet@v1 + - name: Setup .NET Core + uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.201 + dotnet-version: | + 8.0.x + 7.0.x + 6.0.x - name: Restore tools run: dotnet tool restore # - name: Run tests (Fable2 subset but on .net) diff --git a/appveyor.yml b/appveyor.yml index 64e4ab6a7..c72c37dc6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,9 @@ before_build: init: - git config --global core.autocrlf input install: - - cmd: choco install dotnetcore-sdk -y + - ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1' + - ps: ./dotnet-install.ps1 -Version 8.0.100 -InstallDir "C:\Program Files\dotnet" + #- cmd: winget install Microsoft.DotNet.SDK.8 - cmd: git submodule update --init --recursive build_script: - cmd: dotnet restore ./FSharpPlus.sln diff --git a/global.json b/global.json index 687f32f74..5078f42f7 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,13 @@ { "sdk": { - "version": "7.0.100", - "rollForward": "latestFeature" + "version": "8.0.0", + "rollForward": "latestFeature", + "allowPrerelease": true }, "additionalSdks": [ "5.0.405", - "6.0.201" + "6.0.201", + "7.0.100" ] }