Merge branch 'develop' of https://github.com/giraffe-fsharp/giraffe-t…

…emplate into generic-host-builder
giraffe-fsharp · Jun 27, 2020 · 510db15 · 510db15
2 parents be14bbe + 8c7d97a
commit 510db15
Show file tree

Hide file tree

Showing 45 changed files with 236 additions and 75 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -36,8 +36,8 @@ Remove-OldBuildArtifacts
 
 # Test Giraffe template
 Write-Host "Building and testing Giraffe tempalte..." -ForegroundColor Magenta
-$giraffeApp     = "src/content/Giraffe/src/AppNamePlaceholder/AppNamePlaceholder.fsproj"
-$giraffeTests   = "src/content/Giraffe/tests/AppNamePlaceholder.Tests/AppNamePlaceholder.Tests.fsproj"
+$giraffeApp     = "src/content/Giraffe/src/AppName/AppName.fsproj"
+$giraffeTests   = "src/content/Giraffe/tests/AppName.Tests/AppName.Tests.fsproj"
 
 dotnet-restore $giraffeApp
 dotnet-build   $giraffeApp
@@ -47,8 +47,8 @@ dotnet-test    $giraffeTests
 
 # Test Razor template
 Write-Host "Building and testing Razor tempalte..." -ForegroundColor Magenta
-$razorApp       = "src/content/Razor/src/AppNamePlaceholder/AppNamePlaceholder.fsproj"
-$razorTests     = "src/content/Razor/tests/AppNamePlaceholder.Tests/AppNamePlaceholder.Tests.fsproj"
+$razorApp       = "src/content/Razor/src/AppName/AppName.fsproj"
+$razorTests     = "src/content/Razor/tests/AppName.Tests/AppName.Tests.fsproj"
 
 dotnet-restore $razorApp
 dotnet-build   $razorApp
@@ -58,8 +58,8 @@ dotnet-test    $razorTests
 
 # Test DotLiquid template
 Write-Host "Building and testing DotLiquid tempalte..." -ForegroundColor Magenta
-$dotLiquidApp   = "src/content/DotLiquid/src/AppNamePlaceholder/AppNamePlaceholder.fsproj"
-$dotLiquidTests = "src/content/DotLiquid/tests/AppNamePlaceholder.Tests/AppNamePlaceholder.Tests.fsproj"
+$dotLiquidApp   = "src/content/DotLiquid/src/AppName/AppName.fsproj"
+$dotLiquidTests = "src/content/DotLiquid/tests/AppName.Tests/AppName.Tests.fsproj"
 
 dotnet-restore $dotLiquidApp
 dotnet-build   $dotLiquidApp
@@ -69,8 +69,8 @@ dotnet-test    $dotLiquidTests
 
 # Test None template
 Write-Host "Building and testing None tempalte..." -ForegroundColor Magenta
-$noneApp   = "src/content/None/src/AppNamePlaceholder/AppNamePlaceholder.fsproj"
-$noneTests = "src/content/None/tests/AppNamePlaceholder.Tests/AppNamePlaceholder.Tests.fsproj"
+$noneApp   = "src/content/None/src/AppName/AppName.fsproj"
+$noneTests = "src/content/None/tests/AppName.Tests/AppName.Tests.fsproj"
 
 dotnet-restore $noneApp
 dotnet-build   $noneApp

