giraffe-fsharp · Trigun27 · Jun 27, 2020 · Jun 27, 2020 · Dec 8, 2020 · Aug 26, 2023
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.100
+          dotnet-version: 7.x
       - name: Restore
         run: dotnet restore
       - name: Build
@@ -40,7 +40,11 @@ jobs:
         run: dotnet test -c Release
       - name: Pack
         if: matrix.os == 'ubuntu-latest'
-        run: dotnet pack -v normal -c Release --no-restore --include-symbols --include-source -p:PackageVersion=$GITHUB_RUN_ID src/$PROJECT_NAME/$PROJECT_NAME.*proj
+        run: |
+          latestTag=$(git describe --tags --abbrev=0 2>/dev/null || echo 0.0.1)
+          runId=$GITHUB_RUN_ID
+          packageVersion="${latestTag//v}-build.${runId}"
+          dotnet pack -v normal -c Release --no-restore --include-symbols --include-source -p:PackageVersion=$packageVersion src/$PROJECT_NAME/$PROJECT_NAME.*proj
       - name: Upload Artifact
         if: matrix.os == 'ubuntu-latest'
         uses: actions/upload-artifact@v2
@@ -71,7 +75,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.100
+          dotnet-version: 7.x
       - name: Create Release NuGet package
         run: |
           arrTag=(${GITHUB_REF//\// })

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,12 @@
 Release Notes
 =============
 
+## 4.0.0-rc-1
+
+- Updated to .NET 7
+- Updated to latest Giraffe 6.2.0
+- Swapped Ply for native F# task
+
 ## 3.0.0-rc-1
 
 - Updated to .NET 5

diff --git a/samples/GiraffeDotLiquidSample.Tests/GiraffeDotLiquidSample.Tests.fsproj b/samples/GiraffeDotLiquidSample.Tests/GiraffeDotLiquidSample.Tests.fsproj
@@ -1,16 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>GiraffeDotLiquidSample.Tests</AssemblyName>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.*" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.*" />
-    <PackageReference Include="xunit" Version="2.4.*" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.10" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Update="FSharp.Core" Version="7.0.400" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/GiraffeDotLiquidSample.Tests/Tests.fs b/samples/GiraffeDotLiquidSample.Tests/Tests.fs
@@ -44,7 +44,7 @@ let readText (response : HttpResponseMessage) =
     response.Content.ReadAsStringAsync()
     |> runTask
 
-let shouldEqual expected actual =
+let shouldEqual (expected : string) (actual : string) =
     Assert.Equal(expected, actual)
 
 // ---------------------------------

diff --git a/samples/GiraffeDotLiquidSample/GiraffeDotLiquidSample.fsproj b/samples/GiraffeDotLiquidSample/GiraffeDotLiquidSample.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>GiraffeDotLiquidSample</AssemblyName>
     <EnableDefaultContentItems>false</EnableDefaultContentItems>
     <RunWorkingDirectory>$(MSBuildThisFileDirectory)</RunWorkingDirectory>
@@ -25,4 +25,8 @@
     </Content>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="FSharp.Core" Version="7.0.400" />
+  </ItemGroup>
+
 </Project>
diff --git a/samples/GiraffeDotLiquidSample/Program.fs b/samples/GiraffeDotLiquidSample/Program.fs
@@ -23,11 +23,22 @@ let personTemplate = "<html><head><title>DotLiquid</title></head><body><p>First
 
 let fooBar = { FirstName = "Foo"; LastName = "Bar" }
 
+let renderIndex =
+    """
+    <p>non razor index</p>
+    <ul>
+        <li><a href=/person>person</a></li></li>
+        <li><a href=/person2>person2</a></li>
+        <li><a href=/person3>person3</a></li>
+    </ul>
+    """
+    |> htmlString
+
 let webApp =
     choose [
         GET >=>
             choose [
-                route "/"        >=> text "index"
+                route "/"        >=> renderIndex
                 route "/person"  >=> dotLiquid "text/html" personTemplate fooBar
                 route "/person2" >=> dotLiquidTemplate "text/html" "Templates/Person.liquid" fooBar
                 route "/person3" >=> dotLiquidHtmlTemplate "Templates/Person.liquid" fooBar

diff --git a/src/Giraffe.DotLiquid/Giraffe.DotLiquid.fsproj b/src/Giraffe.DotLiquid/Giraffe.DotLiquid.fsproj
@@ -11,7 +11,7 @@
     <NoWarn>$(NoWarn);NU5104</NoWarn>
 
     <!-- Build config -->
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <DebugType>portable</DebugType>
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -44,10 +44,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Giraffe" Version="5.0.0-rc-6" />
-    <PackageReference Include="Ply" Version="0.3.*" />
-    <PackageReference Include="DotLiquid" Version="2.0.*"/>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.*" PrivateAssets="All" />
+    <PackageReference Include="Giraffe" Version="6.2.0" />
+    <PackageReference Include="DotLiquid" Version="2.2.692" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Update="FSharp.Core" Version="7.0.400" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Giraffe.DotLiquid/HttpHandlers.fs b/src/Giraffe.DotLiquid/HttpHandlers.fs
@@ -7,7 +7,6 @@ open Microsoft.AspNetCore.Hosting
 open Microsoft.Extensions.DependencyInjection
 open DotLiquid
 open Giraffe
-open FSharp.Control.Tasks
 
 /// Renders a model and a template with the DotLiquid template engine and sets the HTTP response
 /// with the compiled output as well as the Content-Type HTTP header to the given value.

diff --git a/tests/Giraffe.DotLiquid.Tests/Giraffe.DotLiquid.Tests.fsproj b/tests/Giraffe.DotLiquid.Tests/Giraffe.DotLiquid.Tests.fsproj
@@ -1,18 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>Giraffe.DotLiquid.Tests</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.*" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.*"/>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.*" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.*" />
-    <PackageReference Include="NSubstitute" Version="4.2.*" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.10" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="NSubstitute" Version="4.4.0" />
+    <PackageReference Update="FSharp.Core" Version="7.0.400" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/Giraffe.DotLiquid.Tests/HttpHandlerTests.fs b/tests/Giraffe.DotLiquid.Tests/HttpHandlerTests.fs
@@ -4,7 +4,6 @@ open System.IO
 open System.Text
 open System.Threading.Tasks
 open Microsoft.AspNetCore.Http
-open FSharp.Control.Tasks
 open Giraffe
 open Xunit
 open NSubstitute

diff --git a/tests/Giraffe.DotLiquid.Tests/TokenRouterTests.fs b/tests/Giraffe.DotLiquid.Tests/TokenRouterTests.fs
@@ -4,7 +4,6 @@ open System.IO
 open System.Text
 open System.Threading.Tasks
 open Microsoft.AspNetCore.Http
-open FSharp.Control.Tasks
 open Giraffe
 open Xunit
 open NSubstitute