huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Ryan Brandenburg 2018-09-10 15:14:41 -07:00
parent 6d25b826a2 14b1432481
commit c5f1d5a3eb
5 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/Minify-Scripts.ps1
View File

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

2
scripts/Run-Starterweb-Locally.ps1
View File

@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
. $PSScriptRoot\Custom-Hive.ps1 . $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

BIN
src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/css/site.min.css vendored
View File

Binary file not shown.

BIN
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/css/site.min.css vendored
View File

Binary file not shown.

BIN
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/css/site.min.css vendored
View File

Binary file not shown.