Fix for CI agents having extra template package already installed

This commit is contained in:
Steve Sanderson 2017-09-11 18:41:58 +01:00
parent b38f0dbc7a
commit 8c0dd1d2cc
1 changed files with 6 additions and 1 deletions

View File

@ -19,6 +19,11 @@ namespace Templates.Test.Helpers
"Microsoft.AspNetCore.SpaTemplates", "Microsoft.AspNetCore.SpaTemplates",
}; };
private static readonly string[] _extraTemplatePackagesToUninstall = new[]
{
"Microsoft.DotNet.Web.ProjectTemplates.2.1",
};
public static void EnsureTemplatePackagesWereReinstalled(ITestOutputHelper output) public static void EnsureTemplatePackagesWereReinstalled(ITestOutputHelper output)
{ {
lock (_templatePackagesReinstallationLock) lock (_templatePackagesReinstallationLock)
@ -34,7 +39,7 @@ namespace Templates.Test.Helpers
private static void ReinstallTemplatePackages(ITestOutputHelper output) private static void ReinstallTemplatePackages(ITestOutputHelper output)
{ {
// Remove any previous or prebundled version of the template packages // 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( var proc = ProcessEx.Run(
output, output,