From 8a082a299d59a0b53b9b6e0a07a6fbabf7bf6e2c Mon Sep 17 00:00:00 2001
From: Demis Bellot <demis.bellot@gmail.com>
Date: Mon, 2 Jul 2018 02:03:43 -0400
Subject: [PATCH] Upgrade to .NET Core 2.1 + latest templates syntax

---
 MyApp.Tests/MyApp.Tests.csproj |  8 ++++----
 MyApp/MyApp.csproj             |  8 ++------
 MyApp/wwwroot/_layout.html     |  2 +-
 MyApp/wwwroot/index.html       | 12 +++++++-----
 MyApp/wwwroot/menu.html        |  6 +++++-
 README.md                      |  2 +-
 6 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/MyApp.Tests/MyApp.Tests.csproj b/MyApp.Tests/MyApp.Tests.csproj
index 48a48e7..8295941 100644
--- a/MyApp.Tests/MyApp.Tests.csproj
+++ b/MyApp.Tests/MyApp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <DebugType>portable</DebugType>
     <OutputType>Library</OutputType>
   </PropertyGroup>
@@ -10,9 +10,9 @@
     <ProjectReference Include="..\MyApp.ServiceInterface\MyApp.ServiceInterface.csproj" />
     <ProjectReference Include="..\MyApp.ServiceModel\MyApp.ServiceModel.csproj" />
 
-    <PackageReference Include="NUnit" Version="3.9.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="NUnit" Version="3.10.*" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.*" />
     <PackageReference Include="ServiceStack" Version="5.*" />
     <PackageReference Include="ServiceStack.Kestrel" Version="5.*" />
   </ItemGroup>
diff --git a/MyApp/MyApp.csproj b/MyApp/MyApp.csproj
index d02ea1a..2e98d53 100644
--- a/MyApp/MyApp.csproj
+++ b/MyApp/MyApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.*" />
     <PackageReference Include="ServiceStack" Version="5.*" />
   </ItemGroup>
 
@@ -17,9 +17,5 @@
     <ProjectReference Include="..\MyApp.ServiceInterface\MyApp.ServiceInterface.csproj" />
     <ProjectReference Include="..\MyApp.ServiceModel\MyApp.ServiceModel.csproj" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
-  </ItemGroup>
 
 </Project>
diff --git a/MyApp/wwwroot/_layout.html b/MyApp/wwwroot/_layout.html
index 023539d..e172296 100644
--- a/MyApp/wwwroot/_layout.html
+++ b/MyApp/wwwroot/_layout.html
@@ -7,7 +7,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    {{ ifDebug | select: <script>{ '/js/hot-loader.js' | includeFile }</script> }}
+    {{#if debug}}<script>{{ '/js/hot-loader.js' | includeFile }}</script>{{/if}}
     <link rel="stylesheet" href="/assets/css/bootstrap.css">
     <link rel="stylesheet" href="/assets/css/default.css">
 </head>
diff --git a/MyApp/wwwroot/index.html b/MyApp/wwwroot/index.html
index 31764b5..8f9a69e 100644
--- a/MyApp/wwwroot/index.html
+++ b/MyApp/wwwroot/index.html
@@ -1,13 +1,13 @@
 <!--
-title: Bootstrap Templates Starter
+title: Bootstrap Templates
 -->
 
 <p class="lead">
   Complete with page layout, menu partial and responsive navigation!
 </p>
 <ul class="list-unstyled">
-  <li>Bootstrap 4.0.0-beta.2</li>
-  <li>jQuery 3.2.1</li>
+  <li>Bootstrap 4.0.0</li>
+  <li>jQuery 3.3.1</li>
 </ul>
 
 <div class="container" style="padding:60px 0 0 250px">
@@ -25,7 +25,8 @@ <h4 id="result"></h4>
   </div>
 </div>
 
-{{ `<script>
+{{#raw appendTo scripts}}
+<script>
 $('#Name').keyup(function () {
   var name = $('#Name').val();
   if (name) {
@@ -36,4 +37,5 @@ <h4 id="result"></h4>
     $('#result').html('');
   }
 });
-</script>` | appendTo: scripts }}
\ No newline at end of file
+</script>
+{{/raw}}
\ No newline at end of file
diff --git a/MyApp/wwwroot/menu.html b/MyApp/wwwroot/menu.html
index 99da1bd..a7788d0 100644
--- a/MyApp/wwwroot/menu.html
+++ b/MyApp/wwwroot/menu.html
@@ -6,6 +6,10 @@
 
 <div class="collapse navbar-collapse" id="navbarResponsive">
     <ul class="navbar-nav ml-auto">
-        {{ links | select: <li class="nav-item { 'active' | ifMatchesPathInfo(it.Key) }"><a class="nav-link" href="{ it.Key }">{ it.Value }</a></li> }}
+        {{#each links}}
+        <li {{ {active: matchesPathInfo(Key)} | htmlClass }}>
+            <a class="nav-link" href="{{Key}}">{{Value}}</a>
+        </li>
+        {{/each}}
     </ul>
 </div>
diff --git a/README.md b/README.md
index 3b9271f..054232c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # templates
 
-.NET Core 2.0 ServiceStack Templates Bootstrap Website
+.NET Core 2.1 ServiceStack Templates Bootstrap Website
 
 [![](https://raw.githubusercontent.com/ServiceStack/Assets/master/csharp-templates/templates.png)](http://templates.web-templates.io/)