diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 6bb3139..03801df 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,22 +3,25 @@
"isRoot": true,
"tools": {
"paket": {
- "version": "8.0.3",
+ "version": "10.3.1",
"commands": [
"paket"
- ]
+ ],
+ "rollForward": false
},
"fsdocs-tool": {
- "version": "20.0.1",
+ "version": "21.0.0",
"commands": [
"fsdocs"
- ]
+ ],
+ "rollForward": false
},
"fantomas": {
- "version": "7.0.3",
+ "version": "7.0.5",
"commands": [
"fantomas"
- ]
+ ],
+ "rollForward": false
}
}
}
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4013caf..a96e18c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: Build
on:
push:
- branches: [ 'master' ]
+ branches: ["master"]
# paths-ignore: [ 'docs/**' ]
permissions: write-all
@@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
- dotnet: [8.0.x]
+ dotnet: [10.0.x]
runs-on: ${{ matrix.os }}
outputs:
build_version: ${{ steps.set_version.outputs.version }}
@@ -33,9 +33,9 @@ jobs:
echo "version=$BUILD_VERSION" >> "$GITHUB_OUTPUT"
- name: Setup .NET
- uses: actions/setup-dotnet@v4
+ uses: actions/setup-dotnet@v5
with:
- dotnet-version: "8.x.x"
+ dotnet-version: ${{ matrix.dotnet }}
cache: true
cache-dependency-path: paket.lock
@@ -46,7 +46,7 @@ jobs:
run: dotnet fsi build.fsx
- name: Upload artifacts
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v6
with:
name: Packages-${{ matrix.os }}
path: nupkgs/
@@ -93,9 +93,9 @@ jobs:
path: nupkgs/
- name: Setup .NET
- uses: actions/setup-dotnet@v4
+ uses: actions/setup-dotnet@v5
with:
- dotnet-version: "8.x.x"
+ dotnet-version: "10.x.x"
- name: Push packages to NuGet.org
run: dotnet nuget push "nupkgs/*.nupkg" --api-key ${{ secrets.NUGET_TOKEN }} --source https://www.nuget.org --skip-duplicate
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index ad17d81..d5f7aeb 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -14,21 +14,21 @@ jobs:
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
- - name: Checkout sources
- uses: actions/checkout@v4
+ - name: Checkout sources
+ uses: actions/checkout@v4
- - name: Setup .NET
- uses: actions/setup-dotnet@v4
- with:
- dotnet-version: "8.x.x"
- cache: true
- cache-dependency-path: paket.lock
+ - name: Setup .NET
+ uses: actions/setup-dotnet@v5
+ with:
+ dotnet-version: "10.x.x"
+ cache: true
+ cache-dependency-path: paket.lock
- - name: Restore tools
- run: dotnet tool restore
+ - name: Restore tools
+ run: dotnet tool restore
- - name: Restore
- run: dotnet restore ${{env.SLN_FILE}}
+ - name: Restore
+ run: dotnet paket restore
- - name: Build
- run: dotnet fsi build.fsx
+ - name: Build
+ run: dotnet fsi build.fsx
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
index c66062b..cb218ac 100644
--- a/.paket/Paket.Restore.targets
+++ b/.paket/Paket.Restore.targets
@@ -235,14 +235,16 @@
$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length)
$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])
$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])
+ $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[2])
$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])
$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])
$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])
$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])
$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8])
+ $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[9])
-
- %(PaketReferencesFileLinesInfo.PackageVersion)
+
+ %(PaketReferencesFileLinesInfo.PackageVersion)
All
runtime
$(ExcludeAssets);contentFiles
@@ -250,8 +252,10 @@
%(PaketReferencesFileLinesInfo.Aliases)
true
true
-
+
+ %(PaketReferencesFileLinesInfo.PackageVersion)
+
@@ -314,7 +318,17 @@
-
+
+
+
+
+ <_DefinedConditionProperties Include="@(_ConditionProperties)" Condition="$(%(Identity)) == 'true'"/>
+
+
+ <_ConditionsParameter>
+ <_ConditionsParameter Condition="@(_DefinedConditionProperties) != ''">--conditions @(_DefinedConditionProperties)
+
+
diff --git a/build.fsx b/build.fsx
index af3a17b..cb90a73 100644
--- a/build.fsx
+++ b/build.fsx
@@ -7,7 +7,6 @@ open System.IO
open Fun.Build
let () a b = Path.Combine(a, b)
-let sln = __SOURCE_DIRECTORY__ "AsyncWriterResult.sln"
let config = "Release"
let nupkgs = __SOURCE_DIRECTORY__ "nupkgs"
@@ -32,19 +31,16 @@ pipeline "ci" {
}
stage "build" {
- run $"dotnet restore {sln}"
- run $"dotnet build {sln} -c {config} --no-restore"
+ run "dotnet paket restore"
+ run $"dotnet build -c {config}"
}
- stage "test" {
- run
- $"dotnet run --project tests/AsyncWriterResult.UnitTests/AsyncWriterResult.UnitTests.fsproj -c {config} --no-build"
- }
+ stage "test" { run $"dotnet run --project tests/AsyncWriterResult.UnitTests -c {config} --no-build" }
- stage "pack" { run $"dotnet pack {sln} -c {config} -p:PackageOutputPath=\"%s{nupkgs}\" {versionProperty}" }
+ stage "pack" { run $"dotnet pack -c {config} -p:PackageOutputPath=\"%s{nupkgs}\" {versionProperty}" }
stage "docs" {
- run $"dotnet publish src/AsyncWriterResult/AsyncWriterResult.fsproj -c {config} -f net8.0 --no-build"
+ run $"dotnet publish src/AsyncWriterResult -c {config}"
run $"dotnet fsdocs build --properties Configuration={config} --output output --eval --strict"
}
@@ -56,9 +52,8 @@ pipeline "docs" {
stage "build" {
run "dotnet tool restore"
- run $"dotnet restore {sln}"
- run $"dotnet build {sln} -c {config} --no-restore"
- run $"dotnet publish src/AsyncWriterResult/AsyncWriterResult.fsproj -c {config} -f net8.0 --no-build"
+ run "dotnet paket restore"
+ run $"dotnet publish src/AsyncWriterResult -c {config}"
run $"dotnet fsdocs build --properties Configuration={config} --eval --strict"
}
@@ -69,9 +64,8 @@ pipeline "docs:watch" {
description "Watch and rebuild the documentation site"
stage "build" {
- run $"dotnet restore {sln}"
- run $"dotnet build {sln} -c {config} --no-restore"
- run $"dotnet publish src/AsyncWriterResult/AsyncWriterResult.fsproj -c {config} -f net8.0 --no-build"
+ run "dotnet paket restore"
+ run $"dotnet publish src/AsyncWriterResult -c {config}"
}
stage "watch" { run "dotnet fsdocs watch --eval --clean" }
diff --git a/docs/index.fsx b/docs/index.fsx
index 5392a66..19f4ae5 100644
--- a/docs/index.fsx
+++ b/docs/index.fsx
@@ -5,7 +5,7 @@ category: docs
index: 0
---
*)
-#r "../src/AsyncWriterResult/bin/Release/net8.0/publish/AsyncWriterResult.dll"
+#r "../src/AsyncWriterResult/bin/Release/net10.0/AsyncWriterResult.dll"
(**
# AsyncWriterResult
diff --git a/global.json b/global.json
index bd6ad5e..ba3d147 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "8.0.406",
+ "version": "10.0.100",
"rollForward": "latestMinor"
}
}
\ No newline at end of file
diff --git a/paket.dependencies b/paket.dependencies
index 654fbda..ef865b5 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -3,11 +3,8 @@ source https://api.nuget.org/v3/index.json
storage: none
framework: auto-detect
-nuget FSharp.Core ~> 8.0.403
nuget FsToolkit.ErrorHandling
nuget Expecto
-nuget FsCheck
-nuget Expecto.FsCheck
group Docs
source https://api.nuget.org/v3/index.json
@@ -15,7 +12,5 @@ group Docs
framework: auto-detect
storage: symlink
- nuget FSharp.Core ~> 8.0.403
nuget FSharp.Compiler.Service
- nuget FSharp.Formatting
- nuget Newtonsoft.Json
+ nuget FSharp.Formatting
\ No newline at end of file
diff --git a/paket.lock b/paket.lock
index 7df4ca2..59cf063 100644
--- a/paket.lock
+++ b/paket.lock
@@ -1,42 +1,36 @@
STORAGE: NONE
-RESTRICTION: == net8.0
+RESTRICTION: == net10.0
NUGET
remote: https://api.nuget.org/v3/index.json
Expecto (10.2.3)
FSharp.Core (>= 7.0.200)
Mono.Cecil (>= 0.11.4 < 1.0)
- Expecto.FsCheck (9.0.4)
- Expecto (>= 9.0.4)
- FsCheck (>= 2.14.3)
- FsCheck (3.3.2)
- FSharp.Core (>= 5.0.2)
- FSharp.Core (8.0.403)
+ FSharp.Core (10.0.102)
FsToolkit.ErrorHandling (5.1)
- FSharp.Core (>= 6.0.4)
+ FSharp.Core (>= 9.0.300)
Mono.Cecil (0.11.6)
GROUP Docs
STORAGE: SYMLINK
-RESTRICTION: == net8.0
+RESTRICTION: == net10.0
NUGET
remote: https://api.nuget.org/v3/index.json
- FSharp.Compiler.Service (43.8.403)
- FSharp.Core (8.0.403)
- System.Buffers (>= 4.5.1)
- System.Collections.Immutable (>= 8.0)
- System.Diagnostics.DiagnosticSource (>= 8.0)
- System.Memory (>= 4.5.5)
+ FSharp.Compiler.Service (43.10.102)
+ FSharp.Core (10.0.102)
+ System.Buffers (>= 4.6)
+ System.Collections.Immutable (>= 9.0)
+ System.Diagnostics.DiagnosticSource (>= 9.0)
+ System.Memory (>= 4.6)
System.Reflection.Emit (>= 4.7)
- System.Reflection.Metadata (>= 8.0)
- System.Runtime.CompilerServices.Unsafe (>= 6.0)
- FSharp.Core (8.0.403)
+ System.Reflection.Metadata (>= 9.0)
+ System.Runtime.CompilerServices.Unsafe (>= 6.1)
+ FSharp.Core (10.0.102)
FSharp.Formatting (14.0.1)
FSharp.Compiler.Service (>= 40.0)
- Newtonsoft.Json (13.0.4)
System.Buffers (4.6.1)
- System.Collections.Immutable (8.0)
- System.Diagnostics.DiagnosticSource (8.0.1)
+ System.Collections.Immutable (10.0.2)
+ System.Diagnostics.DiagnosticSource (10.0.2)
System.Memory (4.6.3)
System.Reflection.Emit (4.7)
- System.Reflection.Metadata (8.0.1)
+ System.Reflection.Metadata (10.0.2)
System.Runtime.CompilerServices.Unsafe (6.1.2)
diff --git a/src/AsyncWriterResult/AsyncWriterResult.fsproj b/src/AsyncWriterResult/AsyncWriterResult.fsproj
index f7a9354..d78d513 100644
--- a/src/AsyncWriterResult/AsyncWriterResult.fsproj
+++ b/src/AsyncWriterResult/AsyncWriterResult.fsproj
@@ -1,7 +1,7 @@
- net8.0
+ net10.0
true
https://github.com/totallymoney/AsyncWriterResult
https://totallymoney.github.io/AsyncWriterResult/
diff --git a/src/AsyncWriterResult/paket.references b/src/AsyncWriterResult/paket.references
index 699091d..887ce12 100644
--- a/src/AsyncWriterResult/paket.references
+++ b/src/AsyncWriterResult/paket.references
@@ -1,2 +1 @@
-FSharp.Core
FsToolkit.ErrorHandling
\ No newline at end of file
diff --git a/tests/AsyncWriterResult.UnitTests/AsyncWriterResult.UnitTests.fsproj b/tests/AsyncWriterResult.UnitTests/AsyncWriterResult.UnitTests.fsproj
index 57766c7..5b57df4 100644
--- a/tests/AsyncWriterResult.UnitTests/AsyncWriterResult.UnitTests.fsproj
+++ b/tests/AsyncWriterResult.UnitTests/AsyncWriterResult.UnitTests.fsproj
@@ -1,7 +1,7 @@
Exe
- net8.0
+ net10.0
false
true
diff --git a/tests/AsyncWriterResult.UnitTests/paket.references b/tests/AsyncWriterResult.UnitTests/paket.references
index 9a63bd2..f87d828 100644
--- a/tests/AsyncWriterResult.UnitTests/paket.references
+++ b/tests/AsyncWriterResult.UnitTests/paket.references
@@ -1,4 +1 @@
-FSharp.Core
-Expecto
-FsCheck
-Expecto.FsCheck
\ No newline at end of file
+Expecto
\ No newline at end of file