Merge branch 'develop'

giraffe-fsharp · Feb 9, 2018 · fb4031a · fb4031a
2 parents 860c8a0 + e10bbbb
commit fb4031a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: csharp
 sudo: required
 dist: trusty
 
-dotnet: 2.0.3
+dotnet: 2.1.4
 mono:
   - 4.6.1
   - 4.8.1

diff --git a/README.md b/README.md
@@ -166,7 +166,7 @@ If you add this source to your NuGet CLI or project settings then you can pull u
 
 ## More information
 
-For more information about Giraffe, how to set up a development environment, contribution guidelines and more please visit the [main documentation](https://github.com/giraffe-fsharp/Giraffe#table-of-contents) page.
+For more information about Giraffe, how to set up a development environment, contribution guidelines and more please visit the [main documentation](https://github.com/giraffe-fsharp/Giraffe/blob/master/DOCUMENTATION.md) page.
 
 ## License
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+## 1.0.0
+
+Upgraded to latest Giraffe `1.0.0` release.
+
 ## 0.1.0-beta-310
 
 Upgraded to latest Giraffe `0.1.0-beta-6**` release.

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "projects": [ "src", "tests" ],
   "sdk": {
-    "version": "2.0.3"
+    "version": "2.1.4"
   }
 }
diff --git a/samples/GiraffeRazorSample/Program.fs b/samples/GiraffeRazorSample/Program.fs
@@ -12,7 +12,6 @@ open Microsoft.Extensions.Logging
 open Microsoft.Extensions.DependencyInjection
 open Giraffe
 open Giraffe.Razor
-open Microsoft.AspNetCore.Http
 
 // ---------------------------------
 // Models

diff --git a/src/Giraffe.Razor/Giraffe.Razor.fsproj b/src/Giraffe.Razor/Giraffe.Razor.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Giraffe.Razor</AssemblyName>
-    <Version>0.1.0-beta-310</Version>
+    <Version>1.0.0</Version>
     <Description>Razor view engine http handlers for the Giraffe web framework.</Description>
     <Copyright>Copyright 2017 Dustin Moris Gorski</Copyright>
     <NeutralLanguage>en-GB</NeutralLanguage>
@@ -31,7 +31,7 @@
     <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="2.0.*" />
     <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.*" />
     <PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.0.*" />
-    <PackageReference Include="Giraffe" Version="0.1.0-beta-6*" />
+    <PackageReference Include="Giraffe" Version="1.0.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Giraffe.Razor/RazorEngine.fs b/src/Giraffe.Razor/RazorEngine.fs
@@ -12,7 +12,8 @@ module RazorEngine =
     open Microsoft.AspNetCore.Mvc.Rendering
     open Microsoft.AspNetCore.Mvc.ViewFeatures
     open Microsoft.AspNetCore.Routing
-    open Giraffe.Tasks
+    open FSharp.Control.Tasks.ContextInsensitive
+    open Giraffe
 
     let renderView (razorViewEngine   : IRazorViewEngine)
                    (tempDataProvider  : ITempDataProvider)