From 7308a9311fd3b09734ccbbe0ffb42d4ef172948b Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 9 Sep 2018 12:32:34 -0700 Subject: [PATCH 1/2] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 66 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index d22300d8cf..63eef91469 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,43 +4,43 @@ 0.9.9 - 2.2.0-preview2-35143 - 2.2.0-preview1-20180821.1 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 + 2.2.0-preview3-35202 + 2.2.0-preview1-20180907.8 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 15.6.82 15.6.82 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 2.0.9 - 2.1.2 - 2.2.0-preview1-26618-02 - 2.2.0-preview2-35143 + 2.1.3 + 2.2.0-preview2-26905-02 + 2.2.0-preview3-35202 15.6.1 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 2.0.3 3.12.1 17.17134.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index ad704918df..312f82f9a5 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180821.1 -commithash:c8d0cc52cd1abb697be24e288ffd54f8fae8bf17 +version:2.2.0-preview1-20180907.8 +commithash:078918eb5c1f176ee1da351c584fb4a4d7491aa0 From 14b1432481d67a58150c5a8e3e211bbb96c80cac Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 7 Sep 2018 13:34:26 -0700 Subject: [PATCH 2/2] Fix min.css files --- scripts/Minify-Scripts.ps1 | 4 ++-- scripts/Run-Starterweb-Locally.ps1 | 2 +- .../wwwroot/css/site.min.css | Bin 1976 -> 994 bytes .../StarterWeb-CSharp/wwwroot/css/site.min.css | Bin 1976 -> 994 bytes .../StarterWeb-FSharp/wwwroot/css/site.min.css | Bin 1976 -> 530 bytes 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/Minify-Scripts.ps1 b/scripts/Minify-Scripts.ps1 index 6d5b3d2b55..f46fbe0a88 100644 --- a/scripts/Minify-Scripts.ps1 +++ b/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 } } diff --git a/scripts/Run-Starterweb-Locally.ps1 b/scripts/Run-Starterweb-Locally.ps1 index cda01aa425..574dada6fd 100644 --- a/scripts/Run-Starterweb-Locally.ps1 +++ b/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 diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/css/site.min.css b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/css/site.min.css index 5ec7494cc5350b4c068d5bb7ab26bcb80534c819..e4a232a8fc231060c0160029f6bee3108ac2aaeb 100644 GIT binary patch literal 994 zcmb7@-A=+l5QWdRiSIySOdzoYjDTrxd=-8wG(sV@Qk3xO>NnGZ6d}ftU1n!z&YV3n z{rViLtyDv;HDb>c@SkC&nrN#+GbPFus2G+BSWWDN*nm0- zz8sWL1NHUj(Jj#a!tGbMI}{mJY-3j>=d=RhoHtb0^BQnm!rH1gbOW>AVf{ulq@3Rp z-lw?7cmF}(xK1;itjTDWiWj3r!;L4y%pTQw!ZkdaJmn z;MhdiOswz)?4<@{y;J{u|H`V7Yn752(3u$Brrx2@`)HmFE3eIiq1z7Dm i$EW{iD)(IMo4EXS6;vBiEjm$W&+M{(`-q*cb)|3IGr1E0 literal 1976 zcmai#-EP!C426A-#5?2xx`-RNK&V2h#5EG)t`f>7*)}vy!v3{=dEk8Z%qD3URZ)`p zv5)OzkLT~7xAw+<*v?A3vBo}GVZDuZum5MOY|!Xld%e|mX~^mG*XeF0@t(y|#m9pt7`$x2v$vIASPIEOmcy%BHY@E7$#*bY&6idi zdlYu(Qeh3gkt#fvF8Ktrj91P^DNJHTs!iWMp|jGvXQec{XZDtR_zvG;FT5+HgVdel zGS2&5;t+3dTn76w8^l+jbdq1j7<+Z%u6Eo()j}OaUPsSeSR5TW_zc#`)}w1Nr*2wV z4YpW0IMUMQsMWPcvP(Q|HOF7-bFE!4!WULX;pSc9h2e+?i^FM*t&n3xHY!QB(noq; z%~1u^F7o{6Sz{jf_y+=vKWJ2@jAt)GJ3PvmbN`SVlFoA<$Zn~V3dTIsXxwQpV%eWE zoTKBvtP~JfeaS1Uldp3II6#TzN{|;0r z6SvaJ&u`Cfr5LAE6rJZ>XPRTLR23Oz`RDZR6j3Lyo+Pu84bB(5Nq>Z;G033Lo6AUlk3#Z6{uO?ZD8l#q6i#Sf~239PDB1AO1B$b^rhX diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/css/site.min.css b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/css/site.min.css index 5ec7494cc5350b4c068d5bb7ab26bcb80534c819..e4a232a8fc231060c0160029f6bee3108ac2aaeb 100644 GIT binary patch literal 994 zcmb7@-A=+l5QWdRiSIySOdzoYjDTrxd=-8wG(sV@Qk3xO>NnGZ6d}ftU1n!z&YV3n z{rViLtyDv;HDb>c@SkC&nrN#+GbPFus2G+BSWWDN*nm0- zz8sWL1NHUj(Jj#a!tGbMI}{mJY-3j>=d=RhoHtb0^BQnm!rH1gbOW>AVf{ulq@3Rp z-lw?7cmF}(xK1;itjTDWiWj3r!;L4y%pTQw!ZkdaJmn z;MhdiOswz)?4<@{y;J{u|H`V7Yn752(3u$Brrx2@`)HmFE3eIiq1z7Dm i$EW{iD)(IMo4EXS6;vBiEjm$W&+M{(`-q*cb)|3IGr1E0 literal 1976 zcmai#-EP!C426A-#5?2xx`-RNK&V2h#5EG)t`f>7*)}vy!v3{=dEk8Z%qD3URZ)`p zv5)OzkLT~7xAw+<*v?A3vBo}GVZDuZum5MOY|!Xld%e|mX~^mG*XeF0@t(y|#m9pt7`$x2v$vIASPIEOmcy%BHY@E7$#*bY&6idi zdlYu(Qeh3gkt#fvF8Ktrj91P^DNJHTs!iWMp|jGvXQec{XZDtR_zvG;FT5+HgVdel zGS2&5;t+3dTn76w8^l+jbdq1j7<+Z%u6Eo()j}OaUPsSeSR5TW_zc#`)}w1Nr*2wV z4YpW0IMUMQsMWPcvP(Q|HOF7-bFE!4!WULX;pSc9h2e+?i^FM*t&n3xHY!QB(noq; z%~1u^F7o{6Sz{jf_y+=vKWJ2@jAt)GJ3PvmbN`SVlFoA<$Zn~V3dTIsXxwQpV%eWE zoTKBvtP~JfeaS1Uldp3II6#TzN{|;0r z6SvaJ&u`Cfr5LAE6rJZ>XPRTLR23Oz`RDZR6j3Lyo+Pu84bB(5Nq>Z;G033Lo6AUlk3#Z6{uO?ZD8l#q6i#Sf~239PDB1AO1B$b^rhX diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/css/site.min.css b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/css/site.min.css index 5ec7494cc5350b4c068d5bb7ab26bcb80534c819..cb64f0e6315e97da6237a739bdec9aacb90d0b1b 100644 GIT binary patch literal 530 zcmaix-D<)>5QWdR(02%8!CpkPv92fB=+dPsX?V6b9kx2IdhGuThxyUVo*+>Ab+#YV1;=zxH;!v zpMf59-6b#r$15U*v*}7|r;?n{_;`}^^rSBRM(@0KwIIs}m=t_&^A6eAEgo}tnQcBn yrGe|YhmA$dQ_+dk2b1s@;xmnj#+umH?oj`KBdxhKFbdRmq^N8=87cO7*)}vy!v3{=dEk8Z%qD3URZ)`p zv5)OzkLT~7xAw+<*v?A3vBo}GVZDuZum5MOY|!Xld%e|mX~^mG*XeF0@t(y|#m9pt7`$x2v$vIASPIEOmcy%BHY@E7$#*bY&6idi zdlYu(Qeh3gkt#fvF8Ktrj91P^DNJHTs!iWMp|jGvXQec{XZDtR_zvG;FT5+HgVdel zGS2&5;t+3dTn76w8^l+jbdq1j7<+Z%u6Eo()j}OaUPsSeSR5TW_zc#`)}w1Nr*2wV z4YpW0IMUMQsMWPcvP(Q|HOF7-bFE!4!WULX;pSc9h2e+?i^FM*t&n3xHY!QB(noq; z%~1u^F7o{6Sz{jf_y+=vKWJ2@jAt)GJ3PvmbN`SVlFoA<$Zn~V3dTIsXxwQpV%eWE zoTKBvtP~JfeaS1Uldp3II6#TzN{|;0r z6SvaJ&u`Cfr5LAE6rJZ>XPRTLR23Oz`RDZR6j3Lyo+Pu84bB(5Nq>Z;G033Lo6AUlk3#Z6{uO?ZD8l#q6i#Sf~239PDB1AO1B$b^rhX