diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/vs-2017.3.host.json b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/vs-2017.3.host.json
new file mode 100644
index 0000000000..ebac4f6f55
--- /dev/null
+++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/vs-2017.3.host.json
@@ -0,0 +1,30 @@
+{
+  "$schema": "http://json.schemastore.org/vs-2017.3.host",
+  "name": {
+    "text": "Blazor (ASP.NET Core hosted)",
+    "id": "1050"
+  },
+  "description": {
+    "text": "A project template for creating a Blazor application that runs on WebAssembly and is hosted on an ASP.NET Core server.",
+    "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}",
+    "id": "1051"
+  },
+  "order": 610,
+  "icon": "icon.png",
+  "learnMoreLink": "https://github.com/aspnet/blazor",
+  "uiFilters": [
+    "oneaspnet"
+  ],
+  "additionalWizardParameters": {
+    "$isMultiProjectTemplate$": "true"
+  },
+  "symbolInfo": [
+    {
+      "id": "Hosted",
+      "name": {
+        "text": "_Hosted"
+      },
+      "isVisible": "true"
+    }
+  ]
+}
diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/NuGet.Config b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/NuGet.Config
new file mode 100644
index 0000000000..9b9b94c0a9
--- /dev/null
+++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/NuGet.Config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <clear />
+        <add key="MyBuildOfAspNetCore" value="C:\dev\cont\AspNetCore\artifacts\packages\Release\Shipping\" />
+        <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
+    </packageSources>
+</configuration>
diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/_Imports.razor b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/_Imports.razor
new file mode 100644
index 0000000000..5fda72156f
--- /dev/null
+++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Client/_Imports.razor
@@ -0,0 +1,12 @@
+@using System.Net.Http
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Layouts
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.JSInterop
+@*#if (!Hosted)
+@using BlazorHosted_CSharp
+@using BlazorHosted_CSharp.Shared
+#else
+@using BlazorHosted_CSharp.Client
+@using BlazorHosted_CSharp.Client.Shared
+#endif*@
diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Server/NuGet.Config b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Server/NuGet.Config
new file mode 100644
index 0000000000..9b9b94c0a9
--- /dev/null
+++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Server/NuGet.Config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <clear />
+        <add key="MyBuildOfAspNetCore" value="C:\dev\cont\AspNetCore\artifacts\packages\Release\Shipping\" />
+        <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
+    </packageSources>
+</configuration>
diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Shared/NuGet.Config b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Shared/NuGet.Config
new file mode 100644
index 0000000000..9b9b94c0a9
--- /dev/null
+++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/Shared/NuGet.Config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <clear />
+        <add key="MyBuildOfAspNetCore" value="C:\dev\cont\AspNetCore\artifacts\packages\Release\Shipping\" />
+        <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
+    </packageSources>
+</configuration>
diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/BlazorWasm-CSharp.Client.csproj b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/BlazorWasm-CSharp.Client.csproj
index efb9171c74..73fa0df28d 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/BlazorWasm-CSharp.Client.csproj
+++ b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/BlazorWasm-CSharp.Client.csproj
@@ -12,8 +12,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="$(TemplateBlazorPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" />
   </ItemGroup>
-
   <!--#if Hosted -->
   <ItemGroup>
     <ProjectReference Include="..\Shared\BlazorWasm-CSharp.Shared.csproj" />
diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Pages/Counter.razor b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Pages/Counter.razor
index 59c0d242c3..1360f9eb12 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Pages/Counter.razor
+++ b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Pages/Counter.razor
@@ -4,7 +4,7 @@
 
 <p>Current count: @currentCount</p>
 
-<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
+<button class="btn btn-primary" @onclick="@IncrementCount">Click me</button>
 
 @code {
     int currentCount = 0;
diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Shared/NavMenu.razor b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Shared/NavMenu.razor
index 6faa573fbf..a773afbc9e 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Shared/NavMenu.razor
+++ b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Shared/NavMenu.razor
@@ -5,7 +5,7 @@
     </button>
 </div>
 
-<div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
+<div class="@NavMenuCssClass" @onclick="@ToggleNavMenu">
     <ul class="nav flex-column">
         <li class="nav-item px-3">
             <NavLink class="nav-link" href="" Match="NavLinkMatch.All">