diff --git a/korebuild-lock.txt b/korebuild-lock.txt index ce2f277c53..0ac58a0103 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview3-17018 -commithash:af264ca131f212b5ba8aafbc5110fc0fc510a2be +version:2.1.0-rc1-15770 +commithash:a2abdc6fa0e8a1a465e830100950f1ecc698ab28 diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json index 75537269f8..0b474de835 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json @@ -12,7 +12,6 @@ "precedence": "3000", "identity": "Microsoft.Web.Empty.CSharp.2.1", "shortName": "web", - "thirdPartyNotices": "https://aka.ms/template-3pn", "tags": { "language": "C#", "type": "project" diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json index 614fc4e643..332ead6554 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json @@ -11,7 +11,6 @@ "precedence": "3000", "identity": "Microsoft.Web.Empty.FSharp.2.1", "shortName": "web", - "thirdPartyNotices": "https://aka.ms/template-3pn", "tags": { "language": "F#", "type": "project" diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json index 58c183d12b..154d9094f2 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json @@ -13,7 +13,7 @@ "precedence": "3000", "identity": "Microsoft.Web.RazorPages.CSharp.2.1", "shortName": [ "razor", "webapp" ], - "thirdPartyNotices": "https://aka.ms/template-3pn", + "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210", "tags": { "language": "C#", "type": "project" diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml index 728fdfc943..ff7fc32dfc 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml @@ -9,7 +9,6 @@
-- Bring in libraries from NuGet and npm, and automate tasks using Grunt or Gulp. - - Learn More - -
-Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps. diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/images/banner3.svg b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/images/banner3.svg index 9be2c2503c..38b3d7cd1f 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/images/banner3.svg +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/images/banner3.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/images/banner4.svg b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/images/banner4.svg deleted file mode 100644 index 38b3d7cd1f..0000000000 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/images/banner4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json index 7f74a3e727..ae39c7f26e 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json @@ -12,7 +12,7 @@ "precedence": "3000", "identity": "Microsoft.Web.Mvc.CSharp.2.1", "shortName": "mvc", - "thirdPartyNotices": "https://aka.ms/template-3pn", + "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210", "tags": { "language": "C#", "type": "project" diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Home/Index.cshtml b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Home/Index.cshtml index f804781a31..f42d2a08bd 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Home/Index.cshtml +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Home/Index.cshtml @@ -7,7 +7,6 @@
-- Bring in libraries from NuGet and npm, and automate tasks using Grunt or Gulp. - - Learn More - -
-Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps. diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/images/banner3.svg b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/images/banner3.svg index 9be2c2503c..38b3d7cd1f 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/images/banner3.svg +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/images/banner3.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/images/banner4.svg b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/images/banner4.svg deleted file mode 100644 index 38b3d7cd1f..0000000000 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/images/banner4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json index 5a1cd1553d..44f417b380 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json @@ -12,7 +12,7 @@ "precedence": "3000", "identity": "Microsoft.Web.Mvc.FSharp.2.1", "shortName": "mvc", - "thirdPartyNotices": "https://aka.ms/template-3pn", + "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210", "tags": { "language": "F#", "type": "project" diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Home/Index.cshtml b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Home/Index.cshtml index f804781a31..f42d2a08bd 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Home/Index.cshtml +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Home/Index.cshtml @@ -7,7 +7,6 @@
-- Bring in libraries from NuGet and npm, and automate tasks using Grunt or Gulp. - - Learn More - -
-Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps. diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/images/banner3.svg b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/images/banner3.svg index 9be2c2503c..38b3d7cd1f 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/images/banner3.svg +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/images/banner3.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/images/banner4.svg b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/images/banner4.svg deleted file mode 100644 index 38b3d7cd1f..0000000000 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/images/banner4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json index bc61636bbd..2374e93237 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json @@ -12,7 +12,6 @@ "precedence": "3000", "identity": "Microsoft.Web.WebApi.CSharp.2.1", "shortName": "webapi", - "thirdPartyNotices": "https://aka.ms/template-3pn", "tags": { "language": "C#", "type": "project" diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json index 87e13f7548..901221dcd1 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json @@ -11,7 +11,6 @@ "precedence": "3000", "identity": "Microsoft.Web.WebApi.FSharp.2.1", "shortName": "webapi", - "thirdPartyNotices": "https://aka.ms/template-3pn", "tags": { "language": "F#", "type": "project" diff --git a/test/Templates.Test/template-baselines.json b/test/Templates.Test/template-baselines.json index eab5f9e9e3..4da1e32213 100644 --- a/test/Templates.Test/template-baselines.json +++ b/test/Templates.Test/template-baselines.json @@ -37,7 +37,6 @@ "wwwroot/images/banner1.svg", "wwwroot/images/banner2.svg", "wwwroot/images/banner3.svg", - "wwwroot/images/banner4.svg", "wwwroot/js/site.js", "wwwroot/js/site.min.js", "wwwroot/lib/bootstrap/.bower.json", @@ -106,7 +105,6 @@ "wwwroot/images/banner1.svg", "wwwroot/images/banner2.svg", "wwwroot/images/banner3.svg", - "wwwroot/images/banner4.svg", "wwwroot/js/site.js", "wwwroot/js/site.min.js", "wwwroot/lib/bootstrap/.bower.json", @@ -176,7 +174,6 @@ "wwwroot/images/banner1.svg", "wwwroot/images/banner2.svg", "wwwroot/images/banner3.svg", - "wwwroot/images/banner4.svg", "wwwroot/js/site.js", "wwwroot/js/site.min.js", "wwwroot/lib/bootstrap/.bower.json", @@ -246,7 +243,6 @@ "wwwroot/images/banner1.svg", "wwwroot/images/banner2.svg", "wwwroot/images/banner3.svg", - "wwwroot/images/banner4.svg", "wwwroot/js/site.js", "wwwroot/js/site.min.js", "wwwroot/lib/bootstrap/.bower.json", @@ -315,7 +311,6 @@ "wwwroot/images/banner1.svg", "wwwroot/images/banner2.svg", "wwwroot/images/banner3.svg", - "wwwroot/images/banner4.svg", "wwwroot/js/site.js", "wwwroot/js/site.min.js", "wwwroot/lib/bootstrap/.bower.json", @@ -385,7 +380,6 @@ "wwwroot/images/banner1.svg", "wwwroot/images/banner2.svg", "wwwroot/images/banner3.svg", - "wwwroot/images/banner4.svg", "wwwroot/js/site.js", "wwwroot/js/site.min.js", "wwwroot/lib/bootstrap/.bower.json", @@ -514,7 +508,6 @@ "wwwroot/images/banner1.svg", "wwwroot/images/banner2.svg", "wwwroot/images/banner3.svg", - "wwwroot/images/banner4.svg", "wwwroot/js/site.js", "wwwroot/js/site.min.js", "wwwroot/lib/bootstrap/.bower.json", @@ -580,7 +573,6 @@ "wwwroot/images/banner1.svg", "wwwroot/images/banner2.svg", "wwwroot/images/banner3.svg", - "wwwroot/images/banner4.svg", "wwwroot/js/site.js", "wwwroot/js/site.min.js", "wwwroot/lib/bootstrap/.bower.json", @@ -647,7 +639,6 @@ "wwwroot/images/banner1.svg", "wwwroot/images/banner2.svg", "wwwroot/images/banner3.svg", - "wwwroot/images/banner4.svg", "wwwroot/js/site.js", "wwwroot/js/site.min.js", "wwwroot/lib/bootstrap/.bower.json", @@ -714,7 +705,6 @@ "wwwroot/images/banner1.svg", "wwwroot/images/banner2.svg", "wwwroot/images/banner3.svg", - "wwwroot/images/banner4.svg", "wwwroot/js/site.js", "wwwroot/js/site.min.js", "wwwroot/lib/bootstrap/.bower.json", @@ -780,7 +770,6 @@ "wwwroot/images/banner1.svg", "wwwroot/images/banner2.svg", "wwwroot/images/banner3.svg", - "wwwroot/images/banner4.svg", "wwwroot/js/site.js", "wwwroot/js/site.min.js", "wwwroot/lib/bootstrap/.bower.json", @@ -847,7 +836,6 @@ "wwwroot/images/banner1.svg", "wwwroot/images/banner2.svg", "wwwroot/images/banner3.svg", - "wwwroot/images/banner4.svg", "wwwroot/js/site.js", "wwwroot/js/site.min.js", "wwwroot/lib/bootstrap/.bower.json",