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

Updated NuGet packages and tools (Fantomas to 6.3.11 and FSDocs-Tools to 20.0.1) #487

Merged
merged 3 commits into from
Sep 2, 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
12 changes: 7 additions & 5 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@
"isRoot": true,
"tools": {
"fantomas": {
"version": "6.2.1",
"version": "6.3.11",
"commands": [
"fantomas"
]
],
"rollForward": false
},
"fsdocs-tool": {
"version": "19.1.0",
"version": "20.0.1",
"commands": [
"fsdocs"
]
],
"rollForward": false
}
}
}
}
4 changes: 2 additions & 2 deletions .github/workflows/publish_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- name: Add version to global.json
run: |
$version = "8.0.202"
$version = "8.0.400"
$globalJsonPath = "global.json"
$globalJson = Get-Content -Raw -Path $globalJsonPath | ConvertFrom-Json
if ($null -eq $globalJson.sdk.version) {
Expand All @@ -45,7 +45,7 @@ jobs:
- name: Install .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.202
dotnet-version: 8.0.400

- name: Add the GitHub source
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"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

- name: Add version to global.json
run: |
$version = "8.0.202"
$version = "8.0.400"
$globalJsonPath = "global.json"
$globalJson = Get-Content -Raw -Path $globalJsonPath | ConvertFrom-Json
if ($null -eq $globalJson.sdk.version) {
Expand All @@ -48,7 +48,7 @@ jobs:
- name: Install .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.202
dotnet-version: 8.0.400

- name: Install local tools
run: dotnet tool restore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
dotnet: [8.0.202]
dotnet: [8.0.400]
runs-on: ${{ matrix.os }}

steps:
Expand Down
22 changes: 11 additions & 11 deletions Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<MicrosoftExtensionsVersion>8.0.*</MicrosoftExtensionsVersion>
<AspNetCoreVersion>8.0.*</AspNetCoreVersion>
<FsToolkitVersion>4.15.*</FsToolkitVersion>
<XUnitVersion>2.8.1</XUnitVersion>
<XUnitVersion>2.9.0</XUnitVersion>
<FAKEVersion>6.*</FAKEVersion>
</PropertyGroup>
<ItemGroup Label="Common">
Expand All @@ -19,11 +19,12 @@
<PackageReference Update="FSharp.SystemTextJson" Version="1.*" />
<PackageReference Update="FsToolkit.ErrorHandling" Version="$(FsToolkitVersion)" />
<PackageReference Update="FsToolkit.ErrorHandling.TaskResult" Version="$(FsToolkitVersion)" />
<PackageReference Update="Giraffe" Version="7.*" />
<PackageReference Update="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsVersion)" />
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
<PackageReference Update="Microsoft.NETCore.Platforms" Version="$(SystemVersion)" />
<PackageReference Update="NuGet.CommandLine" Version="1.*" />
<PackageReference Update="Oxpecker" Version="0.9.*" />
<PackageReference Update="Oxpecker" Version="0.14.*" />
<PackageReference Update="System.CodeDom" Version="$(SystemVersion)" />
<PackageReference Update="System.Collections.Immutable" Version="$(SystemVersion)" />
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="$(SystemVersion)" />
Expand Down Expand Up @@ -51,9 +52,9 @@
</PackageReference>
</ItemGroup>
<ItemGroup Label="Test platform">
<PackageReference Update="BenchmarkDotNet" Version="0.13.*" />
<PackageReference Update="BenchmarkDotNet" Version="0.14.*" />
<PackageReference Update="BenchmarkDotNet.Annotations" Version="0.*" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Update="Microsoft.TestPlatform.TestHost" Version="17.7.*" />
<PackageReference Update="Microsoft.TestPlatform.ObjectModel" Version="17.7.*" />
<PackageReference Update="xunit" Version="$(XUnitVersion)" />
Expand All @@ -64,23 +65,22 @@
<PackageReference Update="xunit.extensibility.execution" Version="$(XUnitVersion)" />
<PackageReference Update="xunit.runner.console" Version="$(XUnitVersion)" />
<PackageReference Update="xunit.runner.utility" Version="$(XUnitVersion)" />
<PackageReference Update="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.8.2" />
</ItemGroup>
<ItemGroup Label="Tests and Samples">
<PackageReference Update="CommandLineParser" Version="2.9.*" />
<PackageReference Update="Donald" Version="10.1.0" />
<PackageReference Update="EntityFramework" Version="1.*" />
<PackageReference Update="FSharp.Data.TypeProviders" Version="1.*" />
<PackageReference Update="FsToolkit.ErrorHandling" Version="4.15.3" />
<PackageReference Update="Giraffe" Version="6.*" />
<PackageReference Update="GraphQL.Server.Ui.Altair" Version="7.*" />
<PackageReference Update="GraphQL.Server.Ui.GraphiQL" Version="7.*" />
<PackageReference Update="GraphQL.Server.Ui.Playground" Version="7.*" />
<PackageReference Update="GraphQL.Server.Ui.Voyager" Version="7.*" />
<PackageReference Update="GraphQL.Server.Ui.Altair" Version="8.*" />
<PackageReference Update="GraphQL.Server.Ui.GraphiQL" Version="8.*" />
<PackageReference Update="GraphQL.Server.Ui.Playground" Version="8.*" />
<PackageReference Update="GraphQL.Server.Ui.Voyager" Version="8.*" />
<PackageReference Update="HotChocolate.AspNetCore" Version="13.*" />
<PackageReference Update="Iced" Version="1.17.*" />
<PackageReference Update="Microsoft.CodeCoverage" Version="17.3.*" />
<PackageReference Update="Microsoft.Data.Sqlite" Version="8.0.6" />
<PackageReference Update="Microsoft.Data.Sqlite" Version="$(MicrosoftExtensionsVersion)" />
<PackageReference Update="Microsoft.Diagnostics.NETCore.Client" Version="0.2.*" />
<PackageReference Update="Microsoft.Diagnostics.Runtime" Version="2.2.*" />
<PackageReference Update="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.*" />
Expand Down
2 changes: 1 addition & 1 deletion build/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ execContext
|> Fake.Core.Context.setExecutionContext

module DotNetCli =
let setVersion (o : DotNet.Options) = { o with Version = Some "8.0.202" }
let setVersion (o : DotNet.Options) = { o with Version = Some "8.0.400" }
let setRestoreOptions (o : DotNet.RestoreOptions) = o.WithCommon setVersion

let configurationString = Environment.environVarOrDefault "CONFIGURATION" "Release"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

<ItemGroup>
<PackageReference Include="Collections.Pooled" />
<PackageReference Include="FSharp.Core" VersionOverride="8.0.200" />
<PackageReference Include="FsToolkit.ErrorHandling" />
<PackageReference Include="FsToolkit.ErrorHandling.TaskResult" />
<PackageReference Include="Oxpecker" />
Expand Down