Skip to content

Commit fee841a

Browse files
authored
Merge pull request #487 from fsprojects/nuget-packages-update
* Updated `Fantomas` to `6.3.11` and `FSDocs-Tools` to `20.0.1` * Updated NuGet packages * Updated SDK to `8.0.400`
2 parents 5514d18 + 1ce7cbd commit fee841a

File tree

7 files changed

+24
-23
lines changed

7 files changed

+24
-23
lines changed

.config/dotnet-tools.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33
"isRoot": true,
44
"tools": {
55
"fantomas": {
6-
"version": "6.2.1",
6+
"version": "6.3.11",
77
"commands": [
88
"fantomas"
9-
]
9+
],
10+
"rollForward": false
1011
},
1112
"fsdocs-tool": {
12-
"version": "19.1.0",
13+
"version": "20.0.1",
1314
"commands": [
1415
"fsdocs"
15-
]
16+
],
17+
"rollForward": false
1618
}
1719
}
18-
}
20+
}

.github/workflows/publish_ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
- name: Add version to global.json
3333
run: |
34-
$version = "8.0.202"
34+
$version = "8.0.400"
3535
$globalJsonPath = "global.json"
3636
$globalJson = Get-Content -Raw -Path $globalJsonPath | ConvertFrom-Json
3737
if ($null -eq $globalJson.sdk.version) {
@@ -45,7 +45,7 @@ jobs:
4545
- name: Install .NET Core
4646
uses: actions/setup-dotnet@v4
4747
with:
48-
dotnet-version: 8.0.202
48+
dotnet-version: 8.0.400
4949

5050
- name: Add the GitHub source
5151
run: dotnet nuget add source --username USERNAME --password ${{secrets.GITHUB_TOKEN}} --store-password-in-clear-text --name "github.com" "https://nuget.pkg.github.com/fsprojects/index.json"

.github/workflows/publish_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: Add version to global.json
3636
run: |
37-
$version = "8.0.202"
37+
$version = "8.0.400"
3838
$globalJsonPath = "global.json"
3939
$globalJson = Get-Content -Raw -Path $globalJsonPath | ConvertFrom-Json
4040
if ($null -eq $globalJson.sdk.version) {
@@ -48,7 +48,7 @@ jobs:
4848
- name: Install .NET Core
4949
uses: actions/setup-dotnet@v4
5050
with:
51-
dotnet-version: 8.0.202
51+
dotnet-version: 8.0.400
5252

5353
- name: Install local tools
5454
run: dotnet tool restore

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
os: [ubuntu-latest, windows-latest, macOS-latest]
24-
dotnet: [8.0.202]
24+
dotnet: [8.0.400]
2525
runs-on: ${{ matrix.os }}
2626

2727
steps:

Packages.props

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<MicrosoftExtensionsVersion>8.0.*</MicrosoftExtensionsVersion>
66
<AspNetCoreVersion>8.0.*</AspNetCoreVersion>
77
<FsToolkitVersion>4.15.*</FsToolkitVersion>
8-
<XUnitVersion>2.8.1</XUnitVersion>
8+
<XUnitVersion>2.9.0</XUnitVersion>
99
<FAKEVersion>6.*</FAKEVersion>
1010
</PropertyGroup>
1111
<ItemGroup Label="Common">
@@ -19,11 +19,12 @@
1919
<PackageReference Update="FSharp.SystemTextJson" Version="1.*" />
2020
<PackageReference Update="FsToolkit.ErrorHandling" Version="$(FsToolkitVersion)" />
2121
<PackageReference Update="FsToolkit.ErrorHandling.TaskResult" Version="$(FsToolkitVersion)" />
22+
<PackageReference Update="Giraffe" Version="7.*" />
2223
<PackageReference Update="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsVersion)" />
2324
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
2425
<PackageReference Update="Microsoft.NETCore.Platforms" Version="$(SystemVersion)" />
2526
<PackageReference Update="NuGet.CommandLine" Version="1.*" />
26-
<PackageReference Update="Oxpecker" Version="0.9.*" />
27+
<PackageReference Update="Oxpecker" Version="0.14.*" />
2728
<PackageReference Update="System.CodeDom" Version="$(SystemVersion)" />
2829
<PackageReference Update="System.Collections.Immutable" Version="$(SystemVersion)" />
2930
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="$(SystemVersion)" />
@@ -51,9 +52,9 @@
5152
</PackageReference>
5253
</ItemGroup>
5354
<ItemGroup Label="Test platform">
54-
<PackageReference Update="BenchmarkDotNet" Version="0.13.*" />
55+
<PackageReference Update="BenchmarkDotNet" Version="0.14.*" />
5556
<PackageReference Update="BenchmarkDotNet.Annotations" Version="0.*" />
56-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.10.0" />
57+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.11.0" />
5758
<PackageReference Update="Microsoft.TestPlatform.TestHost" Version="17.7.*" />
5859
<PackageReference Update="Microsoft.TestPlatform.ObjectModel" Version="17.7.*" />
5960
<PackageReference Update="xunit" Version="$(XUnitVersion)" />
@@ -64,23 +65,22 @@
6465
<PackageReference Update="xunit.extensibility.execution" Version="$(XUnitVersion)" />
6566
<PackageReference Update="xunit.runner.console" Version="$(XUnitVersion)" />
6667
<PackageReference Update="xunit.runner.utility" Version="$(XUnitVersion)" />
67-
<PackageReference Update="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
68+
<PackageReference Update="xunit.runner.visualstudio" Version="2.8.2" />
6869
</ItemGroup>
6970
<ItemGroup Label="Tests and Samples">
7071
<PackageReference Update="CommandLineParser" Version="2.9.*" />
7172
<PackageReference Update="Donald" Version="10.1.0" />
7273
<PackageReference Update="EntityFramework" Version="1.*" />
7374
<PackageReference Update="FSharp.Data.TypeProviders" Version="1.*" />
7475
<PackageReference Update="FsToolkit.ErrorHandling" Version="4.15.3" />
75-
<PackageReference Update="Giraffe" Version="6.*" />
76-
<PackageReference Update="GraphQL.Server.Ui.Altair" Version="7.*" />
77-
<PackageReference Update="GraphQL.Server.Ui.GraphiQL" Version="7.*" />
78-
<PackageReference Update="GraphQL.Server.Ui.Playground" Version="7.*" />
79-
<PackageReference Update="GraphQL.Server.Ui.Voyager" Version="7.*" />
76+
<PackageReference Update="GraphQL.Server.Ui.Altair" Version="8.*" />
77+
<PackageReference Update="GraphQL.Server.Ui.GraphiQL" Version="8.*" />
78+
<PackageReference Update="GraphQL.Server.Ui.Playground" Version="8.*" />
79+
<PackageReference Update="GraphQL.Server.Ui.Voyager" Version="8.*" />
8080
<PackageReference Update="HotChocolate.AspNetCore" Version="13.*" />
8181
<PackageReference Update="Iced" Version="1.17.*" />
8282
<PackageReference Update="Microsoft.CodeCoverage" Version="17.3.*" />
83-
<PackageReference Update="Microsoft.Data.Sqlite" Version="8.0.6" />
83+
<PackageReference Update="Microsoft.Data.Sqlite" Version="$(MicrosoftExtensionsVersion)" />
8484
<PackageReference Update="Microsoft.Diagnostics.NETCore.Client" Version="0.2.*" />
8585
<PackageReference Update="Microsoft.Diagnostics.Runtime" Version="2.2.*" />
8686
<PackageReference Update="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.*" />

build/Program.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ execContext
2525
|> Fake.Core.Context.setExecutionContext
2626

2727
module DotNetCli =
28-
let setVersion (o : DotNet.Options) = { o with Version = Some "8.0.202" }
28+
let setVersion (o : DotNet.Options) = { o with Version = Some "8.0.400" }
2929
let setRestoreOptions (o : DotNet.RestoreOptions) = o.WithCommon setVersion
3030

3131
let configurationString = Environment.environVarOrDefault "CONFIGURATION" "Release"

src/FSharp.Data.GraphQL.Server.Oxpecker/FSharp.Data.GraphQL.Server.Oxpecker.fsproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
<ItemGroup>
2929
<PackageReference Include="Collections.Pooled" />
30-
<PackageReference Include="FSharp.Core" VersionOverride="8.0.200" />
3130
<PackageReference Include="FsToolkit.ErrorHandling" />
3231
<PackageReference Include="FsToolkit.ErrorHandling.TaskResult" />
3332
<PackageReference Include="Oxpecker" />

0 commit comments

Comments
 (0)