Skip to content

Use .NET 10 SDK and migrate to slnx #312

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.

Sign up for GitHub

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

Merged
sergey-tihon merged 1 commit into from
Oct 9, 2026
Merged

Use .NET 10 SDK and migrate to slnx #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
"isRoot": true,
"tools": {
"paket": {
"version": "9.0.2",
"version": "11.0.0",
"commands": [
"paket"
]
},
"fsdocs-tool": {
"version": "19.1.1",
"version": "22.2.0",
"commands": [
"fsdocs"
]
},
"fantomas": {
"version": "6.3.16",
"version": "8.0.8",
"commands": [
"fantomas"
]
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, macOS-latest, ubuntu-latest]
dotnet: [8.0.425]
runs-on: ${{ matrix.os }}

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

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
- name: Setup .NET SDKs and .NET 8 runtime
uses: actions/setup-dotnet@v6
with:
dotnet-version: ${{ matrix.dotnet }}
dotnet-version: 8.0.x
global-json-file: global.json

- name: Install local tools
run: dotnet tool restore
Expand Down
148 changes: 0 additions & 148 deletions FsUnit.sln
View file
Open in desktop

This file was deleted.

38 changes: 38 additions & 0 deletions FsUnit.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<Solution>
<Configurations>
<Platform Name="Any CPU" />
<Platform Name="x64" />
<Platform Name="x86" />
</Configurations>
<Folder Name="/global/">
<File Path="build.cmd" />
<File Path="build.sh" />
<File Path="paket.dependencies" />
<File Path="paket.lock" />
<File Path="RELEASE_NOTES.md" />
</Folder>
<Folder Name="/global/docs/">
<File Path="docs/generate.fsx" />
</Folder>
<Folder Name="/global/docs/content/">
<File Path="docs/content/FsUnitTyped.fsx" />
<File Path="docs/content/index.fsx" />
<File Path="docs/content/license.md" />
<File Path="docs/content/MsTest.fsx" />
<File Path="docs/content/NUnit.fsx" />
<File Path="docs/content/operators.md" />
<File Path="docs/content/Paket.fsx" />
<File Path="docs/content/release-notes.md" />
<File Path="docs/content/xUnit.fsx" />
</Folder>
<Folder Name="/src/">
<Project Path="src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj" />
<Project Path="src/FsUnit.NUnit/FsUnit.NUnit.fsproj" />
<Project Path="src/FsUnit.Xunit/FsUnit.Xunit.fsproj" />
</Folder>
<Folder Name="/tests/">
<Project Path="tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj" />
<Project Path="tests/FsUnit.NUnit.Test/FsUnit.NUnit.Test.fsproj" />
<Project Path="tests/FsUnit.Xunit.Test/FsUnit.Xunit.Test.fsproj" />
</Folder>
</Solution>
2 changes: 1 addition & 1 deletion build/build.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
// Build library & test project

Target.create "Build" (fun _ ->
let result = DotNet.exec id "build" "FsUnit.sln -c Release"
let result = DotNet.exec id "build" "FsUnit.slnx -c Release"

if not result.OK then
failwithf "Build failed: %A" result.Errors)
Expand Down Expand Up @@ -205,7 +205,7 @@
Shell.cleanDir tempDocsDir
Repository.cloneSingleBranch "" cloneUrl "gh-pages" tempDocsDir

Repository.fullclean tempDocsDir

Check warning on line 208 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (windows-latest) 

This construct is deprecated. Please use fullClean instead. This method will be removed in FAKE next major release

Check warning on line 208 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

This construct is deprecated. Please use fullClean instead. This method will be removed in FAKE next major release

Check warning on line 208 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (macOS-latest) 

This construct is deprecated. Please use fullClean instead. This method will be removed in FAKE next major release
Shell.copyRecursive "output" tempDocsDir true |> Trace.tracefn "%A"
Staging.stageAll tempDocsDir
Commit.exec tempDocsDir (sprintf "Update generated documentation for version %s" version)
Expand All @@ -217,7 +217,7 @@
Target.create "All" ignore
Target.create "Release" ignore

"Clean"

Check warning on line 220 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (windows-latest) 

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.

Check warning on line 220 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.

Check warning on line 220 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (macOS-latest) 

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.
==> "AssemblyInfo"
==> "CheckFormat"
==> "Build"
Expand All @@ -225,13 +225,13 @@
==> "RunTests"
==> "All"

"Build"

Check warning on line 228 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (windows-latest) 

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.

Check warning on line 228 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.

Check warning on line 228 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (macOS-latest) 

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.
==> "NUnit"
==> "xUnit"
==> "MsTest"
==> "RunTests"

"All"

Check warning on line 234 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (windows-latest) 

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.

Check warning on line 234 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.

Check warning on line 234 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (macOS-latest) 

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.
==> "NuGet"
==> "GenerateDocs"
==> "ReleaseDocs"
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.425",
"rollForward": "minor"
"version": "10.0.401",
"rollForward": "latestPatch"
}
}
Loading