Merge branch 'develop'

giraffe-fsharp · Aug 20, 2018 · b4202bf · b4202bf
2 parents 6211728 + 7626657
commit b4202bf
Show file tree

Hide file tree

Showing 25 changed files with 36 additions and 39 deletions.
diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md
@@ -169,7 +169,7 @@ let personHandler =
 The `task {}` CE is an independent project maintained by [Robert Peele](https://github.com/rspeele) and can be used from any other F# application as well. All you have to do is add a reference to the `TaskBuilder.fs` NuGet library and open the module:
 
 ```fsharp
-open FSharp.Control.Tasks
+open FSharp.Control.Tasks.V2
 
 let readFileAndDoSomething (filePath : string) =
     task {
@@ -190,7 +190,7 @@ For more information please visit the official [TaskBuilder.fs](https://github.c
 If you have `do!` bindings in your Giraffe web application then you must open the `FSharp.Control.Tasks.ContextInsensitive` namespace to resolve any type inference issues:
 
 ```fsharp
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 ```
 
 ## Basics

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+## 2.0.1
+
+Changed the `task {}` CE to load from `FSharp.Control.Tasks.V2.ContextInsensitive` instead of `FSharp.Control.Tasks.ContextInsensitive`
+
 ## 2.0.0
 
 #### Breaking changes

diff --git a/build.ps1 b/build.ps1
@@ -49,7 +49,7 @@ function Get-TargetFrameworks ($projFile)
 {
     [xml]$proj = Get-Content $projFile
 
-    if ($proj.Project.PropertyGroup.TargetFrameworks -ne $null) {
+    if ($null -ne $proj.Project.PropertyGroup.TargetFrameworks) {
         ($proj.Project.PropertyGroup.TargetFrameworks).Split(";")
     }
     else {

diff --git a/samples/GoogleAuthApp/GoogleAuthApp/GoogleAuthApp.fsproj b/samples/GoogleAuthApp/GoogleAuthApp/GoogleAuthApp.fsproj
@@ -3,9 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <DebugType>portable</DebugType>
-    <AssemblyName>GoogleAuthApp</AssemblyName>
-    <OutputType>Exe</OutputType>
-    <PackageId>GoogleAuthApp</PackageId>
     <EnableDefaultContentItems>false</EnableDefaultContentItems>
     <RunWorkingDirectory>$(MSBuildThisFileDirectory)</RunWorkingDirectory>
   </PropertyGroup>

diff --git a/samples/GoogleAuthApp/GoogleAuthApp/Program.fs b/samples/GoogleAuthApp/GoogleAuthApp/Program.fs
@@ -7,7 +7,7 @@ open Microsoft.AspNetCore.Hosting
 open Microsoft.AspNetCore.Authentication
 open Microsoft.Extensions.Logging
 open Microsoft.Extensions.DependencyInjection
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 open Giraffe
 open Giraffe.GiraffeViewEngine
 open GoogleAuthApp.HttpsConfig

diff --git a/samples/IdentityApp/IdentityApp/IdentityApp.fsproj b/samples/IdentityApp/IdentityApp/IdentityApp.fsproj
@@ -3,9 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <DebugType>portable</DebugType>
-    <AssemblyName>IdentityApp</AssemblyName>
-    <OutputType>Exe</OutputType>
-    <PackageId>IdentityApp</PackageId>
     <EnableDefaultContentItems>false</EnableDefaultContentItems>
     <RunWorkingDirectory>$(MSBuildThisFileDirectory)</RunWorkingDirectory>
   </PropertyGroup>

diff --git a/samples/IdentityApp/IdentityApp/Program.fs b/samples/IdentityApp/IdentityApp/Program.fs
@@ -12,7 +12,7 @@ open Microsoft.Extensions.DependencyInjection
 open Microsoft.AspNetCore.Identity
 open Microsoft.AspNetCore.Identity.EntityFrameworkCore
 open Microsoft.EntityFrameworkCore
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 open Giraffe
 open Giraffe.GiraffeViewEngine
 

diff --git a/samples/JwtApp/JwtApp/JwtApp.fsproj b/samples/JwtApp/JwtApp/JwtApp.fsproj
@@ -3,9 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <DebugType>portable</DebugType>
-    <AssemblyName>JwtApp</AssemblyName>
-    <OutputType>Exe</OutputType>
-    <PackageId>JwtApp</PackageId>
     <EnableDefaultContentItems>false</EnableDefaultContentItems>
     <RunWorkingDirectory>$(MSBuildThisFileDirectory)</RunWorkingDirectory>
   </PropertyGroup>

diff --git a/samples/SampleApp/SampleApp/Program.fs b/samples/SampleApp/SampleApp/Program.fs
@@ -13,7 +13,7 @@ open Microsoft.AspNetCore.Authentication.Cookies
 open Microsoft.Extensions.Configuration
 open Microsoft.Extensions.Logging
 open Microsoft.Extensions.DependencyInjection
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 open Giraffe
 open SampleApp.Models
 open SampleApp.HtmlViews

diff --git a/samples/SampleApp/SampleApp/SampleApp.fsproj b/samples/SampleApp/SampleApp/SampleApp.fsproj
@@ -3,9 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <DebugType>portable</DebugType>
-    <AssemblyName>SampleApp</AssemblyName>
-    <OutputType>Exe</OutputType>
-    <PackageId>SampleApp</PackageId>
     <EnableDefaultContentItems>false</EnableDefaultContentItems>
     <RunWorkingDirectory>$(MSBuildThisFileDirectory)</RunWorkingDirectory>
   </PropertyGroup>

diff --git a/src/Giraffe/Auth.fs b/src/Giraffe/Auth.fs
@@ -5,7 +5,7 @@ open System.Security.Claims
 open Microsoft.AspNetCore.Http
 open Microsoft.AspNetCore.Authentication
 open Microsoft.AspNetCore.Authorization
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 
 /// **Description**
 ///

diff --git a/src/Giraffe/Common.fs b/src/Giraffe/Common.fs
@@ -12,7 +12,7 @@ open System.IO
 ///
 /// All tasks are configured with `ConfigurAwait(false)`.
 ///
-let task = FSharp.Control.Tasks.ContextInsensitive.task
+let task = FSharp.Control.Tasks.V2.ContextInsensitive.task
 
 // ---------------------------
 // Useful extension methods

diff --git a/src/Giraffe/Core.fs b/src/Giraffe/Core.fs
@@ -8,7 +8,7 @@ open Microsoft.AspNetCore.Hosting
 open Microsoft.Extensions.Primitives
 open Microsoft.Extensions.Logging
 open Microsoft.Net.Http.Headers
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 open Giraffe.Serialization
 
 // ---------------------------

diff --git a/src/Giraffe/Giraffe.fsproj b/src/Giraffe/Giraffe.fsproj
@@ -1,17 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <!-- General -->
     <AssemblyName>Giraffe</AssemblyName>
-    <Version>2.0.0</Version>
+    <Version>2.0.1</Version>
     <Description>A native functional ASP.NET Core web framework for F# developers.</Description>
     <Copyright>Copyright 2018 Dustin Moris Gorski</Copyright>
-    <NeutralLanguage>en-GB</NeutralLanguage>
     <Authors>Dustin Moris Gorski and contributors</Authors>
+    <NeutralLanguage>en-GB</NeutralLanguage>
+
+    <!-- Build settings -->
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <DebugType>portable</DebugType>
-    <WarningsAsErrors>1</WarningsAsErrors>
-    <Optimize>True</Optimize>
     <OutputType>Library</OutputType>
+    <Optimize>true</Optimize>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <IsWindows Condition="'$(OS)' == 'Windows_NT'">true</IsWindows>
+
+    <!-- NuGet settings -->
     <PackageId>Giraffe</PackageId>
     <PackageTags>Giraffe;ASP.NET Core;Lambda;FSharp;Functional;Http;Web;Framework;Micro;Service</PackageTags>
     <PackageReleaseNotes>https://raw.githubusercontent.com/giraffe-fsharp/giraffe/master/RELEASE_NOTES.md</PackageReleaseNotes>
@@ -21,9 +29,6 @@
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/dustinmoris/giraffe</RepositoryUrl>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <IsWindows Condition="'$(OS)' == 'Windows_NT'">true</IsWindows>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Giraffe/Middleware.fs b/src/Giraffe/Middleware.fs
@@ -8,7 +8,7 @@ open Microsoft.AspNetCore.Http
 open Microsoft.Extensions.Logging
 open Microsoft.Extensions.DependencyInjection
 open Microsoft.Extensions.DependencyInjection.Extensions
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 open Giraffe.Serialization
 
 // ---------------------------

diff --git a/src/Giraffe/ModelBinding.fs b/src/Giraffe/ModelBinding.fs
@@ -12,7 +12,7 @@ open Microsoft.AspNetCore.Http
 open Microsoft.Extensions.Primitives
 open Microsoft.Net.Http.Headers
 open Microsoft.FSharp.Reflection
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 
 // ---------------------------
 // Model parsing functions

diff --git a/src/Giraffe/ResponseWriters.fs b/src/Giraffe/ResponseWriters.fs
@@ -5,7 +5,7 @@ open System.IO
 open System.Text
 open Microsoft.AspNetCore.Http
 open Microsoft.Net.Http.Headers
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 open Giraffe.GiraffeViewEngine
 
 // ---------------------------

diff --git a/src/Giraffe/Routing.fs b/src/Giraffe/Routing.fs
@@ -6,7 +6,7 @@ open System.Collections.Generic
 open System.Text.RegularExpressions
 open Microsoft.AspNetCore.Http
 open Microsoft.Extensions.Primitives
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 open Giraffe.FormatExpressions
 
 // ---------------------------

diff --git a/src/Giraffe/Serialization.fs b/src/Giraffe/Serialization.fs
@@ -10,7 +10,7 @@ module Json =
     open System.Threading.Tasks
     open Newtonsoft.Json
     open Newtonsoft.Json.Serialization
-    open FSharp.Control.Tasks.ContextInsensitive
+    open FSharp.Control.Tasks.V2.ContextInsensitive
 
     /// **Description**
     ///

diff --git a/src/Giraffe/Streaming.fs b/src/Giraffe/Streaming.fs
@@ -9,7 +9,7 @@ open Microsoft.AspNetCore.Http
 open Microsoft.AspNetCore.Http.Extensions
 open Microsoft.Extensions.Primitives
 open Microsoft.Net.Http.Headers
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 
 // ---------------------------
 // HTTP Range parsing

diff --git a/tests/Giraffe.Tests/AuthTests.fs b/tests/Giraffe.Tests/AuthTests.fs
@@ -7,7 +7,7 @@ open Xunit
 open NSubstitute
 open FsCheck
 open FsCheck.Xunit
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 open Giraffe
 
 [<AutoOpen>]

diff --git a/tests/Giraffe.Tests/HttpContextExtensionsTests.fs b/tests/Giraffe.Tests/HttpContextExtensionsTests.fs
@@ -9,7 +9,7 @@ open Microsoft.AspNetCore.Http.Internal
 open Microsoft.Extensions.Primitives
 open Microsoft.AspNetCore.Builder
 open Microsoft.AspNetCore.TestHost
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 open Xunit
 open NSubstitute
 open Giraffe

diff --git a/tests/Giraffe.Tests/HttpHandlerTests.fs b/tests/Giraffe.Tests/HttpHandlerTests.fs
@@ -5,7 +5,7 @@ open System.IO
 open System.Collections.Generic
 open Microsoft.AspNetCore.Http
 open Microsoft.Extensions.Primitives
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 open Xunit
 open NSubstitute
 open Giraffe

diff --git a/tests/Giraffe.Tests/ModelBindingTests.fs b/tests/Giraffe.Tests/ModelBindingTests.fs
@@ -9,7 +9,7 @@ open System.Threading.Tasks
 open Microsoft.AspNetCore.Http
 open Microsoft.AspNetCore.Http.Internal
 open Microsoft.Extensions.Primitives
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 open Xunit
 open NSubstitute
 open Newtonsoft.Json

diff --git a/tests/Giraffe.Tests/RoutingTests.fs b/tests/Giraffe.Tests/RoutingTests.fs
@@ -4,7 +4,7 @@ open System
 open System.IO
 open System.Collections.Generic
 open Microsoft.AspNetCore.Http
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 open Xunit
 open NSubstitute
 open Giraffe