From b029f79b4d3356788c37a9ce30cecbe3793dfc7c Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 10 Aug 2018 14:45:12 -0700 Subject: [PATCH 1/4] Import styles in correct order (#668) In the `angular-cli.json` file, the styles.css file should be imported last in the styles section, so the developer can override styles from third party libraries (bootstrap, in this case). --- .../content/Angular-CSharp/ClientApp/angular.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json index fd8a52cf13..cf9991fd59 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json @@ -24,8 +24,8 @@ "src/assets" ], "styles": [ - "src/styles.css", - "node_modules/bootstrap/dist/css/bootstrap.min.css" + "node_modules/bootstrap/dist/css/bootstrap.min.css", + "src/styles.css" ], "scripts": [] }, From 25661213f2f41656a44526b73873584b0f70f288 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 12 Aug 2018 19:33:25 +0000 Subject: [PATCH 2/4] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 60 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 429efbf8ae..9e3e4196ed 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,42 +4,42 @@ 0.9.9 - 2.2.0-preview1-34896 - 2.2.0-preview1-20180731.1 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 + 2.2.0-preview1-34967 + 2.2.0-preview1-20180807.2 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 15.6.82 15.6.82 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34896 + 2.2.0-preview1-34967 15.6.1 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 2.0.3 3.12.1 17.17134.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index c7af2292c7..3fbcc80189 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180731.1 -commithash:29fde58465439f4bb9df40830635ed758e063daf +version:2.2.0-preview1-20180807.2 +commithash:11495dbd236104434e08cb1152fcb58cf2a20923 From 9618a594851fcb31e7f8efbfecc6a526d6c5ed12 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 10 Aug 2018 15:38:02 -0700 Subject: [PATCH 3/4] Add .gitattributes file --- .gitattributes | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..d4ee1cb7f3 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,52 @@ +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain + +*.jpg binary +*.png binary +*.gif binary + +*.cs text=auto diff=csharp +*.vb text=auto +*.resx text=auto +*.c text=auto +*.cpp text=auto +*.cxx text=auto +*.h text=auto +*.hxx text=auto +*.py text=auto +*.rb text=auto +*.java text=auto +*.html text=auto +*.htm text=auto +*.css text=auto +*.scss text=auto +*.sass text=auto +*.less text=auto +*.js text=auto +*.lisp text=auto +*.clj text=auto +*.sql text=auto +*.php text=auto +*.lua text=auto +*.m text=auto +*.asm text=auto +*.erl text=auto +*.fs text=auto +*.fsx text=auto +*.hs text=auto + +*.csproj text=auto +*.vbproj text=auto +*.fsproj text=auto +*.dbproj text=auto +*.sln text=auto eol=crlf + +*.sh eol=lf From a431f8efa1d50e8c40c1e0b680a13400fe3e033c Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 13 Aug 2018 16:21:50 -0700 Subject: [PATCH 4/4] Don't publish too much of ClientApp (#672) * Don't publish too much of ClientApp * Fix scripts and remove extra publish items --- scripts/Custom-Hive.ps1 | 24 ++++++++----------- .../Angular-CSharp.csproj.in | 7 ++---- .../React-CSharp.csproj.in | 5 +--- .../ReactRedux-CSharp.csproj.in | 7 ++---- 4 files changed, 15 insertions(+), 28 deletions(-) diff --git a/scripts/Custom-Hive.ps1 b/scripts/Custom-Hive.ps1 index 5ff80be557..f66bc12714 100644 --- a/scripts/Custom-Hive.ps1 +++ b/scripts/Custom-Hive.ps1 @@ -1,7 +1,6 @@ $customHive = "$PSScriptRoot/CustomHive" -function Test-Template($templateName, $templateNupkg, $isSPA) -{ +function Test-Template($templateName, $templateNupkg, $isSPA) { $tmpDir = "$PSScriptRoot/tmp" Remove-Item -Path $tmpDir -Recurse -ErrorAction Ignore @@ -13,18 +12,15 @@ function Test-Template($templateName, $templateNupkg, $isSPA) New-Item -ErrorAction Ignore -Path $tmpDir -ItemType Directory Push-Location $tmpDir try { - Run-DotnetNew $templateName - if($isSPA) - { - Push-Location "ClientApp" - try { - npm install - } - finally { - Pop-Location - } - } - dotnet run + Run-DotnetNew $templateName, "--no-restore" + $csproj = "$tmpDir/tmp.csproj" + $csprojContent = Get-Content -Path $csproj -Raw + $csprojContent = $csprojContent -replace ('', "`n") + $csprojContent | Set-Content $csproj + + dotnet publish + dotnet run bin\Release\netcoreapp2.2\publish\tmp.dll + } finally { Pop-Location diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in index ef5ac3e904..e95e902c88 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in @@ -28,10 +28,7 @@ - + @@ -54,7 +51,7 @@ - + %(DistFiles.Identity) diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in index 6b0b4825a9..95dc85dbd6 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in @@ -25,10 +25,7 @@ - + diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in index ce38fd44ce..5b6d2ee374 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in @@ -25,10 +25,7 @@ - + @@ -50,7 +47,7 @@ - + %(DistFiles.Identity) PreserveNewest