diff --git a/src/Microsoft.DotNet.Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj b/src/Microsoft.DotNet.Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj
index a54a8699ca..c6a64d8063 100644
--- a/src/Microsoft.DotNet.Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj
+++ b/src/Microsoft.DotNet.Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj
@@ -2,7 +2,10 @@
netcoreapp2.2
- Web Client-Side File Templates for Microsoft Template Engine
+ Web Client-Side File Templates for Microsoft Template Engine
+
+ To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'.
+
diff --git a/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj b/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj
index c789a961e6..295513c98e 100644
--- a/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj
+++ b/src/Microsoft.DotNet.Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj
@@ -2,7 +2,9 @@
netcoreapp2.2
- Web File Templates for Microsoft Template Engine
+ Web File Templates for Microsoft Template Engine
+
+ To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'.
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in
index f1a998425c..de9a229c6a 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-CSharp.csproj.in
@@ -8,10 +8,6 @@
Company.WebApplication1
-
-
-
-
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
index a66d01d5cc..e532800847 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
@@ -5,7 +5,9 @@
netcoreapp2.2
Microsoft.DotNet.Web.ProjectTemplates.2.2
- ASP.NET Core Web Template Pack for Microsoft Template Engine
+ ASP.NET Core Web Template Pack for Microsoft Template Engine
+
+ To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'.
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in
index 23f19984ec..5c77b56f48 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in
@@ -11,10 +11,6 @@
Company.WebApplication1
-
-
-
-
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/wwwroot/-.- b/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/wwwroot/-.-
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
index f4fc6c9074..630046f2d8 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
@@ -11,7 +11,8 @@
+ asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute"
+ integrity="sha256-eSi1q2PG6J7g7ib17yAaWMcrr5GrtohYChqibrV7PBE="/>
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation/.bower.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation/.bower.json
deleted file mode 100644
index 79824166a0..0000000000
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation/.bower.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "name": "jquery-validation",
- "homepage": "https://jqueryvalidation.org/",
- "repository": {
- "type": "git",
- "url": "git://github.com/jquery-validation/jquery-validation.git"
- },
- "authors": [
- "Jörn Zaefferer "
- ],
- "description": "Form validation made easy",
- "main": "dist/jquery.validate.js",
- "keywords": [
- "forms",
- "validation",
- "validate"
- ],
- "license": "MIT",
- "ignore": [
- "**/.*",
- "node_modules",
- "bower_components",
- "test",
- "demo",
- "lib"
- ],
- "dependencies": {
- "jquery": ">= 1.7.2"
- },
- "version": "1.17.0",
- "_release": "1.17.0",
- "_resolution": {
- "type": "version",
- "tag": "1.17.0",
- "commit": "fc9b12d3bfaa2d0c04605855b896edb2934c0772"
- },
- "_source": "https://github.com/jzaefferer/jquery-validation.git",
- "_target": "^1.17.0",
- "_originalSource": "jquery-validation",
- "_direct": true
-}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery/.bower.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery/.bower.json
deleted file mode 100644
index 959ddb7137..0000000000
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery/.bower.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "name": "jquery",
- "main": "dist/jquery.js",
- "license": "MIT",
- "ignore": [
- "package.json"
- ],
- "keywords": [
- "jquery",
- "javascript",
- "browser",
- "library"
- ],
- "homepage": "https://github.com/jquery/jquery-dist",
- "version": "3.3.1",
- "_release": "3.3.1",
- "_resolution": {
- "type": "version",
- "tag": "3.3.1",
- "commit": "9e8ec3d10fad04748176144f108d7355662ae75e"
- },
- "_source": "https://github.com/jquery/jquery-dist.git",
- "_target": "^3.3.1",
- "_originalSource": "jquery",
- "_direct": true
-}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
index c7cf09d069..50efa44a39 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
@@ -11,7 +11,8 @@
+ asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute"
+ integrity="sha256-eSi1q2PG6J7g7ib17yAaWMcrr5GrtohYChqibrV7PBE="/>
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation/.bower.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation/.bower.json
deleted file mode 100644
index 79824166a0..0000000000
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation/.bower.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "name": "jquery-validation",
- "homepage": "https://jqueryvalidation.org/",
- "repository": {
- "type": "git",
- "url": "git://github.com/jquery-validation/jquery-validation.git"
- },
- "authors": [
- "Jörn Zaefferer "
- ],
- "description": "Form validation made easy",
- "main": "dist/jquery.validate.js",
- "keywords": [
- "forms",
- "validation",
- "validate"
- ],
- "license": "MIT",
- "ignore": [
- "**/.*",
- "node_modules",
- "bower_components",
- "test",
- "demo",
- "lib"
- ],
- "dependencies": {
- "jquery": ">= 1.7.2"
- },
- "version": "1.17.0",
- "_release": "1.17.0",
- "_resolution": {
- "type": "version",
- "tag": "1.17.0",
- "commit": "fc9b12d3bfaa2d0c04605855b896edb2934c0772"
- },
- "_source": "https://github.com/jzaefferer/jquery-validation.git",
- "_target": "^1.17.0",
- "_originalSource": "jquery-validation",
- "_direct": true
-}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery/.bower.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery/.bower.json
deleted file mode 100644
index 959ddb7137..0000000000
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery/.bower.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "name": "jquery",
- "main": "dist/jquery.js",
- "license": "MIT",
- "ignore": [
- "package.json"
- ],
- "keywords": [
- "jquery",
- "javascript",
- "browser",
- "library"
- ],
- "homepage": "https://github.com/jquery/jquery-dist",
- "version": "3.3.1",
- "_release": "3.3.1",
- "_resolution": {
- "type": "version",
- "tag": "3.3.1",
- "commit": "9e8ec3d10fad04748176144f108d7355662ae75e"
- },
- "_source": "https://github.com/jquery/jquery-dist.git",
- "_target": "^3.3.1",
- "_originalSource": "jquery",
- "_direct": true
-}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml
index e2436ff3cb..36f0469f4f 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml
@@ -11,7 +11,8 @@
+ asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute"
+ integrity="sha256-eSi1q2PG6J7g7ib17yAaWMcrr5GrtohYChqibrV7PBE=" />
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation/.bower.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation/.bower.json
deleted file mode 100644
index 79824166a0..0000000000
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation/.bower.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "name": "jquery-validation",
- "homepage": "https://jqueryvalidation.org/",
- "repository": {
- "type": "git",
- "url": "git://github.com/jquery-validation/jquery-validation.git"
- },
- "authors": [
- "Jörn Zaefferer "
- ],
- "description": "Form validation made easy",
- "main": "dist/jquery.validate.js",
- "keywords": [
- "forms",
- "validation",
- "validate"
- ],
- "license": "MIT",
- "ignore": [
- "**/.*",
- "node_modules",
- "bower_components",
- "test",
- "demo",
- "lib"
- ],
- "dependencies": {
- "jquery": ">= 1.7.2"
- },
- "version": "1.17.0",
- "_release": "1.17.0",
- "_resolution": {
- "type": "version",
- "tag": "1.17.0",
- "commit": "fc9b12d3bfaa2d0c04605855b896edb2934c0772"
- },
- "_source": "https://github.com/jzaefferer/jquery-validation.git",
- "_target": "^1.17.0",
- "_originalSource": "jquery-validation",
- "_direct": true
-}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery/.bower.json b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery/.bower.json
deleted file mode 100644
index 959ddb7137..0000000000
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery/.bower.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "name": "jquery",
- "main": "dist/jquery.js",
- "license": "MIT",
- "ignore": [
- "package.json"
- ],
- "keywords": [
- "jquery",
- "javascript",
- "browser",
- "library"
- ],
- "homepage": "https://github.com/jquery/jquery-dist",
- "version": "3.3.1",
- "_release": "3.3.1",
- "_resolution": {
- "type": "version",
- "tag": "3.3.1",
- "commit": "9e8ec3d10fad04748176144f108d7355662ae75e"
- },
- "_source": "https://github.com/jquery/jquery-dist.git",
- "_target": "^3.3.1",
- "_originalSource": "jquery",
- "_direct": true
-}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/wwwroot/-.- b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/wwwroot/-.-
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/wwwroot/-.- b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/wwwroot/-.-
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
index 1e86d7446d..80037b4fda 100644
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
@@ -4,7 +4,9 @@
netcoreapp2.2
- Single Page Application templates for ASP.NET Core
+ Single Page Application templates for ASP.NET Core
+
+ To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'.
$(PackageTags);spa
diff --git a/test/Templates.Test/CdnScriptTagTests.cs b/test/Templates.Test/CdnScriptTagTests.cs
index 0a9eaee088..4a4ebc15f0 100644
--- a/test/Templates.Test/CdnScriptTagTests.cs
+++ b/test/Templates.Test/CdnScriptTagTests.cs
@@ -1,6 +1,8 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+using AngleSharp;
+using AngleSharp.Dom;
using AngleSharp.Dom.Html;
using AngleSharp.Parser.Html;
using System;
@@ -23,6 +25,7 @@ namespace Templates.Test
private static readonly string _solutionDir;
private static readonly string _artifactsDir;
private static List _scriptTags;
+ private static List _linkTags;
static CdnScriptTagTests()
{
@@ -31,9 +34,12 @@ namespace Templates.Test
var packages = Directory.GetFiles(_artifactsDir, "*.nupkg");
_scriptTags = new List();
+ _linkTags = new List();
foreach (var packagePath in packages)
{
- _scriptTags.AddRange(GetScriptTags(packagePath));
+ var tags = GetTags(packagePath);
+ _scriptTags.AddRange(tags.scripts);
+ _linkTags.AddRange(tags.links);
}
}
@@ -43,21 +49,33 @@ namespace Templates.Test
_httpClient = new HttpClient();
}
- public static IEnumerable