Merge branch 'merge/release/2.2-to-master'

scripts/Minify-Scripts.ps1

@@ -26,13 +26,13 @@ foreach ($contentDir in $contentDirs) {
     $siteCss = Join-Path $cssFolder "site.css"
     $siteMinCss = Join-Path $cssFolder "site.min.css"
     if (Test-Path $siteCss) {
-        npm uglifycss $siteCss > $siteMinCss
+        uglifycss $siteCss > $siteMinCss
     }
 
     $jsFolder = Join-Path $wwwRoot "js"
     $siteJs = Join-Path $jsFolder "site.js"
     $siteMinJs = Join-Path $jsFolder "site.min.js"
     if (Test-Path $siteJs) {
-        npm uglifyjs $siteJs --output $siteMinJs
+        uglifyjs $siteJs --output $siteMinJs
     }
 }

scripts/Run-Starterweb-Locally.ps1

@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Custom-Hive.ps1
 
-Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.2.2.2.2.0-preview2-t000.nupkg" $false
+Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.2.2.2.2.0-preview3-t000.nupkg" $false