Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions eng/cake/dotnet.cake
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,12 @@ void RunMSBuildWithDotNet(
// .SetVerbosity(Verbosity.Diagnostic)
;

var loggerArg = GetMSBuildForwardingLoggerPath();
if (loggerArg != null)
{
msbuildSettings.WithArgumentCustomization(args => args.Append(loggerArg));
}

if (warningsAsError)
{
msbuildSettings.TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error);
Expand Down Expand Up @@ -837,6 +843,12 @@ void RunTestWithLocalDotNet(string csproj, string config, string pathDotnet = nu
// Verbosity = Cake.Common.Tools.DotNetCore.DotNetCoreVerbosity.Diagnostic,
ArgumentCustomization = args =>
{
var loggerArg = GetMSBuildForwardingLoggerPath();
if (loggerArg != null)
{
args.Append(loggerArg);
}

args.Append($"-bl:{binlog}");
if(maxCpuCount > 0)
{
Expand Down Expand Up @@ -938,3 +950,25 @@ void ProcessTFMSwitches()
DeleteFile("Directory.Build.Override.props");
}
}

string GetMSBuildForwardingLoggerPath()
{
if (!IsCIBuild())
return null;

// Download and extract MSBuild logger
var loggerUrl = "https://vstsagenttools.blob.core.windows.net/tools/msbuildlogger/3/msbuildlogger.zip";
var loggerDir = MakeAbsolute(Directory("./artifacts/msbuildlogger"));
EnsureDirectoryExists(loggerDir);
var loggerZip = loggerDir.CombineWithFilePath("msbuildlogger.zip");

if (!FileExists(loggerZip))
{
DownloadFile(loggerUrl, loggerZip.FullPath);
Unzip(loggerZip.FullPath, loggerDir.FullPath);
}

var loggerArg = $"-dl:CentralLogger,\"{loggerDir}/Microsoft.TeamFoundation.DistributedTask.MSBuild.Logger.dll\"*ForwardingLogger,\"{loggerDir}/Microsoft.TeamFoundation.DistributedTask.MSBuild.Logger.dll\"";

return loggerArg;
}
2 changes: 1 addition & 1 deletion src/Core/src/IMauiContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ public interface IMauiContext
Android.Content.Context? Context { get; }
#endif
}
}
}
Loading