Skip to content
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
9 changes: 1 addition & 8 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
{
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "7.2.0",
"commands": [
"paket"
]
}
}
"tools": {}
}
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ jobs:

strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-13]
dotnet: [6.0.100]
os: [ubuntu-latest, windows-latest, macOS-latest]
dotnet: [8.0.100]
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- name: Setup .NET Core
uses: actions/setup-dotnet@v1.7.2
uses: actions/setup-dotnet@v4.3
with:
dotnet-version: ${{ matrix.dotnet }}
- name: Install local tools
run: dotnet tool restore
- name: Paket restore
run: dotnet paket restore
- name: NuGet restore
run: dotnet restore Fornax.sln
- name: Build
run: dotnet run
- name: Upload a Build Artifact
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,28 @@ jobs:
release:
strategy:
matrix:
dotnet: [6.0.100]
dotnet: [8.0.100]

runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@4.3
with:
dotnet-version: ${{ matrix.dotnet }}
- name: Restore tools
run: dotnet tool restore
- name: Paket restore
run: dotnet paket restore
- name: NuGet restore
run: dotnet restore Fornax.sln
- name: build and push packages
run: dotnet run Push
env:
nuget-key: ${{ secrets.NUGET_KEY }}
- name: Upload a Build Artifact
uses: actions/upload-artifact@v2.3.1
uses: actions/upload-artifact@v4
with:
path: out
- name: Create Release
Expand Down
557 changes: 0 additions & 557 deletions .paket/Paket.Restore.targets

This file was deleted.

43 changes: 0 additions & 43 deletions .paket/paket.targets

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 0.16.0-beta001 - 08.07.2025

### Changed
* [Update to .NET 8](https://github.com/ionide/Fornax/pull/127) (thanks @Numpsy!)

## 0.15.1 - 07.03.2023

Expand Down
5 changes: 5 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,10 @@
</PropertyGroup>
<ItemGroup Condition="'$(IsPackable)' =='true'">
<None Include="$(MSBuildThisFileDirectory)/README.md" Pack="true" PackagePath="/" />
<PackageReference Include="Ionide.KeepAChangelog.Tasks" PrivateAssets="all" />
<PackageReference Include="DotNet.ReproducibleBuilds">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>
28 changes: 28 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<RestorePackagesWithLockFile>false</RestorePackagesWithLockFile>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="FSharp.Core" Version="[8.0.100]" />
<PackageVersion Include="FSharp.Compiler.Service" Version="[43.8.100]" />
<PackageVersion Include="Fake.Api.Github" Version="6.0.0" />
<PackageVersion Include="Fake.Core.Process" Version="6.0.0" />
<PackageVersion Include="Fake.Core.ReleaseNotes" Version="6.0.0" />
<PackageVersion Include="Fake.Core.UserInput" Version="6.0.0" />
<PackageVersion Include="Fake.Core.Target" Version="6.0.0" />
<PackageVersion Include="Fake.DotNet.Cli" Version="6.0.0" />
<PackageVersion Include="Fake.DotNet.MSBuild" Version="6.0.0" />
<PackageVersion Include="Fake.IO.FileSystem" Version="6.0.0" />
<PackageVersion Include="Fake.Tools.Git" Version="6.0.0" />
<PackageVersion Include="Argu" Version="6.2.5" />
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.25" />
<PackageVersion Include="Expecto" Version="10.2.3" />
<PackageVersion Include="FSharp.Quotations.Evaluator" Version="2.1.0" />
<PackageVersion Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8" />
<PackageVersion Include="LibGit2Sharp" Version="0.31.0" />
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.3.17" />
<PackageVersion Include="Suave" Version="2.6.2" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Fornax.sln
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{E7E9
CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
CONTRIBUTING.md = CONTRIBUTING.md
Directory.Build.props = Directory.Build.props
Directory.Packages.props = Directory.Packages.props
.config\dotnet-tools.json = .config\dotnet-tools.json
global.json = global.json
LICENSE.md = LICENSE.md
.github\workflows\main.yml = .github\workflows\main.yml
paket.dependencies = paket.dependencies
README.md = README.md
.github\workflows\release.yml = .github\workflows\release.yml
EndProjectSection
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ Thank you for contributing!

## Build process

* You need [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet/6.0)
* You need [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet/8.0)
* Run `dotnet tool restore` to restore the .NET 6 local tools defined at .config/dotnet-tools.json
* To build the project run `dotnet run` (this will run the `build.fsproj` project that contains the FAKE build pipeline.)
* To run unit tests run `dotnet run Test`
Expand Down
24 changes: 13 additions & 11 deletions build.fsproj
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<Compile Include="Helpers.fs" />
<Compile Include="Build.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fake.Api.Github" Version="6.0.0" />
<PackageReference Include="Fake.Core.Process" Version="6.0.0" />
<PackageReference Include="Fake.Core.ReleaseNotes" Version="6.0.0" />
<PackageReference Include="Fake.Core.UserInput" Version="6.0.0" />
<PackageReference Include="Fake.Core.Target" Version="6.0.0" />
<PackageReference Include="Fake.DotNet.Cli" Version="6.0.0" />
<PackageReference Include="Fake.DotNet.MSBuild" Version="6.0.0" />
<PackageReference Include="Fake.IO.FileSystem" Version="6.0.0" />
<PackageReference Include="Fake.Tools.Git" Version="6.0.0" />
<PackageReference Update="FSharp.Core" Version="6.*" />
<PackageReference Include="Fake.Api.Github" />
<PackageReference Include="Fake.Core.Process" />
<PackageReference Include="Fake.Core.ReleaseNotes" />
<PackageReference Include="Fake.Core.UserInput" />
<PackageReference Include="Fake.Core.Target" />
<PackageReference Include="Fake.DotNet.Cli" />
<PackageReference Include="Fake.DotNet.MSBuild" />
<PackageReference Include="Fake.IO.FileSystem" />
<PackageReference Include="Fake.Tools.Git" />
<PackageReference Include="FSharp.Core" />
<PackageReference Include="MSBuild.StructuredLogger" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.100",
"version": "8.0.100",
"rollForward": "latestMinor"
}
}
29 changes: 0 additions & 29 deletions paket.dependencies

This file was deleted.

Loading