reference-list: Expand includes (#49168)

Co-authored-by: Michael Yanni <miyanni@microsoft.com>

Author: edvilme

eng/restore-toolset.ps1

@@ -105,7 +105,7 @@ function CreateVSShortcut()
   $slnPath = Join-Path $RepoRoot 'sdk.slnx'
   $commandToLaunch = "& '$scriptPath'; & '$devenvPath' '$slnPath'"
   $powershellPath = '%SystemRoot%\system32\WindowsPowerShell\v1.0\powershell.exe'
-  $shortcutPath = Join-Path $ArtifactsDir 'VS with sdk.sln.lnk'
+  $shortcutPath = Join-Path $ArtifactsDir 'VS with sdk.slnx.lnk'
 
   # https://stackoverflow.com/a/9701907/294804
   # https://learn.microsoft.com/en-us/troubleshoot/windows-client/admin-development/create-desktop-shortcut-with-wsh

sdk.slnx

@@ -85,6 +85,7 @@
     <Project Path="src/Containers/packaging/package.csproj" />
   </Folder>
   <Folder Name="/src/Layout/">
+    <Project Path="src/Layout/finalizer/finalizer.csproj" />
     <Project Path="src/Layout/pkg/dotnet-sdk.proj" Type="C#" />
     <Project Path="src/Layout/redist/redist.csproj" />
     <Project Path="src/Layout/redist/tools/tool_fsc.csproj" />
@@ -96,7 +97,6 @@
     <Project Path="src/Layout/VS.Redist.Common.NetCore.SdkPlaceholder/VS.Redist.Common.NetCore.SdkPlaceholder.proj" Type="C#" />
     <Project Path="src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj" Type="C#" />
     <Project Path="src/Layout/VS.Redist.Common.NetCore.Toolset/VS.Redist.Common.NetCore.Toolset.proj" Type="C#" />
-    <Project Path="src/Tasks/sdk-tasks/sdk-tasks.csproj" />
   </Folder>
   <Folder Name="/src/RazorSdk/" />
   <Folder Name="/src/RazorSdk/Sdk/">
@@ -168,6 +168,7 @@
     <Project Path="src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj" />
     <Project Path="src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj" />
     <Project Path="src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj" />
+    <Project Path="src/Tasks/sdk-tasks/sdk-tasks.csproj" />
   </Folder>
   <Folder Name="/src/WasmSdk/" />
   <Folder Name="/src/WasmSdk/Targets/">
@@ -352,5 +353,4 @@
   <Folder Name="/test/Compatibility/GenAPI/">
     <Project Path="test/Microsoft.DotNet.GenAPI.Tests/Microsoft.DotNet.GenAPI.Tests.csproj" />
   </Folder>
-  <Project Path="src/Layout/finalizer/finalizer.csproj" />
 </Solution>

src/Cli/dotnet/Commands/Reference/List/ReferenceListCommand.cs

@@ -4,7 +4,10 @@
 #nullable disable
 
 using System.CommandLine;
+using Microsoft.Build.Construction;
 using Microsoft.Build.Evaluation;
+using Microsoft.Build.Exceptions;
+using Microsoft.Build.Execution;
 using Microsoft.DotNet.Cli.Commands.Hidden.List;
 using Microsoft.DotNet.Cli.Extensions;
 using Microsoft.DotNet.Cli.Utils;
@@ -15,8 +18,7 @@ internal class ReferenceListCommand : CommandBase
 {
     private readonly string _fileOrDirectory;
 
-    public ReferenceListCommand(
-        ParseResult parseResult) : base(parseResult)
+    public ReferenceListCommand(ParseResult parseResult) : base(parseResult)
     {
         ShowHelpOrErrorIfAppropriate(parseResult);
 
@@ -29,22 +31,30 @@ public ReferenceListCommand(
     public override int Execute()
     {
         var msbuildProj = MsbuildProject.FromFileOrDirectory(new ProjectCollection(), _fileOrDirectory, false);
-
         var p2ps = msbuildProj.GetProjectToProjectReferences();
         if (!p2ps.Any())
         {
-            Reporter.Output.WriteLine(string.Format(
-                                          CliStrings.NoReferencesFound,
-                                          CliStrings.P2P,
-                                          _fileOrDirectory));
+            Reporter.Output.WriteLine(string.Format(CliStrings.NoReferencesFound, CliStrings.P2P, _fileOrDirectory));
+            return 0;
+        }
+
+        ProjectRootElement projectRootElement;
+        try
+        {
+            projectRootElement = ProjectRootElement.Open(_fileOrDirectory);
+        }
+        catch (InvalidProjectFileException ex)
+        {
+            Reporter.Error.WriteLine(string.Format(CliStrings.InvalidProjectWithExceptionMessage, _fileOrDirectory, ex.Message));
             return 0;
         }
 
+        ProjectInstance projectInstance = new(projectRootElement);
         Reporter.Output.WriteLine($"{CliStrings.ProjectReferenceOneOrMore}");
         Reporter.Output.WriteLine(new string('-', CliStrings.ProjectReferenceOneOrMore.Length));
-        foreach (var p2p in p2ps)
+        foreach (var item in projectInstance.GetItems("ProjectReference"))
         {
-            Reporter.Output.WriteLine(p2p.Include);
+            Reporter.Output.WriteLine(item.EvaluatedInclude);
         }
 
         return 0;

test/dotnet.Tests/CommandTests/Reference/List/GivenDotnetListReference.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Xml;
 using Microsoft.DotNet.Cli.Utils;
 using Msbuild.Tests.Utilities;
 
@@ -207,6 +208,26 @@ public void ItPrintsMultipleReferences()
             cmd.StdOut.Should().BeVisuallyEquivalentTo(OutputText);
         }
 
+        [Fact]
+        public void ItPrintsReferenceWithMSBuildPropertyInPath()
+        {
+            var testDir = _testAssetsManager.CreateTestDirectory().Path;
+            var lib = NewLib(testDir, "lib");
+            string OutputText = CliStrings.ProjectReferenceOneOrMore;
+            OutputText += $@"
+{new string('-', OutputText.Length)}
+{lib.Path}..\ref1\ref1.csproj";
+
+            string ref1Name = NewLib(testDir, "ref1").CsProjName;
+            AddInvalidRef($"$(MSBuildThisFileDirectory)..\\ref1\\{ref1Name}", lib);
+
+            var cmd = new ListReferenceCommand(Log)
+                .WithProject(lib.CsProjPath)
+                .Execute();
+            cmd.Should().Pass();
+            cmd.StdOut.Should().BeVisuallyEquivalentTo(OutputText);
+        }
+
         private TestSetup Setup([System.Runtime.CompilerServices.CallerMemberName] string callingMethod = nameof(Setup), string identifier = "")
         {
             return new TestSetup(
@@ -243,5 +264,19 @@ private void AddValidRef(string path, ProjDir proj)
                 .Execute(path)
                 .Should().Pass();
         }
+
+        private static void AddInvalidRef(string referenceValue, ProjDir proj)
+        {
+            var csprojXml = new XmlDocument();
+            csprojXml.Load(proj.CsProjPath);
+
+            var projectReference = csprojXml.CreateElement("ProjectReference");
+            projectReference.SetAttribute("Include", referenceValue);
+            csprojXml.DocumentElement
+                ?.AppendChild(csprojXml.CreateElement("ItemGroup"))
+                ?.AppendChild(projectReference);
+
+            csprojXml.Save(proj.CsProjPath);
+        }
     }
 }