Skip to content

Commit 2f09c7a

Browse files
authored
feat: deps update and .net 9 (#253)
1 parent eb38d41 commit 2f09c7a

File tree

11 files changed

+282
-277
lines changed

11 files changed

+282
-277
lines changed

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "8.0.3",
6+
"version": "9.0.2",
77
"commands": [
88
"paket"
99
],
@@ -17,7 +17,7 @@
1717
"rollForward": false
1818
},
1919
"fantomas": {
20-
"version": "6.3.12",
20+
"version": "6.3.16",
2121
"commands": [
2222
"fantomas"
2323
],

.github/workflows/dotnetcore.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,28 @@ name: Build and Test
33
on:
44
push:
55
branches:
6-
- master
6+
- master
77
pull_request:
88
branches:
9-
- master
9+
- master
1010

1111
jobs:
1212
build:
13-
1413
strategy:
1514
fail-fast: false
1615
matrix:
1716
os: [ubuntu-latest, windows-latest, macOS-latest]
1817
runs-on: ${{ matrix.os }}
1918

2019
steps:
21-
- uses: actions/checkout@v1
22-
- name: Setup .NET 8.0 SDK
23-
uses: actions/setup-dotnet@v4
24-
with:
25-
dotnet-version: '8.0.x'
26-
- name: Install local tools
27-
run: dotnet tool restore
28-
- name: Paket Restore
29-
run: dotnet paket restore
30-
- name: Build and Test
31-
run: dotnet fsi build.fsx
20+
- uses: actions/checkout@v1
21+
- name: Setup .NET 9.0 SDK
22+
uses: actions/setup-dotnet@v4
23+
with:
24+
dotnet-version: "9.0.x"
25+
- name: Install local tools
26+
run: dotnet tool restore
27+
- name: Paket Restore
28+
run: dotnet paket restore
29+
- name: Build and Test
30+
run: dotnet fsi build.fsx

build.fsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ let webApiInputStream = StreamRef.Empty
9191
Target.create "StartServer" (fun _ ->
9292
Target.activateFinal "StopServer"
9393

94-
CreateProcess.fromRawCommandLine "dotnet" "tests/Swashbuckle.WebApi.Server/bin/Release/net8.0/Swashbuckle.WebApi.Server.dll"
94+
CreateProcess.fromRawCommandLine "dotnet" "tests/Swashbuckle.WebApi.Server/bin/Release/net9.0/Swashbuckle.WebApi.Server.dll"
9595
|> CreateProcess.withStandardInput(CreatePipe webApiInputStream)
9696
|> Proc.start
9797
|> ignore
@@ -116,9 +116,9 @@ Target.create "BuildTests" (fun _ -> dotnet "build" "SwaggerProvider.TestsAndDoc
116116
let runTests assembly =
117117
dotnet "test" $"{assembly} -c Release --no-build"
118118

119-
Target.create "RunUnitTests" (fun _ -> runTests "tests/SwaggerProvider.Tests/bin/Release/net8.0/SwaggerProvider.Tests.dll")
119+
Target.create "RunUnitTests" (fun _ -> runTests "tests/SwaggerProvider.Tests/bin/Release/net9.0/SwaggerProvider.Tests.dll")
120120

121-
Target.create "RunIntegrationTests" (fun _ -> runTests "tests/SwaggerProvider.ProviderTests/bin/Release/net8.0/SwaggerProvider.ProviderTests.dll")
121+
Target.create "RunIntegrationTests" (fun _ -> runTests "tests/SwaggerProvider.ProviderTests/bin/Release/net9.0/SwaggerProvider.ProviderTests.dll")
122122

123123
Target.create "RunTests" ignore
124124

docs/RELEASE_NOTES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#### 2.2.0 - Jan 6, 2025
2+
3+
- hk: build with .NET 9
4+
- hk: Dependencies update
5+
16
#### 2.1.3 - Sep 8, 2024
27

38
- hk: Dependencies update

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.401",
3+
"version": "9.0.101",
44
"rollForward": "minor"
55
}
66
}

paket.dependencies

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,20 @@ github fsprojects/FSharp.Data:main src/FSharp.Data.Runtime.Utilities/NameUtils.f
2020

2121
group Server
2222
source https://api.nuget.org/v3/index.json
23-
framework: net8.0
23+
framework: net9.0
2424

2525
nuget Microsoft.AspNetCore
2626
nuget Microsoft.AspNetCore.Mvc
2727
nuget Microsoft.AspNetCore.HttpsPolicy
2828
nuget Swashbuckle.AspNetCore
2929
nuget Microsoft.OpenApi
3030
nuget FSharp.Core
31+
nuget System.Text.Json
32+
3133

3234
group Test
3335
source https://api.nuget.org/v3/index.json
34-
frameworks: net8.0
36+
frameworks: net9.0
3537

3638
nuget FSharp.Compiler.Service
3739
nuget FSharp.Core

paket.lock

Lines changed: 249 additions & 250 deletions
Large diffs are not rendered by default.

src/SwaggerProvider.Runtime/paket.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ licenseUrl
1515
requireLicenseAcceptance
1616
false
1717
copyright
18-
Copyright 2015-2024
18+
Copyright 2015-2025
1919
tags
2020
F# fsharp data typeprovider Swagger API REST OpenAPI
2121
summary

tests/SwaggerProvider.ProviderTests/SwaggerProvider.ProviderTests.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0</TargetFrameworks>
55
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
66
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
77
</PropertyGroup>

tests/SwaggerProvider.Tests/SwaggerProvider.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0</TargetFrameworks>
55
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
66
</PropertyGroup>
77
<PropertyGroup>

0 commit comments

Comments
 (0)