From 8c0dd1d2cc49a74868d8765b401ee038a0c36a5c Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 11 Sep 2017 18:41:58 +0100 Subject: [PATCH] Fix for CI agents having extra template package already installed --- test/Templates.Test/Helpers/TemplatePackageInstaller.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/Templates.Test/Helpers/TemplatePackageInstaller.cs b/test/Templates.Test/Helpers/TemplatePackageInstaller.cs index 05891572a7..42c294d786 100644 --- a/test/Templates.Test/Helpers/TemplatePackageInstaller.cs +++ b/test/Templates.Test/Helpers/TemplatePackageInstaller.cs @@ -19,6 +19,11 @@ namespace Templates.Test.Helpers "Microsoft.AspNetCore.SpaTemplates", }; + private static readonly string[] _extraTemplatePackagesToUninstall = new[] + { + "Microsoft.DotNet.Web.ProjectTemplates.2.1", + }; + public static void EnsureTemplatePackagesWereReinstalled(ITestOutputHelper output) { lock (_templatePackagesReinstallationLock) @@ -34,7 +39,7 @@ namespace Templates.Test.Helpers private static void ReinstallTemplatePackages(ITestOutputHelper output) { // Remove any previous or prebundled version of the template packages - foreach (var packageName in _templatePackages) + foreach (var packageName in _templatePackages.Concat(_extraTemplatePackagesToUninstall)) { var proc = ProcessEx.Run( output,