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

Merge branch 'release/2.1' into dev

This commit is contained in:
Jass Bagga 2018-04-18 09:49:19 -07:00
parent b85aae2348
commit cbc4d0d19c
17 changed files with 9 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json
View File

@ -12,7 +12,6 @@
"precedence": "3000", "precedence": "3000",
"identity": "Microsoft.Web.Empty.CSharp.2.1", "identity": "Microsoft.Web.Empty.CSharp.2.1",
"shortName": "web", "shortName": "web",
"thirdPartyNotices": "https://aka.ms/template-3pn",
"tags": { "tags": {
"language": "C#", "language": "C#",
"type": "project" "type": "project"

1
src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json
View File

@ -11,7 +11,6 @@
"precedence": "3000", "precedence": "3000",
"identity": "Microsoft.Web.Empty.FSharp.2.1", "identity": "Microsoft.Web.Empty.FSharp.2.1",
"shortName": "web", "shortName": "web",
"thirdPartyNotices": "https://aka.ms/template-3pn",
"tags": { "tags": {
"language": "F#", "language": "F#",
"type": "project" "type": "project"

2
src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
View File

@ -13,7 +13,7 @@
"precedence": "3000", "precedence": "3000",
"identity": "Microsoft.Web.RazorPages.CSharp.2.1", "identity": "Microsoft.Web.RazorPages.CSharp.2.1",
"shortName": [ "razor", "webapp" ], "shortName": [ "razor", "webapp" ],
"thirdPartyNotices": "https://aka.ms/template-3pn", "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210",
"tags": { "tags": {
"language": "C#", "language": "C#",
"type": "project" "type": "project"

14
src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml
View File

@ -9,7 +9,6 @@
<li data-target="#myCarousel" data-slide-to="0" class="active"></li> <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
<li data-target="#myCarousel" data-slide-to="1"></li> <li data-target="#myCarousel" data-slide-to="1"></li>
<li data-target="#myCarousel" data-slide-to="2"></li> <li data-target="#myCarousel" data-slide-to="2"></li>
<li data-target="#myCarousel" data-slide-to="3"></li>
</ol> </ol>
<div class="carousel-inner" role="listbox"> <div class="carousel-inner" role="listbox">
<div class="item active"> <div class="item active">
@ -35,18 +34,7 @@
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" /> <img src="~/images/banner3.svg" alt="Microsoft Azure" class="img-responsive" />
<div class="carousel-caption" role="option">
<p>
Bring in libraries from NuGet and npm, and automate tasks using Grunt or Gulp.
<a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
Learn More
</a>
</p>
</div>
</div>
<div class="item">
<img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
<div class="carousel-caption" role="option"> <div class="carousel-caption" role="option">
<p> <p>
Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps. Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.

2
src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/images/banner3.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

1
src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/images/banner4.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

2
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
View File

@ -12,7 +12,7 @@
"precedence": "3000", "precedence": "3000",
"identity": "Microsoft.Web.Mvc.CSharp.2.1", "identity": "Microsoft.Web.Mvc.CSharp.2.1",
"shortName": "mvc", "shortName": "mvc",
"thirdPartyNotices": "https://aka.ms/template-3pn", "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210",
"tags": { "tags": {
"language": "C#", "language": "C#",
"type": "project" "type": "project"

14
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Home/Index.cshtml
View File

@ -7,7 +7,6 @@
<li data-target="#myCarousel" data-slide-to="0" class="active"></li> <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
<li data-target="#myCarousel" data-slide-to="1"></li> <li data-target="#myCarousel" data-slide-to="1"></li>
<li data-target="#myCarousel" data-slide-to="2"></li> <li data-target="#myCarousel" data-slide-to="2"></li>
<li data-target="#myCarousel" data-slide-to="3"></li>
</ol> </ol>
<div class="carousel-inner" role="listbox"> <div class="carousel-inner" role="listbox">
<div class="item active"> <div class="item active">
@ -33,18 +32,7 @@
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" /> <img src="~/images/banner3.svg" alt="Microsoft Azure" class="img-responsive" />
<div class="carousel-caption" role="option">
<p>
Bring in libraries from NuGet and npm, and automate tasks using Grunt or Gulp.
<a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
Learn More
</a>
</p>
</div>
</div>
<div class="item">
<img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
<div class="carousel-caption" role="option"> <div class="carousel-caption" role="option">
<p> <p>
Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps. Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.

2
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/images/banner3.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

1
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/images/banner4.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

2
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json
View File

@ -12,7 +12,7 @@
"precedence": "3000", "precedence": "3000",
"identity": "Microsoft.Web.Mvc.FSharp.2.1", "identity": "Microsoft.Web.Mvc.FSharp.2.1",
"shortName": "mvc", "shortName": "mvc",
"thirdPartyNotices": "https://aka.ms/template-3pn", "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210",
"tags": { "tags": {
"language": "F#", "language": "F#",
"type": "project" "type": "project"

14
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Home/Index.cshtml
View File

@ -7,7 +7,6 @@
<li data-target="#myCarousel" data-slide-to="0" class="active"></li> <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
<li data-target="#myCarousel" data-slide-to="1"></li> <li data-target="#myCarousel" data-slide-to="1"></li>
<li data-target="#myCarousel" data-slide-to="2"></li> <li data-target="#myCarousel" data-slide-to="2"></li>
<li data-target="#myCarousel" data-slide-to="3"></li>
</ol> </ol>
<div class="carousel-inner" role="listbox"> <div class="carousel-inner" role="listbox">
<div class="item active"> <div class="item active">
@ -33,18 +32,7 @@
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" /> <img src="~/images/banner3.svg" alt="Microsoft Azure" class="img-responsive" />
<div class="carousel-caption" role="option">
<p>
Bring in libraries from NuGet and npm, and automate tasks using Grunt or Gulp.
<a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
Learn More
</a>
</p>
</div>
</div>
<div class="item">
<img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
<div class="carousel-caption" role="option"> <div class="carousel-caption" role="option">
<p> <p>
Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps. Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.

2
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/images/banner3.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

1
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/images/banner4.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

1
src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json
View File

@ -12,7 +12,6 @@
"precedence": "3000", "precedence": "3000",
"identity": "Microsoft.Web.WebApi.CSharp.2.1", "identity": "Microsoft.Web.WebApi.CSharp.2.1",
"shortName": "webapi", "shortName": "webapi",
"thirdPartyNotices": "https://aka.ms/template-3pn",
"tags": { "tags": {
"language": "C#", "language": "C#",
"type": "project" "type": "project"

1
src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json
View File

@ -11,7 +11,6 @@
"precedence": "3000", "precedence": "3000",
"identity": "Microsoft.Web.WebApi.FSharp.2.1", "identity": "Microsoft.Web.WebApi.FSharp.2.1",
"shortName": "webapi", "shortName": "webapi",
"thirdPartyNotices": "https://aka.ms/template-3pn",
"tags": { "tags": {
"language": "F#", "language": "F#",
"type": "project" "type": "project"

12
test/Templates.Test/template-baselines.json
View File

@ -37,7 +37,6 @@
"wwwroot/images/banner1.svg", "wwwroot/images/banner1.svg",
"wwwroot/images/banner2.svg", "wwwroot/images/banner2.svg",
"wwwroot/images/banner3.svg", "wwwroot/images/banner3.svg",
"wwwroot/images/banner4.svg",
"wwwroot/js/site.js", "wwwroot/js/site.js",
"wwwroot/js/site.min.js", "wwwroot/js/site.min.js",
"wwwroot/lib/bootstrap/.bower.json", "wwwroot/lib/bootstrap/.bower.json",
@ -106,7 +105,6 @@
"wwwroot/images/banner1.svg", "wwwroot/images/banner1.svg",
"wwwroot/images/banner2.svg", "wwwroot/images/banner2.svg",
"wwwroot/images/banner3.svg", "wwwroot/images/banner3.svg",
"wwwroot/images/banner4.svg",
"wwwroot/js/site.js", "wwwroot/js/site.js",
"wwwroot/js/site.min.js", "wwwroot/js/site.min.js",
"wwwroot/lib/bootstrap/.bower.json", "wwwroot/lib/bootstrap/.bower.json",
@ -176,7 +174,6 @@
"wwwroot/images/banner1.svg", "wwwroot/images/banner1.svg",
"wwwroot/images/banner2.svg", "wwwroot/images/banner2.svg",
"wwwroot/images/banner3.svg", "wwwroot/images/banner3.svg",
"wwwroot/images/banner4.svg",
"wwwroot/js/site.js", "wwwroot/js/site.js",
"wwwroot/js/site.min.js", "wwwroot/js/site.min.js",
"wwwroot/lib/bootstrap/.bower.json", "wwwroot/lib/bootstrap/.bower.json",
@ -246,7 +243,6 @@
"wwwroot/images/banner1.svg", "wwwroot/images/banner1.svg",
"wwwroot/images/banner2.svg", "wwwroot/images/banner2.svg",
"wwwroot/images/banner3.svg", "wwwroot/images/banner3.svg",
"wwwroot/images/banner4.svg",
"wwwroot/js/site.js", "wwwroot/js/site.js",
"wwwroot/js/site.min.js", "wwwroot/js/site.min.js",
"wwwroot/lib/bootstrap/.bower.json", "wwwroot/lib/bootstrap/.bower.json",
@ -315,7 +311,6 @@
"wwwroot/images/banner1.svg", "wwwroot/images/banner1.svg",
"wwwroot/images/banner2.svg", "wwwroot/images/banner2.svg",
"wwwroot/images/banner3.svg", "wwwroot/images/banner3.svg",
"wwwroot/images/banner4.svg",
"wwwroot/js/site.js", "wwwroot/js/site.js",
"wwwroot/js/site.min.js", "wwwroot/js/site.min.js",
"wwwroot/lib/bootstrap/.bower.json", "wwwroot/lib/bootstrap/.bower.json",
@ -385,7 +380,6 @@
"wwwroot/images/banner1.svg", "wwwroot/images/banner1.svg",
"wwwroot/images/banner2.svg", "wwwroot/images/banner2.svg",
"wwwroot/images/banner3.svg", "wwwroot/images/banner3.svg",
"wwwroot/images/banner4.svg",
"wwwroot/js/site.js", "wwwroot/js/site.js",
"wwwroot/js/site.min.js", "wwwroot/js/site.min.js",
"wwwroot/lib/bootstrap/.bower.json", "wwwroot/lib/bootstrap/.bower.json",
@ -514,7 +508,6 @@
"wwwroot/images/banner1.svg", "wwwroot/images/banner1.svg",
"wwwroot/images/banner2.svg", "wwwroot/images/banner2.svg",
"wwwroot/images/banner3.svg", "wwwroot/images/banner3.svg",
"wwwroot/images/banner4.svg",
"wwwroot/js/site.js", "wwwroot/js/site.js",
"wwwroot/js/site.min.js", "wwwroot/js/site.min.js",
"wwwroot/lib/bootstrap/.bower.json", "wwwroot/lib/bootstrap/.bower.json",
@ -580,7 +573,6 @@
"wwwroot/images/banner1.svg", "wwwroot/images/banner1.svg",
"wwwroot/images/banner2.svg", "wwwroot/images/banner2.svg",
"wwwroot/images/banner3.svg", "wwwroot/images/banner3.svg",
"wwwroot/images/banner4.svg",
"wwwroot/js/site.js", "wwwroot/js/site.js",
"wwwroot/js/site.min.js", "wwwroot/js/site.min.js",
"wwwroot/lib/bootstrap/.bower.json", "wwwroot/lib/bootstrap/.bower.json",
@ -647,7 +639,6 @@
"wwwroot/images/banner1.svg", "wwwroot/images/banner1.svg",
"wwwroot/images/banner2.svg", "wwwroot/images/banner2.svg",
"wwwroot/images/banner3.svg", "wwwroot/images/banner3.svg",
"wwwroot/images/banner4.svg",
"wwwroot/js/site.js", "wwwroot/js/site.js",
"wwwroot/js/site.min.js", "wwwroot/js/site.min.js",
"wwwroot/lib/bootstrap/.bower.json", "wwwroot/lib/bootstrap/.bower.json",
@ -714,7 +705,6 @@
"wwwroot/images/banner1.svg", "wwwroot/images/banner1.svg",
"wwwroot/images/banner2.svg", "wwwroot/images/banner2.svg",
"wwwroot/images/banner3.svg", "wwwroot/images/banner3.svg",
"wwwroot/images/banner4.svg",
"wwwroot/js/site.js", "wwwroot/js/site.js",
"wwwroot/js/site.min.js", "wwwroot/js/site.min.js",
"wwwroot/lib/bootstrap/.bower.json", "wwwroot/lib/bootstrap/.bower.json",
@ -780,7 +770,6 @@
"wwwroot/images/banner1.svg", "wwwroot/images/banner1.svg",
"wwwroot/images/banner2.svg", "wwwroot/images/banner2.svg",
"wwwroot/images/banner3.svg", "wwwroot/images/banner3.svg",
"wwwroot/images/banner4.svg",
"wwwroot/js/site.js", "wwwroot/js/site.js",
"wwwroot/js/site.min.js", "wwwroot/js/site.min.js",
"wwwroot/lib/bootstrap/.bower.json", "wwwroot/lib/bootstrap/.bower.json",
@ -847,7 +836,6 @@
"wwwroot/images/banner1.svg", "wwwroot/images/banner1.svg",
"wwwroot/images/banner2.svg", "wwwroot/images/banner2.svg",
"wwwroot/images/banner3.svg", "wwwroot/images/banner3.svg",
"wwwroot/images/banner4.svg",
"wwwroot/js/site.js", "wwwroot/js/site.js",
"wwwroot/js/site.min.js", "wwwroot/js/site.min.js",
"wwwroot/lib/bootstrap/.bower.json", "wwwroot/lib/bootstrap/.bower.json",