Skip to content

Commit

Permalink
Added Paket also to the None option
Browse files Browse the repository at this point in the history
and prepped for the new release.
  • Loading branch information
dustinmoris committed Jan 22, 2018
1 parent 69620ac commit b998e55
Show file tree
Hide file tree
Showing 8 changed files with 1,388 additions and 11 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ The Giraffe template supports three different view engines:
- `giraffe` (default)
- `razor`
- `dotliquid`
- `none`

You can optionally specify the `--ViewEngine` parameter (short `-V`) to pass in one of the supported values:

Expand Down Expand Up @@ -81,7 +82,7 @@ dotnet new giraffe --ViewEngine razor --IncludeTests

### --UsePaket

If you prefer [Paket](https://fsprojects.github.io/) for managing your project dependencies you can specify `--UsePaket` (`-U` for short):
If you prefer [Paket](https://fsprojects.github.io/) for managing your project dependencies then you can specify `--UsePaket` (`-U` for short):

```
dotnet new giraffe --UsePaket
Expand Down Expand Up @@ -121,4 +122,4 @@ For more information about Giraffe, how to set up a development environment, con

## License

[Apache 2.0](https://raw.githubusercontent.com/giraffe-fsharp/Giraffe.DotLiquid/master/LICENSE)
[Apache 2.0](https://raw.githubusercontent.com/giraffe-fsharp/giraffe-template/master/LICENSE)
9 changes: 7 additions & 2 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
Release Notes
=============

## Next version
## 0.12.0

#### New features

- Added `none` as a new option to the `--ViewEngine` parameter, which will create a Giraffe web application without any view engine (Web API only).
- Added a new parameter called `--UsePaket` which will use Paket instead of NuGet as the package manager for the Giraffe web application.

#### Enhancements

- Updated the default Giraffe tempalte to the latest version of Giraffe and made use of the new HTML attributes from the `GiraffeViewEngine`.
- Updated the default Giraffe template to the latest version of Giraffe and made use of the new HTML attributes from the `GiraffeViewEngine`.

## 0.11.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<Import Condition="'$(UsePaket)' == true" Project="..\..\.paket\Paket.Restore.targets" />

</Project>
17 changes: 17 additions & 0 deletions src/content/None/paket.dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
storage: none
source https://api.nuget.org/v3/index.json

clitool dotnet-xunit
nuget Microsoft.AspNetCore.Cors
nuget Microsoft.AspNetCore.Hosting
nuget Microsoft.AspNetCore.Diagnostics
nuget Microsoft.AspNetCore.Server.Kestrel
nuget Microsoft.AspNetCore.Server.IISIntegration
nuget Microsoft.Extensions.Logging.Console
nuget Microsoft.Extensions.Logging.Debug
nuget Microsoft.Extensions.DependencyInjection
nuget Giraffe
nuget Microsoft.NET.Test.Sdk
nuget xunit
nuget xunit.runner.visualstudio
nuget Microsoft.AspNetCore.TestHost
1,347 changes: 1,347 additions & 0 deletions src/content/None/paket.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,23 @@
<EnableDefaultContentItems>false</EnableDefaultContentItems>
</PropertyGroup>

<ItemGroup>
<ItemGroup Condition="'$(UsePaket)' == false OR '$(UsePaket)' == ''">
<PackageReference Include="Microsoft.AspNetCore.Cors" Version="2.0.*" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.0.*" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.*" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.*" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.*"/>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.*" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.*" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.*" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.*" />
<PackageReference Include="Giraffe" Version="0.1.0-beta-600" />
</ItemGroup>

<ItemGroup>
<DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
</ItemGroup>

<ItemGroup>
<Compile Include="Models.fs" />
<Compile Include="HttpHandlers.fs" />
<Compile Include="Program.fs" />
</ItemGroup>

<Import Condition="'$(UsePaket)' == true" Project="..\..\.paket\Paket.Restore.targets" />
</Project>
9 changes: 9 additions & 0 deletions src/content/None/src/AppNamePlaceholder/paket.references
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Microsoft.AspNetCore.Cors
Microsoft.AspNetCore.Hosting
Microsoft.AspNetCore.Diagnostics
Microsoft.AspNetCore.Server.Kestrel
Microsoft.AspNetCore.Server.IISIntegration
Microsoft.Extensions.Logging.Console
Microsoft.Extensions.Logging.Debug
Microsoft.Extensions.DependencyInjection
Giraffe
2 changes: 1 addition & 1 deletion src/giraffe-template.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>giraffe-template</id>
<version>0.11.0</version>
<version>0.12.0</version>
<title>Giraffe Template for dotnet-new</title>
<summary>A dotnet-new template for Giraffe web applications.</summary>
<description>A dotnet-new template for Giraffe web applications.</description>
Expand Down

0 comments on commit b998e55

Please sign in to comment.