Skip to content

Commit e03e116

Browse files
Update SDK version (#33719)
* Update SDK version * Update TemplatePackageInstaller.cs * Update TemplatePackageInstaller.cs * Update global.json * Update global.json * Remove COREHOSTTRACE logging Co-authored-by: Sébastien Ros <[email protected]>
1 parent 2af293d commit e03e116

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.100-preview.6.21313.2"
3+
"version": "6.0.100-preview.7.21324.2"
44
},
55
"tools": {
6-
"dotnet": "6.0.100-preview.6.21313.2",
6+
"dotnet": "6.0.100-preview.7.21324.2",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.27",

src/ProjectTemplates/Shared/Project.cs

-2
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ internal async Task<ProcessResult> RunDotNetNewAsync(
109109
Directory.Delete(TemplateOutputDir, recursive: true);
110110
}
111111

112-
// Temporary while investigating why this process occasionally never runs or exits on Debian 9
113-
environmentVariables.Add("COREHOST_TRACE", "1");
114112
using var execution = ProcessEx.Run(Output, AppContext.BaseDirectory, DotNetMuxer.MuxerPathOrDefault(), argString, environmentVariables);
115113
await execution.Exited;
116114
return new ProcessResult(execution);

src/ProjectTemplates/Shared/TemplatePackageInstaller.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ private static async Task InstallTemplatePackages(ITestOutputHelper output)
128128

129129
private static async Task VerifyCanFindTemplate(ITestOutputHelper output, string templateName)
130130
{
131-
var proc = await RunDotNetNew(output, $"");
132-
if (!proc.Output.Contains($" {templateName} "))
131+
var proc = await RunDotNetNew(output, $"--list");
132+
if (!(proc.Output.Contains($" {templateName} ") || proc.Output.Contains($",{templateName}") || proc.Output.Contains($"{templateName},")))
133133
{
134134
throw new InvalidOperationException($"Couldn't find {templateName} as an option in {proc.Output}.");
135135
}

0 commit comments

Comments
 (0)