Merge branch 'develop'

giraffe-fsharp · Dec 8, 2020 · b52e060 · b52e060
2 parents 4285a3b + 05f6f09
commit b52e060
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 20 deletions.
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: 3.1.301
+          dotnet-version: 5.0.100
       - name: Restore
         run: dotnet restore
       - name: Build
@@ -71,7 +71,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.301
+          dotnet-version: 5.0.100
       - name: Create Release NuGet package
         run: |
           arrTag=(${GITHUB_REF//\// })

diff --git a/.gitignore b/.gitignore
@@ -288,4 +288,7 @@ __pycache__/
 *.xsd.cs
 
 #macOS
-.DS_Store
+.DS_Store
+
+# Ionide
+.ionide
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,12 @@
 Release Notes
 =============
 
+## 3.0.0-rc-1
+
+- Updated to .NET 5
+- Updated to latest Giraffe 5.0.0-rc-6
+- Swapped TaskBuilder.fs for Ply
+
 ## 2.0.0
 
 - Removed support for all .NET framework monikers except `netcoreapp3.1` (in preparation for .NET 5)

diff --git a/samples/GiraffeDotLiquidSample.Tests/GiraffeDotLiquidSample.Tests.fsproj b/samples/GiraffeDotLiquidSample.Tests/GiraffeDotLiquidSample.Tests.fsproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>GiraffeDotLiquidSample.Tests</AssemblyName>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.*" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.*" />
+    <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.*" />
   </ItemGroup>

diff --git a/samples/GiraffeDotLiquidSample/GiraffeDotLiquidSample.fsproj b/samples/GiraffeDotLiquidSample/GiraffeDotLiquidSample.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>GiraffeDotLiquidSample</AssemblyName>
     <EnableDefaultContentItems>false</EnableDefaultContentItems>
     <RunWorkingDirectory>$(MSBuildThisFileDirectory)</RunWorkingDirectory>

diff --git a/src/Giraffe.DotLiquid/Giraffe.DotLiquid.fsproj b/src/Giraffe.DotLiquid/Giraffe.DotLiquid.fsproj
@@ -7,8 +7,11 @@
     <Authors>Dustin Moris Gorski and contributors</Authors>
     <NeutralLanguage>en-GB</NeutralLanguage>
 
+    <!-- Tell NuGet to STFU -->
+    <NoWarn>$(NoWarn);NU5104</NoWarn>
+
     <!-- Build config -->
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <DebugType>portable</DebugType>
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -30,7 +33,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <NoWarn>FS2003;FS0044</NoWarn>
+    <NoWarn>$(NoWarn);FS2003;FS0044</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -41,8 +44,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Giraffe" Version="4.1.*" />
-    <PackageReference Include="TaskBuilder.fs" Version="2.1.*" />
+    <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" />
   </ItemGroup>

diff --git a/src/Giraffe.DotLiquid/HttpHandlers.fs b/src/Giraffe.DotLiquid/HttpHandlers.fs
@@ -6,8 +6,8 @@ open Microsoft.AspNetCore.Http
 open Microsoft.AspNetCore.Hosting
 open Microsoft.Extensions.DependencyInjection
 open DotLiquid
-open Giraffe.Common
-open FSharp.Control.Tasks.V2
+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,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>Giraffe.DotLiquid.Tests</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.*" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.*" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.*"/>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.*" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.*" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-    <PackageReference Include="NSubstitute" Version="4.2.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.*" />
+    <PackageReference Include="NSubstitute" Version="4.2.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/Giraffe.DotLiquid.Tests/HttpHandlerTests.fs b/tests/Giraffe.DotLiquid.Tests/HttpHandlerTests.fs
@@ -4,7 +4,7 @@ open System.IO
 open System.Text
 open System.Threading.Tasks
 open Microsoft.AspNetCore.Http
-open FSharp.Control.Tasks.V2
+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,7 @@ open System.IO
 open System.Text
 open System.Threading.Tasks
 open Microsoft.AspNetCore.Http
-open FSharp.Control.Tasks.V2
+open FSharp.Control.Tasks
 open Giraffe
 open Xunit
 open NSubstitute