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

Experience review feedback

This commit is contained in:
Ryan Brandenburg 2018-08-06 10:47:22 -07:00
parent 2b273f0f73
commit f868277373
13 changed files with 81 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/Custom-Hive.ps1
View File

@ -33,7 +33,7 @@ function Test-Template($templateName, $templateNupkg, $isSPA)
function Create-Hive { function Create-Hive {
Write-Host "Creating custom hive" Write-Host "Creating custom hive"
Remove-Item -Path $customHive -Force -Recurse Remove-Item -Path $customHive -Force -Recurse -ErrorAction Ignore
New-Item -Path $customHive -ItemType Directory | out-null New-Item -Path $customHive -ItemType Directory | out-null
Clean-Hive Clean-Hive
} }

32
scripts/Custom_Hive.ps1
View File

@ -1,32 +0,0 @@
$customHive = "$PSScriptRoot/CustomHive"
function Create-CustomHive
{
Param()
Remove-Item -Path $customHive -Recurse -ErrorAction Ignore
New-Item -ErrorAction Ignore -Path $customHive -ItemType Directory
Clean-CustomHive
}
function Clean-CustomHive
{
Param()
$uninstallResults = Call-DotnetNew "--uninstall"
Write-Host "uninstallresults: $uninstallResults"
$currently = "Currently installed items:"
$templatePackString = ($uninstallResults -split $currently)
Write-Host "tempPack: $templatePackString"
$templatePackages = $templatePackString.Split([Environment]::NewLine)
foreach($package in $templatePackages)
{
Write-Host $package
#Call-DotnetNew "--uninstall $package"
}
}
function Call-DotnetNew($arguments) {
& "dotnet" new $arguments --debug:custom-hive $customHive
}
Create-CustomHive

8
scripts/Minify-Scripts.ps1
View File

@ -7,7 +7,13 @@ param()
Set-StrictMode -Version 2 Set-StrictMode -Version 2
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
npm install Push-Location $PSScriptRoot
try {
npm install
}
finally {
Pop-Location
}
$projectContentDir = "$PSScriptRoot/../src/Microsoft.DotNet.Web.ProjectTemplates/content" $projectContentDir = "$PSScriptRoot/../src/Microsoft.DotNet.Web.ProjectTemplates/content"

2
src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in
View File

@ -23,7 +23,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''"> <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
<PackageReference Include="Microsoft.AspNetCore.App" /> <PackageReference Include="Microsoft.AspNetCore.App"/>
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" />

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

@ -19,23 +19,31 @@
<body> <body>
<header> <header>
<nav class="mb-3 navbar navbar-expand navbar-light flex-column flex-md-row bg-white border-bottom box-shadow"> <nav class="mb-3 navbar navbar-expand navbar-light flex-column flex-md-row bg-white border-bottom box-shadow">
<a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Company.WebApplication1</a> <div class="container">
<ul class="navbar-nav ml-md-auto"> <a class="navbar-brand" asp-area="" asp-page="/">Company.WebApplication1</a>
<li class="nav-item"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page1</a> aria-expanded="false" aria-label="Toggle navigation">
</li> <span class="navbar-toggler-icon"></span>
<li class="nav-item"> </button>
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page2</a> <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
</li> @*#if (IndividualAuth || OrganizationalAuth)
</ul> <partial name="_LoginPartial" />
@*#if (IndividualAuth || OrganizationalAuth) #elseif (WindowsAuth)
<partial name="_LoginPartial" /> <p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p>
#elseif (WindowsAuth) #endif*@
<p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p> <ul class="navbar-nav ml-md-auto">
#endif*@ <li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page1</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page2</a>
</li>
</ul>
</div>
</div>
</nav> </nav>
</header> </header>
<div class="container-fluid"> <div class="container">
<partial name="_CookieConsentPartial" /> <partial name="_CookieConsentPartial" />
<main role="main" class="pb-1"> <main role="main" class="pb-1">
@RenderBody() @RenderBody()

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

