Merge branch 'develop'

giraffe-fsharp · Nov 18, 2020 · 322ba27 · 322ba27
2 parents 271e593 + 2a27a57
commit 322ba27
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 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/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,14 @@
 Release Notes
 =============
 
+## 1.3.0
+
+Upgraded to `net5.0` target framework.
+
+`Giraffe.ViewEngine` version `1.2.0` and version `1.3.0` are identical in functionality. The only difference is that `1.2.0` targets `netcoreapp3.1` and `1.3.0` targets `net5.0`. If you cannot upgrade your .NET Core project to `net5.0` yet then stay on version `1.2.0`.
+
+New features and bug fixes will continue off the `1.3.0` version and therefore only target `net5.0` going forward. The upgrade path from `netcoreapp3.1` to `net5.0` is so minimal that it is a reasonable expectation and not worth the effort to support both target frameworks.
+
 ## 1.2.0
 
 - Added missing `iframe` element ([#9](https://github.com/giraffe-fsharp/Giraffe.ViewEngine/issues/9))

diff --git a/samples/Giraffe.ViewEngine.Sample/Giraffe.ViewEngine.Sample.fsproj b/samples/Giraffe.ViewEngine.Sample/Giraffe.ViewEngine.Sample.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>GithubExample</RootNamespace>
   </PropertyGroup>
 

diff --git a/src/Giraffe.ViewEngine/Giraffe.ViewEngine.fsproj b/src/Giraffe.ViewEngine/Giraffe.ViewEngine.fsproj
@@ -8,7 +8,7 @@
     <NeutralLanguage>en-GB</NeutralLanguage>
 
     <!-- Build settings -->
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <DebugType>portable</DebugType>
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -41,7 +41,7 @@
       <PackagePath>$(PackageIconUrl)</PackagePath>
     </None>
   </ItemGroup>
-  
+
   <ItemGroup>
     <Compile Include="StringBuilderPool.fs" />
     <Compile Include="Engine.fs" />

diff --git a/tests/Giraffe.ViewEngine.Benchmarks/Giraffe.ViewEngine.Benchmarks.fsproj b/tests/Giraffe.ViewEngine.Benchmarks/Giraffe.ViewEngine.Benchmarks.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/Giraffe.ViewEngine.Tests/Giraffe.ViewEngine.Tests.fsproj b/tests/Giraffe.ViewEngine.Tests/Giraffe.ViewEngine.Tests.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,14 +12,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <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="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.0.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+    <PackageReference Include="NSubstitute" Version="4.2.2" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>