Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
dustinmoris committed Dec 21, 2017
2 parents 604eb6b + b4b9433 commit 60697f2
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 4 deletions.
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ DotLiquid templating engine http handlers for the Giraffe web framework.
- [dotLiquidTemplate](#dotliquidtemplate)
- [dotLiquidHtmlTemplate](#dotliquidhtmltemplate)
- [Samples](#samples)
- [Nightly builds and NuGet feed](#nightly-builds-and-nuget-feed)
- [More information](#more-information)
- [License](#license)

Expand Down Expand Up @@ -107,6 +108,18 @@ let app =

Please find a fully functioning sample application under [./samples/GiraffeDotLiquidSample/](https://github.com/giraffe-fsharp/Giraffe.DotLiquid/tree/master/samples/GiraffeDotLiquidSample).

## Nightly builds and NuGet feed

All official Giraffe packages are published to the official and public NuGet feed.

Unofficial builds (such as pre-release builds from the `develop` branch and pull requests) produce unofficial pre-release NuGet packages which can be pulled from the project's public NuGet feed on AppVeyor:

```
https://ci.appveyor.com/nuget/giraffe-dotliquid
```

If you add this source to your NuGet CLI or project settings then you can pull unofficial NuGet packages for quick feature testing or urgent hot fixes.

## 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.
Expand Down
6 changes: 5 additions & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
Release Notes
=============

## 0.1.0-beta-310

Upgraded Giraffe to `0.1.0-beta-6**`.

## 0.1.0-beta-300

Upgraded dependencies to `Giraffe 0.1.0-beta-5**`.
Upgraded dependencies to Giraffe `0.1.0-beta-5**`.

#### Breaking changes

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ artifacts:
name: Giraffe NuGet packages
nuget:
account_feed: false
project_feed: false
project_feed: true
deploy:
provider: NuGet
api_key:
Expand Down
4 changes: 2 additions & 2 deletions src/Giraffe.DotLiquid/Giraffe.DotLiquid.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>Giraffe.DotLiquid</AssemblyName>
<Version>0.1.0-beta-300</Version>
<Version>0.1.0-beta-310</Version>
<Description>DotLiquid templating engine http handlers for the Giraffe web framework.</Description>
<Copyright>Copyright 2017 Dustin Moris Gorski</Copyright>
<NeutralLanguage>en-GB</NeutralLanguage>
Expand Down Expand Up @@ -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-5*" />
<PackageReference Include="Giraffe" Version="0.1.0-beta-6*" />
<PackageReference Include="DotLiquid" Version="2.0.*" />
</ItemGroup>

Expand Down

0 comments on commit 60697f2

Please sign in to comment.