Skip to content

push improved MSBuildLogger to a separate project in case we want to spin it off #49751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 15, 2025
Merged

push improved MSBuildLogger to a separate project in case we want to spin it off #49751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
395a0e5
push improved MSBuildLogger to a separate project in case we want to …
baronfel Jul 12, 2025
0febdbe
correct packaging to account for the new dependency
baronfel Jul 12, 2025
e116342
more nuanced IsEnabled check
baronfel Jul 12, 2025
72276d3
add support for warning/error helpLink
baronfel Jul 13, 2025
f057254
more efficient state processing
baronfel Jul 13, 2025
8720d27
make logger creation and tracking more threadsafe
baronfel Jul 13, 2025
7fe2868
lock around the entire dictionary read to prevent read/write out of sync
baronfel Jul 13, 2025
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
62 changes: 0 additions & 62 deletions src/Containers/Microsoft.NET.Build.Containers/Logging/MSBuildLogger.cs
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions src/Containers/Microsoft.NET.Build.Containers/Logging/MSBuildLoggerProvider.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\Cli\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj"
Condition="'$(TargetFramework)' != 'net472'">
<ProjectReference Include="..\..\Cli\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj" Condition="'$(TargetFramework)' != 'net472'">
<!-- This is referenced by the core CLI as well so it doesn't need to be redistributed
in the containers task folder. -->
<IncludeAssets>build</IncludeAssets>
<Private>false</Private>
</ProjectReference>
<ProjectReference Include="..\..\Microsoft.Extensions.Logging.MSBuild\Microsoft.Extensions.Logging.MSBuild.csproj" Condition="'$(TargetFramework)' != 'net472'" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Text.Json.Nodes;
using Microsoft.Build.Framework;
using Microsoft.Extensions.Logging;
using Microsoft.NET.Build.Containers.Logging;
using Microsoft.Extensions.Logging.MSBuild;
using Microsoft.NET.Build.Containers.Resources;
using ILogger = Microsoft.Extensions.Logging.ILogger;
using Task = System.Threading.Tasks.Task;
Expand Down
2 changes: 1 addition & 1 deletion src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using Microsoft.Build.Framework;
using Microsoft.Extensions.Logging;
using Microsoft.NET.Build.Containers.Logging;
using Microsoft.Extensions.Logging.MSBuild;
using Microsoft.NET.Build.Containers.Resources;
using ILogger = Microsoft.Extensions.Logging.ILogger;

Expand Down
7 changes: 1 addition & 6 deletions src/Containers/packaging/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
SetTargetFramework="TargetFramework=$(TargetFramework)"
OutputItemType="ContainerLibraryOutput"/>

<ProjectReference Include="../../Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj"
SetTargetFramework="TargetFramework=$(ResolverTargetFramework)"
OutputItemType="DotNetCliUtilsLibraryOutput"/>

<ProjectReference Include="../Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj"
SetTargetFramework="TargetFramework=$(VSCompatTargetFramework)"
OutputItemType="ContainerLibraryOutputNet472" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
Expand Down Expand Up @@ -86,15 +82,14 @@
$([MSBuild]::ValueOrDefault('%(_AllNetContainerTaskDependencies.NuGetPackageId)', '').Contains('Microsoft.Extensions'))
) and
%(_AllNetContainerTaskDependencies.NuGetIsFrameworkReference) != true" />

<NecessaryNetContainerTaskDependencies Include="@(_AllNetContainerTaskDependencies)" Condition="'%(_AllNetContainerTaskDependencies.ReferenceSourceTarget)' == 'ProjectReference'" />
<!-- root folder -->
<Content Include="README.md" Pack="true" PackagePath="" />

<!-- tasks folder -->
<!-- net7.0 tasks -->
<!-- dependencies -->
<Content Include="@(NecessaryNetContainerTaskDependencies)" Pack="true" PackagePath="tasks/$(TargetFramework)/" />
<Content Include="@(DotNetCliUtilsLibraryOutput)" Pack="true" PackagePath="tasks/$(TargetFramework)/" />

<!-- runtime deps json -->
<Content Include="$(ArtifactsDir)bin/Microsoft.NET.Build.Containers/$(Configuration)/$(TargetFramework)/Microsoft.NET.Build.Containers.deps.json" Pack="true" PackagePath="tasks/$(TargetFramework)" />
Expand Down
Loading