a lot more consolidation

eng/Analyzers.props

@@ -3,8 +3,10 @@
     <PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" Condition="'$(EnableStyleCopAnalyzer)' == 'true'" />
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" PrivateAssets="all" Condition="$(MSBuildProjectDirectory.Contains('src\Cli')) OR $(MSBuildProjectDirectory.Contains('src/Cli'))" />
   </ItemGroup>
-
-  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' AND ($(MSBuildProjectDirectory.Contains('src\Cli')) OR $(MSBuildProjectDirectory.Contains('src/Cli')))">
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'
+      AND ($(MSBuildProjectDirectory.Contains('src\Cli')) OR $(MSBuildProjectDirectory.Contains('src/Cli')))
+      AND (!$(MSBuildProjectDirectory.Contains('FileBasedPrograms')))">
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)../BannedSymbols.txt" />
   </ItemGroup>
-</Project>
+</Project>

src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/MSBuildProjectExtensions.cs

@@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Utils.Extensions;
 
 internal static class MSBuildProjectExtensions
 {
-    public static bool IsConditionalOnFramework(this ProjectElement el, string framework)
+    public static bool IsConditionalOnFramework(this ProjectElement el, string? framework)
     {
         if (!TryGetFrameworkConditionString(framework, out string? conditionStr))
         {
@@ -72,12 +72,12 @@ public static bool IsUniformItemElementType(this ProjectItemGroupElement group,
         return group.Items.All((it) => it.ItemType == projectItemElementType);
     }
 
-    public static IEnumerable<ProjectItemElement> FindExistingItemsWithCondition(this ProjectRootElement root, string framework, string include)
+    public static IEnumerable<ProjectItemElement> FindExistingItemsWithCondition(this ProjectRootElement root, string? framework, string include)
     {
         return root.Items.Where((el) => el.IsConditionalOnFramework(framework) && el.HasInclude(include));
     }
 
-    public static bool HasExistingItemWithCondition(this ProjectRootElement root, string framework, string include)
+    public static bool HasExistingItemWithCondition(this ProjectRootElement root, string? framework, string include)
     {
         return root.FindExistingItemsWithCondition(framework, include).Count() != 0;
     }
@@ -113,7 +113,7 @@ private static IEnumerable<string> SplitSemicolonDelimitedValues(string combined
     }
 
 
-    private static bool TryGetFrameworkConditionString(string framework, out string? condition)
+    private static bool TryGetFrameworkConditionString(string? framework, out string? condition)
     {
         if (string.IsNullOrEmpty(framework))
         {

src/Cli/dotnet/CliCompletion.cs

@@ -43,7 +43,7 @@ public static IEnumerable<CompletionItem> ProjectReferencesFromProjectFile(Compl
     {
         try
         {
-            return GetMSBuildProject()?.GetProjectToProjectReferences().Select(r => ToCompletionItem(r.Include)) ?? Empty<CompletionItem>();
+            return GetMSBuildProject()?.ProjectReferences().Select(r => ToCompletionItem(r.EvaluatedInclude)) ?? Empty<CompletionItem>();
         }
         catch (Exception)
         {
@@ -69,7 +69,7 @@ public static IEnumerable<CompletionItem> ConfigurationsFromProjectFileOrDefault
         {
             using var evaluator = DotNetProjectEvaluatorFactory.CreateForCommand();
             return MsbuildProject.FromFileOrDirectory(
-                evaluator.ProjectCollection,
+                evaluator,
                 Directory.GetCurrentDirectory(), interactive: false);
         }
         catch (Exception e)

src/Cli/dotnet/CommandFactory/CommandResolution/MSBuildProject.cs

@@ -1,9 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
-using Microsoft.Build.Evaluation;
+using Microsoft.DotNet.Cli.MSBuildEvaluation;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Cli.Utils.Extensions;
 using NuGet.Frameworks;
@@ -15,62 +13,20 @@ internal class MSBuildProject : IProject
 {
     private static readonly NuGetFramework s_toolPackageFramework = FrameworkConstants.CommonFrameworks.NetCoreApp10;
 
-    private readonly Project _project;
+    private readonly DotNetProject _project;
     private readonly string _msBuildExePath;
 
-    public string DepsJsonPath
-    {
-        get
-        {
-            return _project
-                .AllEvaluatedProperties
-                .FirstOrDefault(p => p.Name.Equals("ProjectDepsFilePath"))
-                .EvaluatedValue;
-        }
-    }
+    public string? DepsJsonPath => _project.GetPropertyValue("ProjectDepsFilePath");
 
-    public string RuntimeConfigJsonPath
-    {
-        get
-        {
-            return _project
-                .AllEvaluatedProperties
-                .FirstOrDefault(p => p.Name.Equals("ProjectRuntimeConfigFilePath"))
-                .EvaluatedValue;
-        }
-    }
+    public string? RuntimeConfigJsonPath => _project.GetPropertyValue("ProjectRuntimeConfigFilePath");
 
-    public string FullOutputPath
-    {
-        get
-        {
-            return _project
-                .AllEvaluatedProperties
-                .FirstOrDefault(p => p.Name.Equals("TargetDir"))
-                .EvaluatedValue;
-        }
-    }
+    public string? FullOutputPath => _project.GetPropertyValue("TargetDir");
 
     public string ProjectRoot { get; }
 
-    public NuGetFramework DotnetCliToolTargetFramework
-    {
-        get
-        {
-            var frameworkString = _project
-                .AllEvaluatedProperties
-                .FirstOrDefault(p => p.Name.Equals("DotnetCliToolTargetFramework"))
-                ?.EvaluatedValue;
-
-            if (string.IsNullOrEmpty(frameworkString))
-            {
-                return s_toolPackageFramework;
-            }
-
-            return NuGetFramework.Parse(frameworkString);
-        }
-    }
-
+    public NuGetFramework DotnetCliToolTargetFramework => _project.GetPropertyValue("DotnetCliToolTargetFramework") is string s && !string.IsNullOrEmpty(s)
+        ? NuGetFramework.Parse(s)
+        : s_toolPackageFramework;
 
     public Dictionary<string, string> EnvironmentVariables
     {
@@ -83,20 +39,10 @@ public Dictionary<string, string> EnvironmentVariables
         }
     }
 
-    public string ToolDepsJsonGeneratorProject
-    {
-        get
-        {
-            var generatorProject = _project
-                .AllEvaluatedProperties
-                .FirstOrDefault(p => p.Name.Equals("ToolDepsJsonGeneratorProject"))
-                ?.EvaluatedValue;
-
-            return generatorProject;
-        }
-    }
+    public string? ToolDepsJsonGeneratorProject => _project.GetPropertyValue("ToolDepsJsonGeneratorProject");
 
-    public MSBuildProject(
+    internal MSBuildProject(
+        DotNetProjectEvaluator evaluator,
         string msBuildProjectPath,
         NuGetFramework framework,
         string configuration,
@@ -107,7 +53,7 @@ public MSBuildProject(
 
         var globalProperties = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
         {
-           { "MSBuildExtensionsPath", Path.GetDirectoryName(msBuildExePath) }
+           { "MSBuildExtensionsPath", Path.GetDirectoryName(msBuildExePath)! }
         };
 
         if (framework != null)
@@ -125,19 +71,17 @@ public MSBuildProject(
             globalProperties.Add("Configuration", configuration);
         }
 
-        _project = ProjectCollection.GlobalProjectCollection.LoadProject(
+        _project = evaluator.LoadProject(
             msBuildProjectPath,
-            globalProperties,
-            null);
+            globalProperties);
 
         _msBuildExePath = msBuildExePath;
     }
 
     public IEnumerable<SingleProjectInfo> GetTools()
     {
-        var toolsReferences = _project.AllEvaluatedItems.Where(i => i.ItemType.Equals("DotNetCliToolReference"));
+        var toolsReferences = _project.GetItems("DotNetCliToolReference");
         var tools = toolsReferences.Select(t => new SingleProjectInfo(t.EvaluatedInclude, t.GetMetadataValue("Version"), []));
-
         return tools;
     }
 
@@ -147,11 +91,11 @@ public LockFile GetLockFile()
             GetLockFilePathFromIntermediateBaseOutputPath();
 
         return new LockFileFormat()
-            .ReadWithLock(lockFilePath)
+            .ReadWithLock(lockFilePath!)
             .Result;
     }
 
-    public bool TryGetLockFile(out LockFile lockFile)
+    public bool TryGetLockFile(out LockFile? lockFile)
     {
         lockFile = null;
 
@@ -174,21 +118,15 @@ public bool TryGetLockFile(out LockFile lockFile)
         return true;
     }
 
-    private string GetLockFilePathFromProjectLockFileProperty()
-    {
-        return _project
-            .AllEvaluatedProperties
-            .Where(p => p.Name.Equals("ProjectAssetsFile"))
-            .Select(p => p.EvaluatedValue)
-            .FirstOrDefault(p => Path.IsPathRooted(p) && File.Exists(p));
-    }
+    private string? GetLockFilePathFromProjectLockFileProperty() => _project.ProjectAssetsFile;
 
-    private string GetLockFilePathFromIntermediateBaseOutputPath()
+    private string? GetLockFilePathFromIntermediateBaseOutputPath()
     {
-        var intermediateOutputPath = _project
-                .AllEvaluatedProperties
-                .FirstOrDefault(p => p.Name.Equals("BaseIntermediateOutputPath"))
-                .EvaluatedValue;
+        var intermediateOutputPath = _project.GetPropertyValue("BaseIntermediateOutputPath");
+        if (string.IsNullOrEmpty(intermediateOutputPath))
+        {
+            return null;
+        }
         return Path.Combine(intermediateOutputPath, "project.assets.json");
     }
 }

src/Cli/dotnet/CommandFactory/CommandResolution/ProjectFactory.cs

@@ -1,9 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
-using Microsoft.Build.Exceptions;
+using Microsoft.DotNet.Cli.MSBuildEvaluation;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Cli.Utils.Extensions;
 using NuGet.Frameworks;
@@ -16,7 +14,9 @@ internal class ProjectFactory(IEnvironmentProvider environment)
 
     private readonly IEnvironmentProvider _environment = environment;
 
-    public IProject GetProject(
+    private readonly DotNetProjectEvaluator _evaluator = new();
+
+    public IProject? GetProject(
         string projectDirectory,
         NuGetFramework framework,
         string configuration,
@@ -26,7 +26,7 @@ public IProject GetProject(
         return GetMSBuildProj(projectDirectory, framework, configuration, outputPath);
     }
 
-    private IProject GetMSBuildProj(string projectDirectory, NuGetFramework framework, string configuration, string outputPath)
+    private IProject? GetMSBuildProj(string projectDirectory, NuGetFramework framework, string configuration, string outputPath)
     {
         var msBuildExePath = _environment.GetEnvironmentVariable(Constants.MSBUILD_EXE_PATH);
 
@@ -39,7 +39,7 @@ private IProject GetMSBuildProj(string projectDirectory, NuGetFramework framewor
             ProjectFactoryName,
             msBuildExePath));
 
-        string msBuildProjectPath = GetMSBuildProjPath(projectDirectory);
+        var msBuildProjectPath = GetMSBuildProjPath(projectDirectory);
 
         Reporter.Verbose.WriteLine(string.Format(
             CliStrings.MSBuildProjectPath,
@@ -53,17 +53,17 @@ private IProject GetMSBuildProj(string projectDirectory, NuGetFramework framewor
 
         try
         {
-            return new MSBuildProject(msBuildProjectPath, framework, configuration, outputPath, msBuildExePath);
+            return new MSBuildProject(_evaluator, msBuildProjectPath, framework, configuration, outputPath, msBuildExePath);
         }
-        catch (InvalidProjectFileException ex)
+        catch (Exception ex)
         {
             Reporter.Verbose.WriteLine(ex.ToString().Red());
 
             return null;
         }
     }
 
-    private static string GetMSBuildProjPath(string projectDirectory)
+    private static string? GetMSBuildProjPath(string projectDirectory)
     {
         IEnumerable<string> projectFiles = Directory
             .GetFiles(projectDirectory, "*.*proj")

src/Cli/dotnet/Commands/New/MSBuildEvaluation/MSBuildEvaluationResult.cs

@@ -1,7 +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 MSBuildProject = Microsoft.Build.Evaluation.Project;
+using Microsoft.DotNet.Cli.MSBuildEvaluation;
 
 namespace Microsoft.DotNet.Cli.Commands.New.MSBuildEvaluation;
 
@@ -41,7 +41,10 @@ internal enum DotNetLanguage { NotEvaluated, CSharp, VB, FSharp }
 
     internal string? ProjectPath { get; }
 
-    public MSBuildProject? EvaluatedProject { get; protected set; }
+    /// <summary>
+    /// The evaluated MSBuild project. Null if evaluation did not succeed (so Status will be Failed/NoProjectFound/NoRestore).
+    /// </summary>
+    public DotNetProject? EvaluatedProject { get; protected set; }
 
     public string? ErrorMessage { get; protected set; }