From 97df4d62eb49aa1a05e1f9b0bf513b3e7db26d18 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 26 Sep 2018 11:22:45 -0700 Subject: [PATCH 01/11] Updating submodule(s) Mvc => 5b8b3a00674871dfe081e77696aa22e85c911f67 [auto-updated: submodules] --- modules/Mvc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Mvc b/modules/Mvc index 831937c86c..5b8b3a0067 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 831937c86c897da146edfee8ba7f7790aa5cb991 +Subproject commit 5b8b3a00674871dfe081e77696aa22e85c911f67 From bbcc3cafdaee000ac41f33352d56b80cd7a2b536 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 26 Sep 2018 18:55:02 +0000 Subject: [PATCH 02/11] Updating submodule(s) EntityFrameworkCore => 7c60f309fadbd3143b485fda307a1dae53ff86c9 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index a82aa36b38..7c60f309fa 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit a82aa36b38f3bef4604dd7013a2284b6db0cd8c0 +Subproject commit 7c60f309fadbd3143b485fda307a1dae53ff86c9 From 9a2a8acac6e6ea41b179f750f5e8dfa7f999f9c6 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 26 Sep 2018 13:04:15 -0700 Subject: [PATCH 03/11] Updating submodule(s) SignalR => 71ac906159eb847701bf338622732ce7db671ceb Templating => b07338b6185dd2cfb0358b13370dde5766b27369 [auto-updated: submodules] --- modules/SignalR | 2 +- modules/Templating | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/SignalR b/modules/SignalR index e5470d9239..71ac906159 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit e5470d923914debf706be9a2739d250904ac69fb +Subproject commit 71ac906159eb847701bf338622732ce7db671ceb diff --git a/modules/Templating b/modules/Templating index c6347f035f..b07338b618 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit c6347f035fd9a40fd522c8365f9491603197e589 +Subproject commit b07338b6185dd2cfb0358b13370dde5766b27369 From 054ea43674d8c9dd278d08c61ec16bdd6ae3a592 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 26 Sep 2018 14:44:49 -0700 Subject: [PATCH 04/11] Updating submodule(s) DotNetTools => c601038484606dab00000ed9bf7581a5659b2215 FileSystem => 6241310d746e58e78faef2f97aeb7ec7da6848b9 IISIntegration => bac0f44fa7e102cf8dc6112c7dfd9f227d56708a [auto-updated: submodules] --- modules/DotNetTools | 2 +- modules/FileSystem | 2 +- modules/IISIntegration | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/DotNetTools b/modules/DotNetTools index 6c39b06a59..c601038484 160000 --- a/modules/DotNetTools +++ b/modules/DotNetTools @@ -1 +1 @@ -Subproject commit 6c39b06a5988e0b17c685024b0ba26cefe6b3208 +Subproject commit c601038484606dab00000ed9bf7581a5659b2215 diff --git a/modules/FileSystem b/modules/FileSystem index 3be791ee91..6241310d74 160000 --- a/modules/FileSystem +++ b/modules/FileSystem @@ -1 +1 @@ -Subproject commit 3be791ee91bc5c17887c138f4a3c52c02e6e8c3f +Subproject commit 6241310d746e58e78faef2f97aeb7ec7da6848b9 diff --git a/modules/IISIntegration b/modules/IISIntegration index 1eb5da31e5..bac0f44fa7 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 1eb5da31e5e37efe1c0f3b43f6f8f701d4a284e1 +Subproject commit bac0f44fa7e102cf8dc6112c7dfd9f227d56708a From b7fd0270744f09e8ac08cbe9dab6027eee280059 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 26 Sep 2018 15:51:22 -0700 Subject: [PATCH 05/11] Updating submodule(s) DotNetTools => 0157e38a23bbe7ef827a34c221bc3cd268f242a7 Razor => e4ebae107c82ba79a3b990c820b3443dcee7ec9d SignalR => 13f2ebe2f62b46bf1716e82e3cb86e6f57b2af51 [auto-updated: submodules] --- modules/DotNetTools | 2 +- modules/Razor | 2 +- modules/SignalR | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/DotNetTools b/modules/DotNetTools index c601038484..0157e38a23 160000 --- a/modules/DotNetTools +++ b/modules/DotNetTools @@ -1 +1 @@ -Subproject commit c601038484606dab00000ed9bf7581a5659b2215 +Subproject commit 0157e38a23bbe7ef827a34c221bc3cd268f242a7 diff --git a/modules/Razor b/modules/Razor index ecbaf35d2f..e4ebae107c 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit ecbaf35d2fa2566e4cf8368127a30c45eb69422d +Subproject commit e4ebae107c82ba79a3b990c820b3443dcee7ec9d diff --git a/modules/SignalR b/modules/SignalR index 71ac906159..13f2ebe2f6 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 71ac906159eb847701bf338622732ce7db671ceb +Subproject commit 13f2ebe2f62b46bf1716e82e3cb86e6f57b2af51 From 05e3e13a964a26cfc15130555ee61aafe7c85759 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 26 Sep 2018 16:23:32 -0700 Subject: [PATCH 06/11] Updating submodule(s) Mvc => 8311fd870b5594ab547a8cc6ca3b7b87fda9effd [auto-updated: submodules] --- modules/Mvc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Mvc b/modules/Mvc index 5b8b3a0067..8311fd870b 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 5b8b3a00674871dfe081e77696aa22e85c911f67 +Subproject commit 8311fd870b5594ab547a8cc6ca3b7b87fda9effd From 983cce43290a3a1bdd7bcede55405b9e2f1c0178 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 26 Sep 2018 17:57:49 -0700 Subject: [PATCH 07/11] Updating submodule(s) KestrelHttpServer => f56b682b364ebf12cb1779b0110536f8b2648bfc SignalR => 79663b480df1a4ffca5bcb1d35128098993de5bd [auto-updated: submodules] --- modules/KestrelHttpServer | 2 +- modules/SignalR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 01b35bc391..f56b682b36 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 01b35bc3913204ebbd308b4719a20168466d0183 +Subproject commit f56b682b364ebf12cb1779b0110536f8b2648bfc diff --git a/modules/SignalR b/modules/SignalR index 13f2ebe2f6..79663b480d 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 13f2ebe2f62b46bf1716e82e3cb86e6f57b2af51 +Subproject commit 79663b480df1a4ffca5bcb1d35128098993de5bd From 79adc9dd4051e47df1d4bef34b2b0dc3e962d6e7 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 27 Sep 2018 07:11:16 -0700 Subject: [PATCH 08/11] Updating submodule(s) Routing => 95753825ef832e6816adca655978b3a6e8e4bb09 [auto-updated: submodules] --- modules/Routing | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Routing b/modules/Routing index 49c2317c14..95753825ef 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit 49c2317c14743914d94ce3172aea14a0bf7accf5 +Subproject commit 95753825ef832e6816adca655978b3a6e8e4bb09 From 1b10ecb180cd5ed2ae25531030ff4c94029abc67 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 27 Sep 2018 08:34:30 -0700 Subject: [PATCH 09/11] Updating submodule(s) SignalR => 3c8c8ba333e2c5e4b9cc2c205e01731c9e1ddfe0 [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 79663b480d..3c8c8ba333 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 79663b480df1a4ffca5bcb1d35128098993de5bd +Subproject commit 3c8c8ba333e2c5e4b9cc2c205e01731c9e1ddfe0 From 9cb2c7a8d63c176040860ec94e1e9493caa2d841 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Thu, 27 Sep 2018 10:19:19 -0700 Subject: [PATCH 10/11] Update Cli.FunctionalTests for latest 2.2-preview3 (#1425) --- .../Templates/AngularTemplate.cs | 50 ++------ .../Templates/MvcTemplate.cs | 38 ++---- .../Templates/RazorBootstrapJQueryTemplate.cs | 119 ++++++------------ .../Templates/RazorTemplate.cs | 37 ++---- .../Templates/ReactTemplate.cs | 44 ++----- .../Templates/WebTemplate.cs | 71 ++++------- 6 files changed, 101 insertions(+), 258 deletions(-) diff --git a/test/Cli.FunctionalTests/Templates/AngularTemplate.cs b/test/Cli.FunctionalTests/Templates/AngularTemplate.cs index debc4a6a9d..d5d3b9367a 100644 --- a/test/Cli.FunctionalTests/Templates/AngularTemplate.cs +++ b/test/Cli.FunctionalTests/Templates/AngularTemplate.cs @@ -1,12 +1,10 @@ // 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 System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; -using Cli.FunctionalTests.Util; namespace Cli.FunctionalTests.Templates { @@ -23,45 +21,17 @@ namespace Cli.FunctionalTests.Templates .Select(f => Regex.Replace(f, @"\.[0-9a-f]{20}\.", ".[HASH].")); } - private IDictionary>> _additionalFilesAfterPublish => - new Dictionary>>() - { - { "common", () => new[] - { - Path.Combine("wwwroot", "favicon.ico"), - Path.Combine("ClientApp", "dist", "3rdpartylicenses.txt"), - Path.Combine("ClientApp", "dist", "index.html"), - } - }, - { "netcoreapp2.1", () => - _additionalFilesAfterPublish["common"]() - .Concat(new[] - { - Path.Combine("ClientApp", "dist", "glyphicons-halflings-regular.[HASH].woff2"), - Path.Combine("ClientApp", "dist", "glyphicons-halflings-regular.[HASH].svg"), - Path.Combine("ClientApp", "dist", "glyphicons-halflings-regular.[HASH].ttf"), - Path.Combine("ClientApp", "dist", "glyphicons-halflings-regular.[HASH].eot"), - Path.Combine("ClientApp", "dist", "glyphicons-halflings-regular.[HASH].woff"), - Path.Combine("ClientApp", "dist", $"inline.[HASH].bundle.js"), - Path.Combine("ClientApp", "dist", $"main.[HASH].bundle.js"), - Path.Combine("ClientApp", "dist", $"polyfills.[HASH].bundle.js"), - Path.Combine("ClientApp", "dist", $"styles.[HASH].bundle.css"), - }) - }, - { "netcoreapp2.2", () => - _additionalFilesAfterPublish["common"]() - .Concat(new[] - { - Path.Combine("ClientApp", "dist", $"runtime.[HASH].js"), - Path.Combine("ClientApp", "dist", $"main.[HASH].js"), - Path.Combine("ClientApp", "dist", $"polyfills.[HASH].js"), - Path.Combine("ClientApp", "dist", $"styles.[HASH].css"), - }) - }, - }; - public override IEnumerable ExpectedFilesAfterPublish => base.ExpectedFilesAfterPublish - .Concat(_additionalFilesAfterPublish[DotNetUtil.TargetFrameworkMoniker]()); + .Concat(new[] + { + Path.Combine("wwwroot", "favicon.ico"), + Path.Combine("ClientApp", "dist", "3rdpartylicenses.txt"), + Path.Combine("ClientApp", "dist", "index.html"), + Path.Combine("ClientApp", "dist", $"runtime.[HASH].js"), + Path.Combine("ClientApp", "dist", $"main.[HASH].js"), + Path.Combine("ClientApp", "dist", $"polyfills.[HASH].js"), + Path.Combine("ClientApp", "dist", $"styles.[HASH].css"), + }); } } diff --git a/test/Cli.FunctionalTests/Templates/MvcTemplate.cs b/test/Cli.FunctionalTests/Templates/MvcTemplate.cs index ca5a9cdf65..2c4514d9f9 100644 --- a/test/Cli.FunctionalTests/Templates/MvcTemplate.cs +++ b/test/Cli.FunctionalTests/Templates/MvcTemplate.cs @@ -1,11 +1,9 @@ // 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 System; using System.Collections.Generic; using System.IO; using System.Linq; -using Cli.FunctionalTests.Util; namespace Cli.FunctionalTests.Templates { @@ -17,33 +15,17 @@ namespace Cli.FunctionalTests.Templates protected override string RazorPath => "Views"; - private IDictionary>> _additionalObjFilesAfterBuild => - new Dictionary>>() - { - { "common", () => new[] - { - Path.Combine("Razor", RazorPath, "_ViewStart.g.cshtml.cs"), - Path.Combine("Razor", RazorPath, "Home", "Index.g.cshtml.cs"), - Path.Combine("Razor", RazorPath, "Home", "Privacy.g.cshtml.cs"), - Path.Combine("Razor", RazorPath, "Shared", "_CookieConsentPartial.g.cshtml.cs"), - Path.Combine("Razor", RazorPath, "Shared", "_Layout.g.cshtml.cs"), - Path.Combine("Razor", RazorPath, "Shared", "_ValidationScriptsPartial.g.cshtml.cs"), - Path.Combine("Razor", RazorPath, "Shared", "Error.g.cshtml.cs"), - } - }, - { "netcoreapp2.1", () => - _additionalObjFilesAfterBuild["common"]() - .Concat(new[] - { - Path.Combine("Razor", RazorPath, "Home", "About.g.cshtml.cs"), - Path.Combine("Razor", RazorPath, "Home", "Contact.g.cshtml.cs"), - }) - }, - { "netcoreapp2.2", () => _additionalObjFilesAfterBuild["common"]() }, - }; - public override IEnumerable ExpectedObjFilesAfterBuild => base.ExpectedObjFilesAfterBuild - .Concat(_additionalObjFilesAfterBuild[DotNetUtil.TargetFrameworkMoniker]().Select(p => Path.Combine(OutputPath, p))); + .Concat(new[] + { + Path.Combine("Razor", RazorPath, "_ViewStart.g.cshtml.cs"), + Path.Combine("Razor", RazorPath, "Home", "Index.g.cshtml.cs"), + Path.Combine("Razor", RazorPath, "Home", "Privacy.g.cshtml.cs"), + Path.Combine("Razor", RazorPath, "Shared", "_CookieConsentPartial.g.cshtml.cs"), + Path.Combine("Razor", RazorPath, "Shared", "_Layout.g.cshtml.cs"), + Path.Combine("Razor", RazorPath, "Shared", "_ValidationScriptsPartial.g.cshtml.cs"), + Path.Combine("Razor", RazorPath, "Shared", "Error.g.cshtml.cs"), + }.Select(p => Path.Combine(OutputPath, p))); } } diff --git a/test/Cli.FunctionalTests/Templates/RazorBootstrapJQueryTemplate.cs b/test/Cli.FunctionalTests/Templates/RazorBootstrapJQueryTemplate.cs index 645ab55dd9..0ddc5a4539 100644 --- a/test/Cli.FunctionalTests/Templates/RazorBootstrapJQueryTemplate.cs +++ b/test/Cli.FunctionalTests/Templates/RazorBootstrapJQueryTemplate.cs @@ -1,94 +1,55 @@ // 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 System; using System.Collections.Generic; using System.IO; using System.Linq; -using Cli.FunctionalTests.Util; namespace Cli.FunctionalTests.Templates { public abstract class RazorBootstrapJQueryTemplate : RazorApplicationBaseTemplate { - private IDictionary>> _additionalFilesAfterPublish => - new Dictionary>>() - { - { "common", () => new[] - { - Path.Combine("wwwroot", "favicon.ico"), - Path.Combine("wwwroot", "css", "site.css"), - Path.Combine("wwwroot", "css", "site.min.css"), - Path.Combine("wwwroot", "images", "banner1.svg"), - Path.Combine("wwwroot", "images", "banner2.svg"), - Path.Combine("wwwroot", "images", "banner3.svg"), - Path.Combine("wwwroot", "js", "site.js"), - Path.Combine("wwwroot", "js", "site.min.js"), - Path.Combine("wwwroot", "lib", "bootstrap", "LICENSE"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.css"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.css.map"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.min.css"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.min.css.map"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.js"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.min.js"), - Path.Combine("wwwroot", "lib", "jquery", ".bower.json"), - Path.Combine("wwwroot", "lib", "jquery", "LICENSE.txt"), - Path.Combine("wwwroot", "lib", "jquery", "dist", "jquery.js"), - Path.Combine("wwwroot", "lib", "jquery", "dist", "jquery.min.js"), - Path.Combine("wwwroot", "lib", "jquery", "dist", "jquery.min.map"), - Path.Combine("wwwroot", "lib", "jquery-validation", ".bower.json"), - Path.Combine("wwwroot", "lib", "jquery-validation", "LICENSE.md"), - Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "additional-methods.js"), - Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "additional-methods.min.js"), - Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "jquery.validate.js"), - Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "jquery.validate.min.js"), - Path.Combine("wwwroot", "lib", "jquery-validation-unobtrusive", "jquery.validate.unobtrusive.js"), - Path.Combine("wwwroot", "lib", "jquery-validation-unobtrusive", "jquery.validate.unobtrusive.min.js"), - Path.Combine("wwwroot", "lib", "jquery-validation-unobtrusive", "LICENSE.txt"), - } - }, - { "netcoreapp2.1", () => - _additionalFilesAfterPublish["common"]() - .Concat(new[] - { - Path.Combine("wwwroot", "lib", "bootstrap", ".bower.json"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-theme.css"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-theme.css.map"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-theme.min.css"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-theme.min.css.map"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "fonts", "glyphicons-halflings-regular.eot"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "fonts", "glyphicons-halflings-regular.svg"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "fonts", "glyphicons-halflings-regular.ttf"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "fonts", "glyphicons-halflings-regular.woff"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "fonts", "glyphicons-halflings-regular.woff2"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "npm.js"), - Path.Combine("wwwroot", "lib", "jquery-validation-unobtrusive", ".bower.json"), - }) - }, - { "netcoreapp2.2", () => - _additionalFilesAfterPublish["common"]() - .Concat(new[] - { - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-grid.css"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-grid.css.map"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-grid.min.css"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-grid.min.css.map"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-reboot.css"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-reboot.css.map"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-reboot.min.css"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-reboot.min.css.map"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.bundle.js"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.bundle.js.map"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.bundle.min.js"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.bundle.min.js.map"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.js.map"), - Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.min.js.map"), - }) - }, - }; - public override IEnumerable ExpectedFilesAfterPublish => base.ExpectedFilesAfterPublish - .Concat(_additionalFilesAfterPublish[DotNetUtil.TargetFrameworkMoniker]()); + .Concat(new[] { + Path.Combine("wwwroot", "favicon.ico"), + Path.Combine("wwwroot", "css", "site.css"), + Path.Combine("wwwroot", "js", "site.js"), + Path.Combine("wwwroot", "lib", "bootstrap", "LICENSE"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.css"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.css.map"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.min.css"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap.min.css.map"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.js"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.min.js"), + Path.Combine("wwwroot", "lib", "jquery", ".bower.json"), + Path.Combine("wwwroot", "lib", "jquery", "LICENSE.txt"), + Path.Combine("wwwroot", "lib", "jquery", "dist", "jquery.js"), + Path.Combine("wwwroot", "lib", "jquery", "dist", "jquery.min.js"), + Path.Combine("wwwroot", "lib", "jquery", "dist", "jquery.min.map"), + Path.Combine("wwwroot", "lib", "jquery-validation", ".bower.json"), + Path.Combine("wwwroot", "lib", "jquery-validation", "LICENSE.md"), + Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "additional-methods.js"), + Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "additional-methods.min.js"), + Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "jquery.validate.js"), + Path.Combine("wwwroot", "lib", "jquery-validation", "dist", "jquery.validate.min.js"), + Path.Combine("wwwroot", "lib", "jquery-validation-unobtrusive", "jquery.validate.unobtrusive.js"), + Path.Combine("wwwroot", "lib", "jquery-validation-unobtrusive", "jquery.validate.unobtrusive.min.js"), + Path.Combine("wwwroot", "lib", "jquery-validation-unobtrusive", "LICENSE.txt"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-grid.css"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-grid.css.map"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-grid.min.css"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-grid.min.css.map"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-reboot.css"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-reboot.css.map"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-reboot.min.css"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "css", "bootstrap-reboot.min.css.map"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.bundle.js"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.bundle.js.map"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.bundle.min.js"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.bundle.min.js.map"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.js.map"), + Path.Combine("wwwroot", "lib", "bootstrap", "dist", "js", "bootstrap.min.js.map"), + }); } } diff --git a/test/Cli.FunctionalTests/Templates/RazorTemplate.cs b/test/Cli.FunctionalTests/Templates/RazorTemplate.cs index 778ef5833d..ab8c235185 100644 --- a/test/Cli.FunctionalTests/Templates/RazorTemplate.cs +++ b/test/Cli.FunctionalTests/Templates/RazorTemplate.cs @@ -1,11 +1,9 @@ // 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 System; using System.Collections.Generic; using System.IO; using System.Linq; -using Cli.FunctionalTests.Util; namespace Cli.FunctionalTests.Templates { @@ -17,33 +15,16 @@ namespace Cli.FunctionalTests.Templates protected override string RazorPath => "Pages"; - private IDictionary>> _additionalObjFilesAfterBuild => - new Dictionary>>() - { - { "common", () => new[] - { - Path.Combine("Razor", RazorPath, "_ViewStart.g.cshtml.cs"), - Path.Combine("Razor", RazorPath, "Error.g.cshtml.cs"), - Path.Combine("Razor", RazorPath, "Index.g.cshtml.cs"), - Path.Combine("Razor", RazorPath, "Privacy.g.cshtml.cs"), - Path.Combine("Razor", RazorPath, "Shared", "_CookieConsentPartial.g.cshtml.cs"), - Path.Combine("Razor", RazorPath, "Shared", "_Layout.g.cshtml.cs"), - Path.Combine("Razor", RazorPath, "Shared", "_ValidationScriptsPartial.g.cshtml.cs"), - } - }, - { "netcoreapp2.1", () => - _additionalObjFilesAfterBuild["common"]() - .Concat(new[] - { - Path.Combine("Razor", RazorPath, "About.g.cshtml.cs"), - Path.Combine("Razor", RazorPath, "Contact.g.cshtml.cs"), - }) - }, - { "netcoreapp2.2", () => _additionalObjFilesAfterBuild["common"]() }, - }; - public override IEnumerable ExpectedObjFilesAfterBuild => base.ExpectedObjFilesAfterBuild - .Concat(_additionalObjFilesAfterBuild[DotNetUtil.TargetFrameworkMoniker]().Select(p => Path.Combine(OutputPath, p))); + .Concat(new[] { + Path.Combine("Razor", RazorPath, "_ViewStart.g.cshtml.cs"), + Path.Combine("Razor", RazorPath, "Error.g.cshtml.cs"), + Path.Combine("Razor", RazorPath, "Index.g.cshtml.cs"), + Path.Combine("Razor", RazorPath, "Privacy.g.cshtml.cs"), + Path.Combine("Razor", RazorPath, "Shared", "_CookieConsentPartial.g.cshtml.cs"), + Path.Combine("Razor", RazorPath, "Shared", "_Layout.g.cshtml.cs"), + Path.Combine("Razor", RazorPath, "Shared", "_ValidationScriptsPartial.g.cshtml.cs"), + }.Select(p => Path.Combine(OutputPath, p))); } } diff --git a/test/Cli.FunctionalTests/Templates/ReactTemplate.cs b/test/Cli.FunctionalTests/Templates/ReactTemplate.cs index 212f4763c5..6cf5f2c1b8 100644 --- a/test/Cli.FunctionalTests/Templates/ReactTemplate.cs +++ b/test/Cli.FunctionalTests/Templates/ReactTemplate.cs @@ -1,12 +1,10 @@ // 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 System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; -using Cli.FunctionalTests.Util; namespace Cli.FunctionalTests.Templates { @@ -23,38 +21,18 @@ namespace Cli.FunctionalTests.Templates .Select(f => Regex.Replace(f, @"\.[0-9a-f]{8}\.", ".[HASH].")); } - private IDictionary>> _additionalFilesAfterPublish => - new Dictionary>>() - { - { "common", () => new[] - { - Path.Combine("ClientApp", "build", "asset-manifest.json"), - Path.Combine("ClientApp", "build", "favicon.ico"), - Path.Combine("ClientApp", "build", "index.html"), - Path.Combine("ClientApp", "build", "manifest.json"), - Path.Combine("ClientApp", "build", "service-worker.js"), - Path.Combine("ClientApp", "build", "static", "css", "main.[HASH].css"), - Path.Combine("ClientApp", "build", "static", "css", "main.[HASH].css.map"), - Path.Combine("ClientApp", "build", "static", "js", "main.[HASH].js"), - Path.Combine("ClientApp", "build", "static", "js", "main.[HASH].js.map"), - } - }, - { "netcoreapp2.1", () => - _additionalFilesAfterPublish["common"]() - .Concat(new[] - { - Path.Combine("ClientApp", "build", "static", "media", "glyphicons-halflings-regular.[HASH].woff2"), - Path.Combine("ClientApp", "build", "static", "media", "glyphicons-halflings-regular.[HASH].svg"), - Path.Combine("ClientApp", "build", "static", "media", "glyphicons-halflings-regular.[HASH].ttf"), - Path.Combine("ClientApp", "build", "static", "media", "glyphicons-halflings-regular.[HASH].eot"), - Path.Combine("ClientApp", "build", "static", "media", "glyphicons-halflings-regular.[HASH].woff"), - }) - }, - { "netcoreapp2.2", () => _additionalFilesAfterPublish["common"]() }, - }; - public override IEnumerable ExpectedFilesAfterPublish => base.ExpectedFilesAfterPublish - .Concat(_additionalFilesAfterPublish[DotNetUtil.TargetFrameworkMoniker]()); + .Concat(new[] { + Path.Combine("ClientApp", "build", "asset-manifest.json"), + Path.Combine("ClientApp", "build", "favicon.ico"), + Path.Combine("ClientApp", "build", "index.html"), + Path.Combine("ClientApp", "build", "manifest.json"), + Path.Combine("ClientApp", "build", "service-worker.js"), + Path.Combine("ClientApp", "build", "static", "css", "main.[HASH].css"), + Path.Combine("ClientApp", "build", "static", "css", "main.[HASH].css.map"), + Path.Combine("ClientApp", "build", "static", "js", "main.[HASH].js"), + Path.Combine("ClientApp", "build", "static", "js", "main.[HASH].js.map"), + }); } } diff --git a/test/Cli.FunctionalTests/Templates/WebTemplate.cs b/test/Cli.FunctionalTests/Templates/WebTemplate.cs index 3571ca6cfc..ea584efb3c 100644 --- a/test/Cli.FunctionalTests/Templates/WebTemplate.cs +++ b/test/Cli.FunctionalTests/Templates/WebTemplate.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using Cli.FunctionalTests.Util; namespace Cli.FunctionalTests.Templates { @@ -17,7 +16,7 @@ namespace Cli.FunctionalTests.Templates public override TemplateType Type => TemplateType.WebApplication; - public override IEnumerable ExpectedObjFilesAfterBuild => + public override IEnumerable ExpectedObjFilesAfterBuild => base.ExpectedObjFilesAfterBuild .Concat(new[] { @@ -26,18 +25,21 @@ namespace Cli.FunctionalTests.Templates $"{Name}.RazorTargetAssemblyInfo.cache", }.Select(p => Path.Combine(OutputPath, p))); - private IDictionary<(string TargetFrameworkMoniker, RuntimeIdentifier), Func>> _additionalFilesAfterPublish => - new Dictionary<(string TargetFrameworkMoniker, RuntimeIdentifier), Func>>() + private IDictionary>> _additionalFilesAfterPublish => + new Dictionary>>() { - { ("netcoreapp2.1", RuntimeIdentifier.None), () => new[] + { RuntimeIdentifier.None, () => new[] { // Publish includes all *.config and *.json files (https://github.com/aspnet/websdk/issues/334) "NuGet.config", "web.config", + + "appsettings.Development.json", + "appsettings.json", } }, - { ("netcoreapp2.1", RuntimeIdentifier.Linux_x64), () => - _additionalFilesAfterPublish[("netcoreapp2.1", RuntimeIdentifier.None)]() + { RuntimeIdentifier.Linux_x64, () => + _additionalFilesAfterPublish[RuntimeIdentifier.None]() .Concat(new[] { "Microsoft.AspNetCore.Antiforgery.dll", @@ -66,6 +68,7 @@ namespace Cli.FunctionalTests.Templates "Microsoft.AspNetCore.Diagnostics.Abstractions.dll", "Microsoft.AspNetCore.Diagnostics.dll", "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.dll", + "Microsoft.AspNetCore.Diagnostics.HealthChecks.dll", "Microsoft.AspNetCore.dll", "Microsoft.AspNetCore.HostFiltering.dll", "Microsoft.AspNetCore.Hosting.Abstractions.dll", @@ -83,7 +86,8 @@ namespace Cli.FunctionalTests.Templates "Microsoft.AspNetCore.Identity.dll", "Microsoft.AspNetCore.Identity.EntityFrameworkCore.dll", "Microsoft.AspNetCore.Identity.UI.dll", - "Microsoft.AspNetCore.Identity.UI.Views.dll", + "Microsoft.AspNetCore.Identity.UI.Views.V3.dll", + "Microsoft.AspNetCore.Identity.UI.Views.V4.dll", "Microsoft.AspNetCore.JsonPatch.dll", "Microsoft.AspNetCore.Localization.dll", "Microsoft.AspNetCore.Localization.Routing.dll", @@ -114,6 +118,7 @@ namespace Cli.FunctionalTests.Templates "Microsoft.AspNetCore.Routing.Abstractions.dll", "Microsoft.AspNetCore.Routing.dll", "Microsoft.AspNetCore.Server.HttpSys.dll", + "Microsoft.AspNetCore.Server.IIS.dll", "Microsoft.AspNetCore.Server.IISIntegration.dll", "Microsoft.AspNetCore.Server.Kestrel.Core.dll", "Microsoft.AspNetCore.Server.Kestrel.dll", @@ -158,6 +163,8 @@ namespace Cli.FunctionalTests.Templates "Microsoft.Extensions.DependencyInjection.dll", "Microsoft.Extensions.DependencyModel.dll", "Microsoft.Extensions.DiagnosticAdapter.dll", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.dll", + "Microsoft.Extensions.Diagnostics.HealthChecks.dll", "Microsoft.Extensions.FileProviders.Abstractions.dll", "Microsoft.Extensions.FileProviders.Composite.dll", "Microsoft.Extensions.FileProviders.Embedded.dll", @@ -179,6 +186,7 @@ namespace Cli.FunctionalTests.Templates "Microsoft.Extensions.Logging.TraceSource.dll", "Microsoft.Extensions.ObjectPool.dll", "Microsoft.Extensions.Options.ConfigurationExtensions.dll", + "Microsoft.Extensions.Options.DataAnnotations.dll", "Microsoft.Extensions.Options.dll", "Microsoft.Extensions.Primitives.dll", "Microsoft.Extensions.WebEncoders.dll", @@ -208,48 +216,11 @@ namespace Cli.FunctionalTests.Templates "System.Threading.Channels.dll", }) }, - { ("netcoreapp2.1", RuntimeIdentifier.OSX_x64), () => - _additionalFilesAfterPublish[("netcoreapp2.1", RuntimeIdentifier.Linux_x64)]() + { RuntimeIdentifier.OSX_x64, () => + _additionalFilesAfterPublish[RuntimeIdentifier.Linux_x64]() }, - { ("netcoreapp2.1", RuntimeIdentifier.Win_x64), () => - _additionalFilesAfterPublish[("netcoreapp2.1", RuntimeIdentifier.Linux_x64)]() - .Concat(new[] - { - "sni.dll", - }) - }, - { ("netcoreapp2.2", RuntimeIdentifier.None), () => - _additionalFilesAfterPublish[("netcoreapp2.1", RuntimeIdentifier.None)]() - .Concat(new[] - { - "appsettings.Development.json", - "appsettings.json", - }) - }, - { ("netcoreapp2.2", RuntimeIdentifier.Linux_x64), () => - _additionalFilesAfterPublish[("netcoreapp2.1", RuntimeIdentifier.Linux_x64)]() - .Except(new[] - { - "Microsoft.AspNetCore.Identity.UI.Views.dll", - }) - .Concat(new[] - { - "appsettings.Development.json", - "appsettings.json", - "Microsoft.AspNetCore.Diagnostics.HealthChecks.dll", - "Microsoft.AspNetCore.Identity.UI.Views.V3.dll", - "Microsoft.AspNetCore.Identity.UI.Views.V4.dll", - "Microsoft.AspNetCore.Server.IIS.dll", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.dll", - "Microsoft.Extensions.Diagnostics.HealthChecks.dll", - "Microsoft.Extensions.Options.DataAnnotations.dll", - }) - }, - { ("netcoreapp2.2", RuntimeIdentifier.OSX_x64), () => - _additionalFilesAfterPublish[("netcoreapp2.2", RuntimeIdentifier.Linux_x64)]() - }, - { ("netcoreapp2.2", RuntimeIdentifier.Win_x64), () => - _additionalFilesAfterPublish[("netcoreapp2.2", RuntimeIdentifier.Linux_x64)]() + { RuntimeIdentifier.Win_x64, () => + _additionalFilesAfterPublish[RuntimeIdentifier.Linux_x64]() .Concat(new[] { "aspnetcorev2_inprocess.dll", @@ -260,6 +231,6 @@ namespace Cli.FunctionalTests.Templates public override IEnumerable ExpectedFilesAfterPublish => base.ExpectedFilesAfterPublish - .Concat(_additionalFilesAfterPublish[(DotNetUtil.TargetFrameworkMoniker, RuntimeIdentifier)]()); + .Concat(_additionalFilesAfterPublish[RuntimeIdentifier]()); } } From db1e4cf3d47b15711b12190315cea2a1df8a9b36 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 27 Sep 2018 10:39:18 -0700 Subject: [PATCH 11/11] Use Microsoft400 for installers signing, not 401 (#1426) 400 only uses a SHA2 cert instead of dual signing. --- eng/targets/Wix.Common.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/Wix.Common.targets b/eng/targets/Wix.Common.targets index ca5a8260ec..20da24a175 100644 --- a/eng/targets/Wix.Common.targets +++ b/eng/targets/Wix.Common.targets @@ -4,7 +4,7 @@ - Microsoft + Microsoft400