diff --git a/src/content/.template.config/template.json b/src/content/.template.config/template.json
@@ -1,13 +1,13 @@
 {
   "identity": "Giraffe.Template",
   "shortName": "giraffe",
-  "name": "Giraffe Web App",
+  "name": "Giraffe",
   "author": "Dustin Moris Gorski, David Sinclair and contributors",
   "classifications": [ "Web", "Giraffe", "ASP.NET" ],
   "tags": {
     "language": "F#"
   },
-  "sourceName": "AppNamePlaceholder",
+  "sourceName": "AppName",
   "symbols": {
     "ViewEngine": {
       "type": "parameter",
@@ -16,15 +16,15 @@
       "choices": [
         {
           "choice": "giraffe",
-          "description": "Default GiraffeViewEngine"
+          "description": "Giraffe.ViewEngine views"
         },
         {
           "choice": "razor",
           "description": "MVC Razor views"
         },
         {
           "choice": "dotliquid",
-          "description": "DotLiquid template engine"
+          "description": "DotLiquid template views"
         },
         {
           "choice": "none",
@@ -51,7 +51,7 @@
       "modifiers": [
         {
           "condition": "(!IncludeTests)",
-          "exclude": [ "**/AppNamePlaceholder.Tests/**/*" ]
+          "exclude": [ "**/AppName.Tests/**/*" ]
         },
         {
           "condition": "(!UsePaket)",
@@ -66,7 +66,7 @@
       "modifiers": [
         {
           "condition": "(!IncludeTests)",
-          "exclude": [ "**/AppNamePlaceholder.Tests/**/*" ]
+          "exclude": [ "**/AppName.Tests/**/*" ]
         },
         {
           "condition": "(!UsePaket)",
@@ -81,7 +81,7 @@
       "modifiers": [
         {
           "condition": "(!IncludeTests)",
-          "exclude": [ "**/AppNamePlaceholder.Tests/**/*" ]
+          "exclude": [ "**/AppName.Tests/**/*" ]
         },
         {
           "condition": "(!UsePaket)",
@@ -96,7 +96,7 @@
       "modifiers": [
         {
           "condition": "(!IncludeTests)",
-          "exclude": [ "**/AppNamePlaceholder.Tests/**/*" ]
+          "exclude": [ "**/AppName.Tests/**/*" ]
         },
         {
           "condition": "(!UsePaket)",
@@ -111,7 +111,7 @@
       "modifiers": [
         {
           "condition": "(!IncludeTests)",
-          "exclude": [ "**/AppNamePlaceholder.Tests/**/*" ]
+          "exclude": [ "**/AppName.Tests/**/*" ]
         }
       ]
     },

diff --git a/...NamePlaceholder/AppNamePlaceholder.fsproj → ...tent/DotLiquid/src/AppName/AppName.fsproj b/...NamePlaceholder/AppNamePlaceholder.fsproj → ...tent/DotLiquid/src/AppName/AppName.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AssemblyName>AppNamePlaceholder.App</AssemblyName>
+    <AssemblyName>AppName.App</AssemblyName>
     <EnableDefaultContentItems>false</EnableDefaultContentItems>
   </PropertyGroup>
 
@@ -23,6 +23,7 @@
 
   <ItemGroup>
     <None Include="web.config" CopyToOutputDirectory="PreserveNewest" />
+    <None Condition="'$(UsePaket)' == true" Include="paket.references" />
     <Content Include="Views\*.html;WebRoot\**\*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/...ent/None/src/AppNamePlaceholder/Models.fs → src/content/DotLiquid/src/AppName/Models.fs b/...ent/None/src/AppNamePlaceholder/Models.fs → src/content/DotLiquid/src/AppName/Models.fs
@@ -1,4 +1,4 @@
-namespace AppNamePlaceholder.Models
+namespace AppName.Models
 
 [<CLIMutable>]
 type Message =

diff --git a/...tLiquid/src/AppNamePlaceholder/Program.fs → src/content/DotLiquid/src/AppName/Program.fs b/...tLiquid/src/AppNamePlaceholder/Program.fs → src/content/DotLiquid/src/AppName/Program.fs
@@ -1,4 +1,4 @@
-module AppNamePlaceholder.App
+module AppName.App
 
 open System
 open System.IO
@@ -10,7 +10,7 @@ open Microsoft.Extensions.Logging
 open Microsoft.Extensions.DependencyInjection
 open Giraffe
 open DotLiquid
-open AppNamePlaceholder.Models
+open AppName.Models
 
 // ---------------------------------
 // Web app

diff --git a/...d/src/AppNamePlaceholder/Views/Index.html → ...nt/DotLiquid/src/AppName/Views/Index.html b/...d/src/AppNamePlaceholder/Views/Index.html → ...nt/DotLiquid/src/AppName/Views/Index.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>AppNamePlaceholder</title>
+    <title>AppName</title>
     <link rel="stylesheet" type="text/css" href="/main.css">
 </head>
 <body>
-    <h1>AppNamePlaceholder</h1>
+    <h1>AppName</h1>
     <p>
         {{ text }}
     </p>

diff --git a/...d/src/AppNamePlaceholder/WebRoot/main.css → ...nt/DotLiquid/src/AppName/WebRoot/main.css b/...d/src/AppNamePlaceholder/WebRoot/main.css → ...nt/DotLiquid/src/AppName/WebRoot/main.css
diff --git a/...d/src/AppNamePlaceholder/paket.references → ...nt/DotLiquid/src/AppName/paket.references b/...d/src/AppNamePlaceholder/paket.references → ...nt/DotLiquid/src/AppName/paket.references
diff --git a/...tLiquid/src/AppNamePlaceholder/web.config → src/content/DotLiquid/src/AppName/web.config b/...tLiquid/src/AppNamePlaceholder/web.config → src/content/DotLiquid/src/AppName/web.config
@@ -4,6 +4,6 @@
     <handlers>
       <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
     </handlers>
-    <aspNetCore processPath="dotnet" arguments="AppNamePlaceholder.dll" stdoutLogEnabled="false" stdoutLogFile="logs/stdout" />
+    <aspNetCore processPath="dotnet" arguments="AppName.dll" stdoutLogEnabled="false" stdoutLogFile="logs/stdout" />
   </system.webServer>
 </configuration>
diff --git a/...der.Tests/AppNamePlaceholder.Tests.fsproj → .../tests/AppName.Tests/AppName.Tests.fsproj b/...der.Tests/AppNamePlaceholder.Tests.fsproj → .../tests/AppName.Tests/AppName.Tests.fsproj
@@ -2,20 +2,22 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
-
   <ItemGroup Condition="'$(UsePaket)' == false OR '$(UsePaket)' == ''">
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.*" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.*" />
     <PackageReference Include="xunit" Version="2.4.*" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.*" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../../src/AppNamePlaceholder/AppNamePlaceholder.fsproj" />
+    <ProjectReference Include="../../src/AppName/AppName.fsproj" />
   </ItemGroup>
 
   <ItemGroup>
     <Compile Include="Tests.fs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Condition="'$(UsePaket)' == true" Include="paket.references" />
+  </ItemGroup>
   <Import Condition="'$(UsePaket)' == true" Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/...d/tests/AppNamePlaceholder.Tests/Tests.fs → ...nt/DotLiquid/tests/AppName.Tests/Tests.fs b/...d/tests/AppNamePlaceholder.Tests/Tests.fs → ...nt/DotLiquid/tests/AppName.Tests/Tests.fs
@@ -17,8 +17,8 @@ open Microsoft.Extensions.DependencyInjection
 let createHost() =
     WebHostBuilder()
         .UseContentRoot(Directory.GetCurrentDirectory())
-        .Configure(Action<IApplicationBuilder> AppNamePlaceholder.App.configureApp)
-        .ConfigureServices(Action<IServiceCollection> AppNamePlaceholder.App.configureServices)
+        .Configure(Action<IApplicationBuilder> AppName.App.configureApp)
+        .ConfigureServices(Action<IServiceCollection> AppName.App.configureServices)
 
 let runTask task =
     task

diff --git a/...AppNamePlaceholder.Tests/paket.references → ...quid/tests/AppName.Tests/paket.references b/...AppNamePlaceholder.Tests/paket.references → ...quid/tests/AppName.Tests/paket.references
diff --git a/...NamePlaceholder/AppNamePlaceholder.fsproj → ...ontent/Giraffe/src/AppName/AppName.fsproj b/...NamePlaceholder/AppNamePlaceholder.fsproj → ...ontent/Giraffe/src/AppName/AppName.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AssemblyName>AppNamePlaceholder.App</AssemblyName>
+    <AssemblyName>AppName.App</AssemblyName>
     <EnableDefaultContentItems>false</EnableDefaultContentItems>
   </PropertyGroup>
 
@@ -17,6 +17,7 @@
 
   <ItemGroup>
     <None Include="web.config" CopyToOutputDirectory="PreserveNewest" />
+    <None Condition="'$(UsePaket)' == true" Include="paket.references" />
     <Content Include="WebRoot\**\*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/...Giraffe/src/AppNamePlaceholder/Program.fs → src/content/Giraffe/src/AppName/Program.fs b/...Giraffe/src/AppNamePlaceholder/Program.fs → src/content/Giraffe/src/AppName/Program.fs
@@ -1,4 +1,4 @@
-module AppNamePlaceholder.App
+module AppName.App
 
 open System
 open System.IO
@@ -29,7 +29,7 @@ module Views =
     let layout (content: XmlNode list) =
         html [] [
             head [] [
-                title []  [ encodedText "AppNamePlaceholder" ]
+                title []  [ encodedText "AppName" ]
                 link [ _rel  "stylesheet"
                        _type "text/css"
                        _href "/main.css" ]
@@ -38,7 +38,7 @@ module Views =
         ]
 
     let partial () =
-        h1 [] [ encodedText "AppNamePlaceholder" ]
+        h1 [] [ encodedText "AppName" ]
 
     let index (model : Message) =
         [

diff --git a/...e/src/AppNamePlaceholder/WebRoot/main.css → ...tent/Giraffe/src/AppName/WebRoot/main.css b/...e/src/AppNamePlaceholder/WebRoot/main.css → ...tent/Giraffe/src/AppName/WebRoot/main.css
diff --git a/...e/src/AppNamePlaceholder/paket.references → ...tent/Giraffe/src/AppName/paket.references b/...e/src/AppNamePlaceholder/paket.references → ...tent/Giraffe/src/AppName/paket.references
diff --git a/...Giraffe/src/AppNamePlaceholder/web.config → src/content/Giraffe/src/AppName/web.config b/...Giraffe/src/AppNamePlaceholder/web.config → src/content/Giraffe/src/AppName/web.config
@@ -4,6 +4,6 @@
     <handlers>
       <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
     </handlers>
-    <aspNetCore processPath="dotnet" arguments="AppNamePlaceholder.dll" stdoutLogEnabled="false" stdoutLogFile="logs/stdout" />
+    <aspNetCore processPath="dotnet" arguments="AppName.dll" stdoutLogEnabled="false" stdoutLogFile="logs/stdout" />
   </system.webServer>
 </configuration>
diff --git a/...der.Tests/AppNamePlaceholder.Tests.fsproj → .../tests/AppName.Tests/AppName.Tests.fsproj b/...der.Tests/AppNamePlaceholder.Tests.fsproj → .../tests/AppName.Tests/AppName.Tests.fsproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
-
   <ItemGroup Condition="'$(UsePaket)' == false OR '$(UsePaket)' == ''">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.*" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.*" />
@@ -11,11 +10,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../../src/AppNamePlaceholder/AppNamePlaceholder.fsproj" />
+    <ProjectReference Include="../../src/AppName/AppName.fsproj" />
   </ItemGroup>
 
   <ItemGroup>
     <Compile Include="Tests.fs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Condition="'$(UsePaket)' == true" Include="paket.references" />
+  </ItemGroup>
   <Import Condition="'$(UsePaket)' == true" Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/...r/tests/AppNamePlaceholder.Tests/Tests.fs → ...tent/Giraffe/tests/AppName.Tests/Tests.fs b/...r/tests/AppNamePlaceholder.Tests/Tests.fs → ...tent/Giraffe/tests/AppName.Tests/Tests.fs
@@ -17,8 +17,8 @@ open Microsoft.Extensions.DependencyInjection
 let createHost() =
     WebHostBuilder()
         .UseContentRoot(Directory.GetCurrentDirectory())
-        .Configure(Action<IApplicationBuilder> AppNamePlaceholder.App.configureApp)
-        .ConfigureServices(Action<IServiceCollection> AppNamePlaceholder.App.configureServices)
+        .Configure(Action<IApplicationBuilder> AppName.App.configureApp)
+        .ConfigureServices(Action<IServiceCollection> AppName.App.configureServices)
 
 let runTask task =
     task

diff --git a/...NamePlaceholder/AppNamePlaceholder.fsproj → src/content/None/src/AppName/AppName.fsproj b/...NamePlaceholder/AppNamePlaceholder.fsproj → src/content/None/src/AppName/AppName.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AssemblyName>AppNamePlaceholder.App</AssemblyName>
+    <AssemblyName>AppName.App</AssemblyName>
     <EnableDefaultContentItems>false</EnableDefaultContentItems>
   </PropertyGroup>
 
@@ -19,6 +19,7 @@
 
   <ItemGroup>
     <None Include="web.config" CopyToOutputDirectory="PreserveNewest" />
+    <None Condition="'$(UsePaket)' == true" Include="paket.references" />
   </ItemGroup>
 
   <Import Condition="'$(UsePaket)' == true" Project="..\..\.paket\Paket.Restore.targets" />

diff --git a/...ne/src/AppNamePlaceholder/HttpHandlers.fs → src/content/None/src/AppName/HttpHandlers.fs b/...ne/src/AppNamePlaceholder/HttpHandlers.fs → src/content/None/src/AppName/HttpHandlers.fs
@@ -1,11 +1,11 @@
-namespace AppNamePlaceholder
+namespace AppName
 
 module HttpHandlers =
 
     open Microsoft.AspNetCore.Http
     open FSharp.Control.Tasks.V2.ContextInsensitive
     open Giraffe
-    open AppNamePlaceholder.Models
+    open AppName.Models
 
     let handleGetHello =
         fun (next : HttpFunc) (ctx : HttpContext) ->

diff --git a/...otLiquid/src/AppNamePlaceholder/Models.fs → src/content/None/src/AppName/Models.fs b/...otLiquid/src/AppNamePlaceholder/Models.fs → src/content/None/src/AppName/Models.fs
@@ -1,4 +1,4 @@
-namespace AppNamePlaceholder.Models
+namespace AppName.Models
 
 [<CLIMutable>]
 type Message =