Skip to content

Commit

Permalink
feat: build with net9
Browse files Browse the repository at this point in the history
  • Loading branch information
sergey-tihon committed Nov 15, 2024
1 parent 0cd6a7d commit 86088fd
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 73 deletions.
19 changes: 7 additions & 12 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,20 @@
"isRoot": true,
"tools": {
"paket": {
"version": "8.0.3",
"commands": [
"paket"
],
"version": "9.0.0",
"commands": ["paket"],
"rollForward": false
},
"csharpier": {
"version": "0.29.2",
"commands": [
"dotnet-csharpier"
],
"rollForward": false
"commands": ["dotnet-csharpier"],
"rollForward": true
},
"husky": {
"version": "0.7.1",
"commands": [
"husky"
],
"commands": ["husky"],
"rollForward": false
}
}
}
}

107 changes: 53 additions & 54 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,62 +1,61 @@
name: Build and Test

on:
push:
branches:
- master
pull_request:
branches:
- master
push:
branches:
- master
pull_request:
branches:
- master

jobs:
build:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
runs-on: ${{ matrix.os }}
build:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
runs-on: ${{ matrix.os }}

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup .NET 8.0 SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
- name: Build and Test
run: dotnet fsi build.fsx -- -p build
- name: Upload Artifacts
uses: actions/upload-artifact@v4
with:
name: bin-${{matrix.os}}
path: bin/*.nupkg
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup .NET 9.0 SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: "9.0.x"
- name: Build and Test
run: dotnet fsi build.fsx -- -p build
- name: Upload Artifacts
uses: actions/upload-artifact@v4
with:
name: bin-${{matrix.os}}
path: bin/*.nupkg

generate-docs:
runs-on: windows-latest
needs: build

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup .NET 8.0 SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
- name: Build and Test
run: dotnet fsi build.fsx -- -p build
- name: Setup DocFX
uses: crazy-max/ghaction-chocolatey@v1
with:
args: install docfx
- name: DocFX Build
working-directory: docs
run: docfx docfx.json
continue-on-error: false
- name: Publish
if: github.event_name == 'push'
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: docs/_site
force_orphan: true
generate-docs:
runs-on: windows-latest
needs: build

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup .NET 9.0 SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: "9.0.x"
- name: Build and Test
run: dotnet fsi build.fsx -- -p build
- name: Setup DocFX
uses: crazy-max/ghaction-chocolatey@v1
with:
args: install docfx
- name: DocFX Build
working-directory: docs
run: docfx docfx.json
continue-on-error: false
- name: Publish
if: github.event_name == 'push'
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: docs/_site
force_orphan: true
2 changes: 1 addition & 1 deletion build.fsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#r "nuget: Fun.Build, 1.0.5"
#r "nuget: Fun.Build, 1.1.14"
#r "nuget: Fake.DotNet.AssemblyInfoFile"
#r "nuget: Fake.DotNet.Paket"

Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.401",
"version": "9.0.100",
"rollForward": "latestFeature"
}
}
11 changes: 6 additions & 5 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,17 @@ NUGET
SixLabors.ImageSharp.Drawing (2.1.4)
SixLabors.Fonts (>= 2.0.4)
SixLabors.ImageSharp (>= 3.1.5)
System.Collections.Immutable (8.0)
System.IO.Packaging (8.0.1)
System.Reflection.Metadata (8.0.1)
System.Text.Encoding.CodePages (8.0)
System.Collections.Immutable (9.0)
System.IO.Packaging (9.0)
System.Reflection.Metadata (9.0)
System.Collections.Immutable (>= 9.0)
System.Text.Encoding.CodePages (9.0)
xunit (2.9.2)
xunit.analyzers (>= 1.16)
xunit.assert (>= 2.9.2)
xunit.core (2.9.2)
xunit.abstractions (2.0.3)
xunit.analyzers (1.16)
xunit.analyzers (1.17)
xunit.assert (2.9.2)
xunit.core (2.9.2)
xunit.extensibility.core (2.9.2)
Expand Down

0 comments on commit 86088fd

Please sign in to comment.