@ -1,4 +1,4 @@
/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification\ /* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
for details on configuring this project to bundle and minify static web assets. */ for details on configuring this project to bundle and minify static web assets. */
a.navbar-brand { a.navbar-brand {
@ -18,14 +18,6 @@ html {
} }
} }
.container {
max-width: 960px;
}
.pricing-header {
max-width: 700px;
}
.border-top { .border-top {
border-top: 1px solid #e5e5e5; border-top: 1px solid #e5e5e5;
} }
@ -57,7 +49,6 @@ body {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
overflow: scroll;
white-space: nowrap; white-space: nowrap;
/* Set the fixed height of the footer here */ /* Set the fixed height of the footer here */
height: 60px; height: 60px;

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

Binary file not shown.

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

@ -19,29 +19,31 @@
<body> <body>
<header> <header>
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3"> <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
<a class="navbar-brand" href="~/">Company.WebApplication1</a> <div class="container">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent" <a class="navbar-brand" href="~/">Company.WebApplication1</a>
aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
<span class="navbar-toggler-icon"></span> aria-expanded="false" aria-label="Toggle navigation">
</button> <span class="navbar-toggler-icon"></span>
<div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse"> </button>
@*#if (IndividualAuth || OrganizationalAuth) <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
<partial name="_LoginPartial" /> @*#if (IndividualAuth || OrganizationalAuth)
#elseif (WindowsAuth) <partial name="_LoginPartial" />
<p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p> #elseif (WindowsAuth)
#endif*@ <p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p>
<ul class="navbar-nav flex-grow-1"> #endif*@
<li class="nav-item"> <ul class="navbar-nav flex-grow-1">
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page1</a> <li class="nav-item">
</li> <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page1</a>
<li class="nav-item"> </li>
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page2</a> <li class="nav-item">
</li> <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page2</a>
</ul> </li>
</ul>
</div>
</div> </div>
</nav> </nav>
</header> </header>
<div class="container-fluid"> <div class="container">
<partial name="_CookieConsentPartial" /> <partial name="_CookieConsentPartial" />
<main role="main" class="pb-1"> <main role="main" class="pb-1">
@RenderBody() @RenderBody()
@ -49,7 +51,9 @@
</div> </div>
<footer class="border-top footer pl-3 text-muted"> <footer class="border-top footer pl-3 text-muted">
&copy; Year - Company.WebApplication1 - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a> <div class="container">
&copy; copyrightYear - Company.WebApplication1 - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
</div>
</footer> </footer>
<environment include="Development"> <environment include="Development">

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

@ -1,4 +1,4 @@
/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification\ /* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
for details on configuring this project to bundle and minify static web assets. */ for details on configuring this project to bundle and minify static web assets. */
a.navbar-brand { a.navbar-brand {
@ -18,14 +18,6 @@ html {
} }
} }
.container {
max-width: 960px;
}
.pricing-header {
max-width: 700px;
}
.border-top { .border-top {
border-top: 1px solid #e5e5e5; border-top: 1px solid #e5e5e5;
} }
@ -57,7 +49,6 @@ body {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
overflow: scroll;
white-space: nowrap; white-space: nowrap;
/* Set the fixed height of the footer here */ /* Set the fixed height of the footer here */
height: 60px; height: 60px;

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

Binary file not shown.

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

@ -1,4 +1,4 @@
/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification /* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
for details on configuring this project to bundle and minify static web assets. */ for details on configuring this project to bundle and minify static web assets. */
body { body {
padding-top: 50px; padding-top: 50px;

2
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/app.component.html
View File

@ -1,6 +1,6 @@
<body> <body>
<app-nav-menu></app-nav-menu> <app-nav-menu></app-nav-menu>
<div class="container-fluid"> <div class="container">
<router-outlet></router-outlet> <router-outlet></router-outlet>
</div> </div>
</body> </body>

39
src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/nav-menu/nav-menu.component.html
View File

@ -1,21 +1,22 @@
<header> <header>
<nav class='navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3'> <nav class='navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3'>
<a class="navbar-brand" href="~/">Company.WebApplication1</a> <a class="navbar-brand" href="~/">Company.WebApplication1</a>
<button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-label="Toggle navigation" [attr.aria-expanded]="isExpanded" (click)="toggle()"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-label="Toggle navigation"
<span class="navbar-toggler-icon"></span> [attr.aria-expanded]="isExpanded" (click)="toggle()">
</button> <span class="navbar-toggler-icon"></span>
<div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse" [ngClass]='{"show": isExpanded}'> </button>
<ul class="navbar-nav flex-grow-1"> <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse" [ngClass]='{"show": isExpanded}'>
<li class="nav-item" [routerLinkActive]='["link-active"]' [routerLinkActiveOptions]='{ exact: true }'> <ul class="navbar-nav flex-grow-1">
<a class="nav-link text-dark" [routerLink]='["/"]'>Home</a> <li class="nav-item" [routerLinkActive]='["link-active"]' [routerLinkActiveOptions]='{ exact: true }'>
</li> <a class="nav-link text-dark" [routerLink]='["/"]'>Home</a>
<li class="nav-item" [routerLinkActive]='["link-active"]'> </li>
<a class="nav-link text-dark" [routerLink]='["/counter"]'>Counter</a> <li class="nav-item" [routerLinkActive]='["link-active"]'>
</li> <a class="nav-link text-dark" [routerLink]='["/counter"]'>Counter</a>
<li class="nav-item" [routerLinkActive]='["link-active"]'> </li>
<a class="nav-link text-dark" [routerLink]='["/fetch-data"]'>Fetch data</a> <li class="nav-item" [routerLinkActive]='["link-active"]'>
</li> <a class="nav-link text-dark" [routerLink]='["/fetch-data"]'>Fetch data</a>
</ul> </li>
</div> </ul>
</nav> </div>
</nav>
</header> </header>