Merge pull request #805 from dotnet-maestro-bot/merge/release/2.2-to-master

[automated] Merge branch 'release/2.2' => 'master'

Author: ryanbrandenburg

.vscode/settings.json

@@ -5,5 +5,7 @@
   },
   "[json]": {
     "editor.tabSize": 2
-  }
+  },
+  "javascript.format.insertSpaceBeforeFunctionParenthesis": true,
+  "javascript.format.insertSpaceAfterConstructor": true
 }

scripts/Run-Angular-Locally.ps1

@@ -7,6 +7,6 @@ param()
 Set-StrictMode -Version 2
 $ErrorActionPreference = 'Stop'
 
-. $PSScriptRoot\Custom-Hive.ps1
+. $PSScriptRoot\Test-Template.ps1
 
 Test-Template "angular" "angular" "Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0.0-alpha1.nupkg" $true

scripts/Run-Razor-Locally.ps1

@@ -4,6 +4,6 @@
 [CmdletBinding(PositionalBinding = $false)]
 param()
 
-. $PSScriptRoot\Custom-Hive.ps1
+. $PSScriptRoot\Test-Template.ps1
 
 Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.3.0.3.0.0-alpha1.nupkg" $false

scripts/Run-React-Locally.ps1

@@ -7,6 +7,6 @@ param()
 Set-StrictMode -Version 2
 $ErrorActionPreference = 'Stop'
 
-. $PSScriptRoot\Custom-Hive.ps1
+. $PSScriptRoot\Test-Template.ps1
 
 Test-Template "react" "react" "Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0.0-alpha1.nupkg" $true

scripts/Run-ReactRedux-Locally.ps1

@@ -7,6 +7,6 @@ param()
 Set-StrictMode -Version 2
 $ErrorActionPreference = 'Stop'
 
-. $PSScriptRoot\Custom-Hive.ps1
+. $PSScriptRoot\Test-Template.ps1
 
 Test-Template "reactredux" "reactredux" "Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0.0-alpha1.nupkg" $true

scripts/Run-Starterweb-Locally.ps1

@@ -7,6 +7,6 @@ param()
 Set-StrictMode -Version 2
 $ErrorActionPreference = 'Stop'
 
-. $PSScriptRoot\Custom-Hive.ps1
+. $PSScriptRoot\Test-Template.ps1
 
 Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.3.0.3.0.0-alpha1.nupkg" $false

scripts/Custom-Hive.ps1 renamed to scripts/Test-Template.ps1

@@ -1,11 +1,7 @@
-$customHive = "$PSScriptRoot/CustomHive"
-
 function Test-Template($templateName, $templateArgs, $templateNupkg, $isSPA) {
     $tmpDir = "$PSScriptRoot/$templateName"
     Remove-Item -Path $tmpDir -Recurse -ErrorAction Ignore
 
-    Create-Hive
-
     & "$PSScriptRoot/../build.cmd" /t:Package
     Run-DotnetNew "--install", "$PSScriptRoot/../artifacts/build/$templateNupkg"
 
@@ -35,31 +31,11 @@ function Test-Template($templateName, $templateArgs, $templateNupkg, $isSPA) {
     }
     finally {
         Pop-Location
+        Run-DotnetNew "--debug:reinit"
     }
 }
 
-function Create-Hive {
-    Write-Host "Creating custom hive"
-    Remove-Item -Path $customHive -Force -Recurse -ErrorAction Ignore
-    New-Item -Path $customHive -ItemType Directory | out-null
-    Clean-Hive
-}
-
-function Clean-Hive() {
-    $packageArray = Run-DotnetNew "--uninstall"
-    $packageStr = $packageArray -join [Environment]::NewLine
-    $packagesStr = ($packageStr -split "Currently installed items:")[1]
-    $packagesStr = $packagesStr.Trim()
-    $packages = $packagesStr -split [Environment]::NewLine
-
-    foreach ($package in $packages) {
-        $package = $package.Trim()
-        Run-DotnetNew "--uninstall", "$package" | out-null
-    }
-    Run-DotnetNew "--uninstall" | out-null
-}
-
 function Run-DotnetNew($arguments) {
-    $expression = "dotnet new $arguments --debug:custom-hive $customHive"
+    $expression = "dotnet new $arguments"
     Invoke-Expression $expression
 }

src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml

@@ -34,10 +34,10 @@
     #endif*@
                     <ul class="navbar-nav flex-grow-1">
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-page="/Index">Page1</a>
+                            <a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-page="/Index">Page2</a>
+                            <a class="nav-link text-dark" asp-area="" asp-page="/Privacy">Privacy</a>
                         </li>
                     </ul>
                 </div>

src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml

@@ -34,10 +34,10 @@
     #endif*@
                     <ul class="navbar-nav flex-grow-1">
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page1</a>
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page2</a>
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
                         </li>
                     </ul>
                 </div>

src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml

@@ -29,10 +29,10 @@
                 <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
                     <ul class="navbar-nav flex-grow-1">
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page1</a>
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page2</a>
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
                         </li>
                     </ul>
                 </div>