Skip to content

Commit 1177acc

Browse files
authored
push improved MSBuildLogger to a separate project in case we want to spin it off (#49751)
1 parent 85ed77f commit 1177acc

File tree

10 files changed

+354
-102
lines changed

10 files changed

+354
-102
lines changed

src/Containers/Microsoft.NET.Build.Containers/Logging/MSBuildLogger.cs

Lines changed: 0 additions & 62 deletions
This file was deleted.

src/Containers/Microsoft.NET.Build.Containers/Logging/MSBuildLoggerProvider.cs

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
</PropertyGroup>
2626

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

3737
<ItemGroup>

src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Text.Json.Nodes;
66
using Microsoft.Build.Framework;
77
using Microsoft.Extensions.Logging;
8-
using Microsoft.NET.Build.Containers.Logging;
8+
using Microsoft.Extensions.Logging.MSBuild;
99
using Microsoft.NET.Build.Containers.Resources;
1010
using ILogger = Microsoft.Extensions.Logging.ILogger;
1111
using Task = System.Threading.Tasks.Task;

src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using Microsoft.Build.Framework;
55
using Microsoft.Extensions.Logging;
6-
using Microsoft.NET.Build.Containers.Logging;
6+
using Microsoft.Extensions.Logging.MSBuild;
77
using Microsoft.NET.Build.Containers.Resources;
88
using ILogger = Microsoft.Extensions.Logging.ILogger;
99

src/Containers/packaging/package.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
SetTargetFramework="TargetFramework=$(TargetFramework)"
2929
OutputItemType="ContainerLibraryOutput"/>
3030

31-
<ProjectReference Include="../../Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj"
32-
SetTargetFramework="TargetFramework=$(ResolverTargetFramework)"
33-
OutputItemType="DotNetCliUtilsLibraryOutput"/>
34-
3531
<ProjectReference Include="../Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj"
3632
SetTargetFramework="TargetFramework=$(VSCompatTargetFramework)"
3733
OutputItemType="ContainerLibraryOutputNet472" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
@@ -86,15 +82,14 @@
8682
$([MSBuild]::ValueOrDefault('%(_AllNetContainerTaskDependencies.NuGetPackageId)', '').Contains('Microsoft.Extensions'))
8783
) and
8884
%(_AllNetContainerTaskDependencies.NuGetIsFrameworkReference) != true" />
89-
85+
<NecessaryNetContainerTaskDependencies Include="@(_AllNetContainerTaskDependencies)" Condition="'%(_AllNetContainerTaskDependencies.ReferenceSourceTarget)' == 'ProjectReference'" />
9086
<!-- root folder -->
9187
<Content Include="README.md" Pack="true" PackagePath="" />
9288

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

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

0 commit comments

Comments
 (0)