feat: deps update and .net 9 (#253)

fsprojects · Jan 6, 2025 · 2f09c7a · 2f09c7a
1 parent eb38d41
commit 2f09c7a
Show file tree

Hide file tree

Showing 11 changed files with 282 additions and 277 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "8.0.3",
+      "version": "9.0.2",
       "commands": [
         "paket"
       ],
@@ -17,7 +17,7 @@
       "rollForward": false
     },
     "fantomas": {
-      "version": "6.3.12",
+      "version": "6.3.16",
       "commands": [
         "fantomas"
       ],

diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -3,29 +3,28 @@ name: Build and Test
 on:
   push:
     branches:
-    - master
+      - master
   pull_request:
     branches:
-    - master
+      - master
 
 jobs:
   build:
-
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Setup .NET 8.0 SDK
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: '8.0.x'
-    - name: Install local tools
-      run: dotnet tool restore
-    - name: Paket Restore
-      run: dotnet paket restore
-    - name: Build and Test
-      run: dotnet fsi build.fsx
+      - uses: actions/checkout@v1
+      - name: Setup .NET 9.0 SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: "9.0.x"
+      - name: Install local tools
+        run: dotnet tool restore
+      - name: Paket Restore
+        run: dotnet paket restore
+      - name: Build and Test
+        run: dotnet fsi build.fsx
diff --git a/build.fsx b/build.fsx
@@ -91,7 +91,7 @@ let webApiInputStream = StreamRef.Empty
 Target.create "StartServer" (fun _ ->
     Target.activateFinal "StopServer"
 
-    CreateProcess.fromRawCommandLine "dotnet" "tests/Swashbuckle.WebApi.Server/bin/Release/net8.0/Swashbuckle.WebApi.Server.dll"
+    CreateProcess.fromRawCommandLine "dotnet" "tests/Swashbuckle.WebApi.Server/bin/Release/net9.0/Swashbuckle.WebApi.Server.dll"
     |> CreateProcess.withStandardInput(CreatePipe webApiInputStream)
     |> Proc.start
     |> ignore
@@ -116,9 +116,9 @@ Target.create "BuildTests" (fun _ -> dotnet "build" "SwaggerProvider.TestsAndDoc
 let runTests assembly =
     dotnet "test" $"{assembly} -c Release --no-build"
 
-Target.create "RunUnitTests" (fun _ -> runTests "tests/SwaggerProvider.Tests/bin/Release/net8.0/SwaggerProvider.Tests.dll")
+Target.create "RunUnitTests" (fun _ -> runTests "tests/SwaggerProvider.Tests/bin/Release/net9.0/SwaggerProvider.Tests.dll")
 
-Target.create "RunIntegrationTests" (fun _ -> runTests "tests/SwaggerProvider.ProviderTests/bin/Release/net8.0/SwaggerProvider.ProviderTests.dll")
+Target.create "RunIntegrationTests" (fun _ -> runTests "tests/SwaggerProvider.ProviderTests/bin/Release/net9.0/SwaggerProvider.ProviderTests.dll")
 
 Target.create "RunTests" ignore
 

diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md
@@ -1,3 +1,8 @@
+#### 2.2.0 - Jan 6, 2025
+
+- hk: build with .NET 9
+- hk: Dependencies update
+
 #### 2.1.3 - Sep 8, 2024
 
 - hk: Dependencies update

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.401",
+    "version": "9.0.101",
     "rollForward": "minor"
   }
 }
diff --git a/paket.dependencies b/paket.dependencies
@@ -20,18 +20,20 @@ github fsprojects/FSharp.Data:main src/FSharp.Data.Runtime.Utilities/NameUtils.f
 
 group Server
     source https://api.nuget.org/v3/index.json
-    framework: net8.0
+    framework: net9.0
 
     nuget Microsoft.AspNetCore
     nuget Microsoft.AspNetCore.Mvc
     nuget Microsoft.AspNetCore.HttpsPolicy
     nuget Swashbuckle.AspNetCore
     nuget Microsoft.OpenApi
     nuget FSharp.Core
+    nuget System.Text.Json
+
 
 group Test
     source https://api.nuget.org/v3/index.json
-    frameworks: net8.0
+    frameworks: net9.0
 
     nuget FSharp.Compiler.Service
     nuget FSharp.Core

diff --git a/paket.lock b/paket.lock
diff --git a/src/SwaggerProvider.Runtime/paket.template b/src/SwaggerProvider.Runtime/paket.template
@@ -15,7 +15,7 @@ licenseUrl
 requireLicenseAcceptance
     false
 copyright
-    Copyright 2015-2024
+    Copyright 2015-2025
 tags
     F# fsharp data typeprovider Swagger API REST OpenAPI
 summary

diff --git a/tests/SwaggerProvider.ProviderTests/SwaggerProvider.ProviderTests.fsproj b/tests/SwaggerProvider.ProviderTests/SwaggerProvider.ProviderTests.fsproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>

diff --git a/tests/SwaggerProvider.Tests/SwaggerProvider.Tests.fsproj b/tests/SwaggerProvider.Tests/SwaggerProvider.Tests.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/tests/Swashbuckle.WebApi.Server/Swashbuckle.WebApi.Server.fsproj b/tests/Swashbuckle.WebApi.Server/Swashbuckle.WebApi.Server.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <RootNamespace>Swashbuckle.WebApi.Server</RootNamespace>