Skip to content

Commit 0ced048

Browse files
committed
Cleanup
1 parent 7d2e035 commit 0ced048

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,6 @@
9191
<_DestinationFiles Include="@(_FilesToCopy->'$(TemplateTestDotNetRoot)%(DestinationRelativeFolder)%(RecursiveDir)%(Filename)%(Extension)')" />
9292
</ItemGroup>
9393

94-
<Message Importance="High" Text="IsHelixJob = '$(IsHelixJob)'" />
95-
<Message Importance="High" Text="Copying files..." />
96-
<Message Importance="High" Text="Copying to %(_DestinationFiles.Identity)" />
97-
9894
<Copy SourceFiles="@(_FilesToCopy)"
9995
DestinationFiles="@(_DestinationFiles)"
10096
SkipUnchangedFiles="true" />

src/Shared/CommandLineUtils/Utilities/DotNetMuxer.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,15 @@ public static string MuxerPathOrDefault()
4242

4343
private static string? TryFindMuxerPath()
4444
{
45+
// If not running on Helix, use a custom .NET host, if specified.
46+
// This allows test projects to use a .NET host with the custom-built
47+
// ASP.NET Core shared framework.
4548
if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix")))
4649
{
4750
var dotNetHostOverride = typeof(DotNetMuxer).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
4851
.SingleOrDefault(a => a.Key == "DotNetHostOverride")?.Value;
4952
if (dotNetHostOverride is not null)
5053
{
51-
Console.WriteLine("Resolved .NET host from DotNetHostOverride metadata attribute: " + dotNetHostOverride);
5254
return dotNetHostOverride;
5355
}
5456
}
@@ -64,7 +66,6 @@ public static string MuxerPathOrDefault()
6466
var mainModuleFileName = Path.GetFileName(mainModuleFullPath);
6567
if (string.Equals(expectedFileName, mainModuleFileName, StringComparison.OrdinalIgnoreCase))
6668
{
67-
Console.WriteLine("Resolved .NET host from currently running process: " + mainModuleFullPath);
6869
return mainModuleFullPath;
6970
}
7071

@@ -77,11 +78,9 @@ public static string MuxerPathOrDefault()
7778
if (File.Exists(candidateDotNetExePath))
7879
{
7980
var normalizedPath = Path.GetFullPath(candidateDotNetExePath);
80-
Console.WriteLine("Resolved .NET host from CLR location: " + mainModuleFullPath);
8181
return normalizedPath;
8282
}
8383

84-
Console.WriteLine("Could not resolve .NET host: using default value");
8584
return null;
8685
}
8786
}

0 commit comments

Comments
 (0)