Merge branch 'develop'

giraffe-fsharp · Feb 9, 2018 · d53edf1 · d53edf1
2 parents 60697f2 + e2e7406
commit d53edf1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 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
@@ -122,7 +122,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 Giraffe to `1.0.0`.
+
 ## 0.1.0-beta-310
 
 Upgraded Giraffe to `0.1.0-beta-6**`.

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/src/Giraffe.DotLiquid/Giraffe.DotLiquid.fsproj b/src/Giraffe.DotLiquid/Giraffe.DotLiquid.fsproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Giraffe.DotLiquid</AssemblyName>
-    <Version>0.1.0-beta-310</Version>
+    <Version>1.0.0</Version>
     <Description>DotLiquid templating engine http handlers for the Giraffe web framework.</Description>
-    <Copyright>Copyright 2017 Dustin Moris Gorski</Copyright>
+    <Copyright>Copyright 2018 Dustin Moris Gorski</Copyright>
     <NeutralLanguage>en-GB</NeutralLanguage>
     <Authors>Dustin Moris Gorski and contributors</Authors>
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
@@ -31,7 +31,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.0.*" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.*" />
     <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.*" />
-    <PackageReference Include="Giraffe" Version="0.1.0-beta-6*" />
+    <PackageReference Include="Giraffe" Version="1.0.*" />
     <PackageReference Include="DotLiquid" Version="2.0.*" />
   </ItemGroup>
 

diff --git a/tests/Giraffe.DotLiquid.Tests/Giraffe.DotLiquid.Tests.fsproj b/tests/Giraffe.DotLiquid.Tests/Giraffe.DotLiquid.Tests.fsproj
@@ -14,6 +14,7 @@
     <PackageReference Include="xunit" Version="2.3.*" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.*" />
     <PackageReference Include="NSubstitute" Version="3.1.*" />
+    <PackageReference Include="Giraffe.TokenRouter" Version="0.1.0-beta-1*" />
   </ItemGroup>
 
   <ItemGroup>