Skip to content

Commit 81d1aee

Browse files
authored
Cleanup from passing PR to remove the diagnostics info
1 parent 1188193 commit 81d1aee

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

src/Tasks/sdk-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static string ExecuteInternal(
5959
string microsoftNETCoreAppRefPackageVersion,
6060
string newSDKVersion,
6161
string targetRid,
62-
TaskLoggingHelper log = null)
62+
TaskLoggingHelper log)
6363
{
6464
var projectXml = XDocument.Parse(stage0MicrosoftNETCoreAppRefPackageVersionContent);
6565

@@ -102,14 +102,13 @@ void CheckAndReplaceElement(XElement element)
102102
element.ToString(), element.Value, originalBundledNETCoreAppPackageVersion));
103103
}
104104

105-
log?.LogMessage(MessageImportance.High,
105+
log.LogMessage(MessageImportance.High,
106106
$"Replacing element {element.Name} value '{element.Value}' with '{newBundledPackageVersion}'");
107107
element.Value = newBundledPackageVersion;
108108
}
109109

110110
void CheckAndReplaceAttribute(XAttribute attribute)
111111
{
112-
113112
if (attribute.Value != originalBundledNETCoreAppPackageVersion)
114113
{
115114
throw new InvalidOperationException(string.Format(
@@ -118,7 +117,7 @@ void CheckAndReplaceAttribute(XAttribute attribute)
118117
originalBundledNETCoreAppPackageVersion));
119118
}
120119

121-
log?.LogMessage(MessageImportance.High,
120+
log.LogMessage(MessageImportance.High,
122121
$"Replacing attribute {attribute.Name} value '{attribute.Value}' with '{newBundledPackageVersion}' in element {attribute.Parent.Name}");
123122
attribute.Value = newBundledPackageVersion;
124123
}

test/EndToEnd.Tests/GivenDotNetUsesMSBuild.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void ItCanNewRestoreBuildRunCleanMSBuildProject()
2727

2828
new DotnetCommand(Log, "run")
2929
.WithWorkingDirectory(projectDirectory)
30-
.Execute("/bl:helixfailure.binlog")
30+
.Execute()
3131
.Should().Pass()
3232
.And.HaveStdOutContaining("Hello, World!");
3333

test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ public void NativeAot_compiler_runs_when_PublishAot_is_enabled(string targetFram
728728

729729
var publishCommand = new PublishCommand(testAsset);
730730
publishCommand
731-
.Execute("/bl:helixfailure.binlog")
731+
.Execute()
732732
.Should().Pass()
733733
.And.HaveStdOutContaining("warning IL3050")
734734
.And.HaveStdOutContaining("warning IL3056")

test/UnitTests.proj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@
139139
<HelixPostCommands Condition="!$(IsPosixShell)">PowerShell -ExecutionPolicy ByPass "dotnet nuget locals all -l | ForEach-Object { $_.Split(' ')[1]} | Where-Object{$_ -like '*cache'} | Get-ChildItem -Recurse -File -Filter '*.dat' | Measure";$(HelixPostCommands)</HelixPostCommands>
140140
<HelixPostCommands Condition="!$(IsPosixShell)">PowerShell -ExecutionPolicy ByPass "Get-ChildItem -Recurse -File -Filter '*hangdump.dmp' | Copy-Item -Destination $env:HELIX_WORKITEM_UPLOAD_ROOT";$(HelixPostCommands)</HelixPostCommands>
141141
<HelixPostCommands Condition="$(IsPosixShell)">find "$HELIX_WORKITEM_UPLOAD_ROOT/../../.." -name '*hangdump.dmp' -exec cp {} "$HELIX_WORKITEM_UPLOAD_ROOT" \%3B;$(HelixPostCommands)</HelixPostCommands>
142-
<HelixPostCommands Condition="$(IsPosixShell)">find "$HELIX_WORKITEM_UPLOAD_ROOT/../../.." -name '*helixfailure.binlog' -exec cp {} "$HELIX_WORKITEM_UPLOAD_ROOT" \%3B;$(HelixPostCommands)</HelixPostCommands>
143142
<TestDotnetVersion>$(Version)</TestDotnetVersion>
144143
<MSBuildSdkResolverDir>$(RepoRoot)artifacts\bin\Microsoft.DotNet.MSBuildSdkResolver</MSBuildSdkResolverDir>
145144
<HelixStage0Targz>$(RepoRoot)artifacts\tmp\HelixStage0.tar.gz</HelixStage0Targz>

test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public void RunTestProjectWithTestsAndLaunchSettings_ShouldReturnExitCodeSuccess
132132

133133
CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
134134
.WithWorkingDirectory(testInstance.Path)
135-
.Execute(TestingPlatformOptions.ConfigurationOption.Name, configuration, "/bl:helixfailure.binlog");
135+
.Execute(TestingPlatformOptions.ConfigurationOption.Name, configuration);
136136

137137
if (!TestContext.IsLocalized())
138138
{

0 commit comments

Comments
 (0)