From 626e844d35f8f999a1e247e126d79199aa2f2abb Mon Sep 17 00:00:00 2001 From: Brennan Date: Mon, 21 Jun 2021 10:58:34 -0700 Subject: [PATCH 1/6] Update SDK version --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 3a464ec16615..f1f5f2e9361b 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "6.0.100-preview.6.21313.2" + "version": "6.0.100-preview.7.21321.5" }, "tools": { - "dotnet": "6.0.100-preview.6.21313.2", + "dotnet": "6.0.100-preview.7.21321.5", "runtimes": { "dotnet/x64": [ "2.1.27", From 52d6d42723e42a27702818fae54fd8afd937995e Mon Sep 17 00:00:00 2001 From: Brennan Date: Mon, 21 Jun 2021 13:00:40 -0700 Subject: [PATCH 2/6] Update TemplatePackageInstaller.cs --- src/ProjectTemplates/Shared/TemplatePackageInstaller.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs b/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs index 9a6c698ffb33..26a9e300a37c 100644 --- a/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs +++ b/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs @@ -129,7 +129,7 @@ private static async Task InstallTemplatePackages(ITestOutputHelper output) private static async Task VerifyCanFindTemplate(ITestOutputHelper output, string templateName) { var proc = await RunDotNetNew(output, $""); - if (!proc.Output.Contains($" {templateName} ")) + if (!(proc.Output.Contains($" {templateName} ") || proc.Output.Contains($",{templateName}") || proc.Output.Contains($"{templateName},"))) { throw new InvalidOperationException($"Couldn't find {templateName} as an option in {proc.Output}."); } From f0eaf6bf2a8c1f316713e5fd363ba8ce762e5488 Mon Sep 17 00:00:00 2001 From: Brennan Date: Mon, 21 Jun 2021 14:31:43 -0700 Subject: [PATCH 3/6] Update TemplatePackageInstaller.cs --- src/ProjectTemplates/Shared/TemplatePackageInstaller.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs b/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs index 26a9e300a37c..b50068b3e59e 100644 --- a/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs +++ b/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs @@ -128,7 +128,7 @@ private static async Task InstallTemplatePackages(ITestOutputHelper output) private static async Task VerifyCanFindTemplate(ITestOutputHelper output, string templateName) { - var proc = await RunDotNetNew(output, $""); + var proc = await RunDotNetNew(output, $"--list"); if (!(proc.Output.Contains($" {templateName} ") || proc.Output.Contains($",{templateName}") || proc.Output.Contains($"{templateName},"))) { throw new InvalidOperationException($"Couldn't find {templateName} as an option in {proc.Output}."); From 54b0d2934e0af86c4ff86238367673d03221b0f3 Mon Sep 17 00:00:00 2001 From: Brennan Date: Tue, 22 Jun 2021 16:29:27 -0700 Subject: [PATCH 4/6] Update global.json --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index f1f5f2e9361b..127387bf7b9d 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "6.0.100-preview.7.21321.5" + "version": "6.0.100-preview.7.21322.1" }, "tools": { - "dotnet": "6.0.100-preview.7.21321.5", + "dotnet": "6.0.100-preview.7.21322.1", "runtimes": { "dotnet/x64": [ "2.1.27", From fd22cc6a22a1524cc2815cab87742a8c459874a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Thu, 24 Jun 2021 14:42:08 -0700 Subject: [PATCH 5/6] Update global.json --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 127387bf7b9d..6ae4d587b6d4 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "6.0.100-preview.7.21322.1" + "version": "6.0.100-preview.7.21324.2" }, "tools": { - "dotnet": "6.0.100-preview.7.21322.1", + "dotnet": "6.0.100-preview.7.21324.2", "runtimes": { "dotnet/x64": [ "2.1.27", From 788bf61c05f7e0d12b122abae25a2a04d534232c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Fri, 25 Jun 2021 09:22:18 -0700 Subject: [PATCH 6/6] Remove COREHOSTTRACE logging --- src/ProjectTemplates/Shared/Project.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/ProjectTemplates/Shared/Project.cs b/src/ProjectTemplates/Shared/Project.cs index dfb6129f6aaf..37024ae9c0a7 100644 --- a/src/ProjectTemplates/Shared/Project.cs +++ b/src/ProjectTemplates/Shared/Project.cs @@ -109,8 +109,6 @@ internal async Task RunDotNetNewAsync( Directory.Delete(TemplateOutputDir, recursive: true); } - // Temporary while investigating why this process occasionally never runs or exits on Debian 9 - environmentVariables.Add("COREHOST_TRACE", "1"); using var execution = ProcessEx.Run(Output, AppContext.BaseDirectory, DotNetMuxer.MuxerPathOrDefault(), argString, environmentVariables); await execution.Exited; return new ProcessResult(execution);