Merge branch 'main' of https://github.com/dotnet/sdk into merge/release/9.0.3xx-to-main

Author: Simon Zhao (BEYONDSOFT CONSULTING INC)

src/Cli/Microsoft.DotNet.Cli.Utils/Constants.cs

@@ -19,7 +19,9 @@ public static class Constants
 
     public static readonly string MSBUILD_EXE_PATH = nameof(MSBUILD_EXE_PATH);
     public static readonly string MSBuildExtensionsPath = nameof(MSBuildExtensionsPath);
+
     public static readonly string EnableDefaultItems = nameof(EnableDefaultItems);
+    public static readonly string EnableDefaultContentItems = nameof(EnableDefaultContentItems);
     public static readonly string EnableDefaultCompileItems = nameof(EnableDefaultCompileItems);
     public static readonly string EnableDefaultEmbeddedResourceItems = nameof(EnableDefaultEmbeddedResourceItems);
     public static readonly string EnableDefaultNoneItems = nameof(EnableDefaultNoneItems);

src/Cli/dotnet/Commands/Restore/RestoringCommand.cs

@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Collections.Frozen;
 using System.Collections.ObjectModel;
 using Microsoft.DotNet.Cli.Commands.MSBuild;
 using Microsoft.DotNet.Cli.Commands.Workload.Install;
@@ -12,7 +11,6 @@ namespace Microsoft.DotNet.Cli.Commands.Restore;
 
 public class RestoringCommand : MSBuildForwardingApp
 {
-
     /// <summary>
     /// This dictionary contains properties that are set to disable the default items
     /// that are added to the project by default. These Item types are not needed
@@ -22,7 +20,9 @@ public class RestoringCommand : MSBuildForwardingApp
     public static ReadOnlyDictionary<string, string> RestoreOptimizationProperties =>
         new(new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
         {
-            { Constants.EnableDefaultItems, "false" },
+            // note that we do not disable all default items - Razor at least needs Content
+            // in order to do implicit PackageReferences if Razor files are present
+            { Constants.EnableDefaultCompileItems, "false" },
             { Constants.EnableDefaultEmbeddedResourceItems, "false" },
             { Constants.EnableDefaultNoneItems, "false" },
         });

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

@@ -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>

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

@@ -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;

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

@@ -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;
 

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

@@ -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'" />
@@ -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)" />

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

@@ -1,2 +1,6 @@
 #!/bin/sh
+
+# Licensed to the .NET Foundation under one or more agreements.
+# The .NET Foundation licenses this file to you under the MIT license.
+
 "$(dirname "$0")/dotnet" dnx "$@"

src/Containers/packaging/package.csproj

@@ -1,2 +1,5 @@
+:: Licensed to the .NET Foundation under one or more agreements.
+:: The .NET Foundation licenses this file to you under the MIT license.
+
 @echo off
 "%~dp0dotnet.exe" dnx %*