Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to net8.0 #101

Merged
merged 2 commits into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,26 @@
"version": 1,
"isRoot": true,
"tools": {
"fsdocs-tool": {
"version": "16.1.1",
"commands": [
"fsdocs"
]
},
"fable": {
"version": "4.13.0",
"version": "4.22.0",
"commands": [
"fable"
]
],
"rollForward": false
},
"femto": {
"version": "0.19.0",
"commands": [
"femto"
]
],
"rollForward": false
},
"fsdocs-tool": {
"version": "20.0.1",
"commands": [
"fsdocs"
],
"rollForward": false
}
}
}
8 changes: 4 additions & 4 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# SETUP .NET
- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.x.x
dotnet-version: 8.x.x
- name: Restore fable
run: dotnet tool restore

# SETUP NODE
- name: Setup Node.js environment
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: install node modules
working-directory: ./
run: npm install --ignore-scripts
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-github-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup .NET 6
uses: actions/setup-dotnet@v3
uses: actions/checkout@v4
- name: Setup .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.x.x'
dotnet-version: '8.x.x'
- name: make script executable
run: chmod u+x build.sh
- name: Restore tools
Expand Down
1 change: 0 additions & 1 deletion build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@

set PYTHONIOENCODING=utf-8
dotnet tool restore
cls
dotnet run --project ./build/build.fsproj %*
2 changes: 2 additions & 0 deletions build/BasicTasks.fs
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,12 @@ let build = BuildTask.create "Build" [clean] {
Properties = ([
"warnon", "3390"
])
DisableInternalBinLog = true
}
{
p with
MSBuildParams = msBuildParams
}
|> DotNet.Options.withCustomParams (Some "-tl")
)
}
20 changes: 10 additions & 10 deletions build/Build.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>

Expand All @@ -20,15 +20,15 @@

<ItemGroup>
<PackageReference Include="BlackFox.Fake.BuildTask" Version="0.1.3" />
<PackageReference Include="Fake.Api.Github" Version="5.23.0-alpha002" />
<PackageReference Include="Fake.Core.Process" Version="5.23.0-alpha002" />
<PackageReference Include="Fake.Core.ReleaseNotes" Version="5.23.0-alpha002" />
<PackageReference Include="Fake.Core.Target" Version="5.23.0-alpha002" />
<PackageReference Include="Fake.DotNet.Cli" Version="5.23.0-alpha002" />
<PackageReference Include="Fake.DotNet.MSBuild" Version="5.23.0-alpha002" />
<PackageReference Include="Fake.IO.FileSystem" Version="5.23.0-alpha002" />
<PackageReference Include="Fake.Tools.Git" Version="5.23.0-alpha002" />
<PackageReference Include="Fake.Extensions.Release" Version="0.3.0" />
<PackageReference Include="Fake.Api.Github" Version="6.1.3" />
<PackageReference Include="Fake.Core.Process" Version="6.1.3" />
<PackageReference Include="Fake.Core.ReleaseNotes" Version="6.1.3" />
<PackageReference Include="Fake.Core.Target" Version="6.1.3" />
<PackageReference Include="Fake.DotNet.Cli" Version="6.1.3" />
<PackageReference Include="Fake.DotNet.MSBuild" Version="6.1.3" />
<PackageReference Include="Fake.IO.FileSystem" Version="6.1.3" />
<PackageReference Include="Fake.Tools.Git" Version="6.1.3" />
<PackageReference Include="Fake.Extensions.Release" Version="0.3.0" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions build/PackageTasks.fs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ module BundleDotNet =
"Version",versionTag
"PackageReleaseNotes", (ProjectInfo.release.Notes |> List.map replaceCommitLink |> String.toLines )
] @ p.MSBuildParams.Properties)
DisableInternalBinLog = true
}
{
p with
Expand Down
90 changes: 0 additions & 90 deletions docs/_template.html

This file was deleted.

Loading
Loading