get closer to successfully building

Author: RikkiGibson

src/Cli/Microsoft.DotNet.FileBasedPrograms/AppDirectiveHelpers.cs

@@ -476,10 +476,10 @@ public sealed class Project(in ParseInfo info) : Named(info)
                 }
                 else if (!File.Exists(resolvedProjectPath))
                 {
-                    throw new GracefulException(FileBasedProgramsResources.CouldNotFindProjectOrDirectory, resolvedProjectPath);
+                    throw new GracefulExceptionDELETEME(FileBasedProgramsResources.CouldNotFindProjectOrDirectory, resolvedProjectPath);
                 }
             }
-            catch (GracefulException e)
+            catch (GracefulExceptionDELETEME e)
             {
                 context.Diagnostics.AddError(context.SourceFile, context.Info.Span, string.Format(FileBasedProgramsResources.InvalidProjectDirective, e.Message), e);
             }
@@ -499,25 +499,25 @@ public static FileInfo GetProjectFileFromDirectory(string projectDirectory)
             }
             catch (ArgumentException)
             {
-                throw new GracefulException(FileBasedProgramsResources.CouldNotFindProjectOrDirectory, projectDirectory);
+                throw new GracefulExceptionDELETEME(FileBasedProgramsResources.CouldNotFindProjectOrDirectory, projectDirectory);
             }
 
             if (!dir.Exists)
             {
-                throw new GracefulException(FileBasedProgramsResources.CouldNotFindProjectOrDirectory, projectDirectory);
+                throw new GracefulExceptionDELETEME(FileBasedProgramsResources.CouldNotFindProjectOrDirectory, projectDirectory);
             }
 
             FileInfo[] files = dir.GetFiles("*proj");
             if (files.Length == 0)
             {
-                throw new GracefulException(
+                throw new GracefulExceptionDELETEME(
                     FileBasedProgramsResources.CouldNotFindAnyProjectInDirectory,
                     projectDirectory);
             }
 
             if (files.Length > 1)
             {
-                throw new GracefulException(FileBasedProgramsResources.MoreThanOneProjectInDirectory, projectDirectory);
+                throw new GracefulExceptionDELETEME(FileBasedProgramsResources.MoreThanOneProjectInDirectory, projectDirectory);
             }
 
             return files.First();
@@ -578,7 +578,7 @@ internal readonly struct DiagnosticBag
     public bool IgnoreDiagnostics { get; private init; }
 
     /// <summary>
-    /// If <see langword="null"/> and <see cref="IgnoreDiagnostics"/> is <see langword="false"/>, the first diagnostic is thrown as <see cref="GracefulException"/>.
+    /// If <see langword="null"/> and <see cref="IgnoreDiagnostics"/> is <see langword="false"/>, the first diagnostic is thrown as <see cref="GracefulExceptionDELETEME"/>.
     /// </summary>
     public ImmutableArray<SimpleDiagnostic>.Builder? Builder { get; private init; }
 
@@ -595,7 +595,7 @@ public void AddError(SourceFile sourceFile, TextSpan span, string message, Excep
         }
         else if (!IgnoreDiagnostics)
         {
-            throw new GracefulException($"{sourceFile.GetLocationString(span)}: {FileBasedProgramsResources.DirectiveError}: {message}", inner);
+            throw new GracefulExceptionDELETEME($"{sourceFile.GetLocationString(span)}: {FileBasedProgramsResources.DirectiveError}: {message}", inner);
         }
     }
 
@@ -605,24 +605,3 @@ public void AddError(SourceFile sourceFile, TextSpan span, string message, Excep
         return default;
     }
 }
-
-// TODO: Remove usage of GracefulException out of shared package.
-// Use as some kind of wrapper over in dotnet cli side to preserve behavior there.
-internal class GracefulException : Exception
-{
-    public GracefulException()
-    {
-    }
-
-    public GracefulException(string? message) : base(message)
-    {
-    }
-
-    public GracefulException(string? message, string? todo2) : base(message)
-    {
-    }
-
-    public GracefulException(string? message, Exception? innerException) : base(message, innerException)
-    {
-    }
-}

src/Cli/Microsoft.DotNet.FileBasedPrograms/ExternalHelpers.cs

@@ -41,3 +41,26 @@ public static string GetRelativePath(string relativeTo, string path)
 }
 
 #endif
+
+// TODO: this is tricky. dotnet cli includes this type via ProjectReference to Cli.Utils.
+// But it's not reasonable to reference that project from Roslyn.
+// We should probably avoid using this type in the source package.
+// But currently there is a significant behavioral need and number of callers who are catching GracefulException.
+internal class GracefulExceptionDELETEME : Exception
+{
+    public GracefulExceptionDELETEME()
+    {
+    }
+
+    public GracefulExceptionDELETEME(string? message) : base(message)
+    {
+    }
+
+    public GracefulExceptionDELETEME(string? message, string? todo2) : base(message)
+    {
+    }
+
+    public GracefulExceptionDELETEME(string? message, Exception? innerException) : base(message, innerException)
+    {
+    }
+}

src/Cli/dotnet/Commands/Package/Add/PackageAddCommand.cs

@@ -11,6 +11,7 @@
 using Microsoft.DotNet.Cli.Commands.Run;
 using Microsoft.DotNet.Cli.Extensions;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.FileBasedPrograms;
 using NuGet.ProjectModel;
 
 namespace Microsoft.DotNet.Cli.Commands.Package.Add;

src/Cli/dotnet/Commands/Package/Remove/PackageRemoveCommand.cs

@@ -7,6 +7,7 @@
 using Microsoft.DotNet.Cli.Commands.Run;
 using Microsoft.DotNet.Cli.Extensions;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.FileBasedPrograms;
 
 namespace Microsoft.DotNet.Cli.Commands.Package.Remove;
 

src/Cli/dotnet/Commands/Project/Convert/ProjectConvertCommand.cs

@@ -6,6 +6,7 @@
 using Microsoft.Build.Evaluation;
 using Microsoft.DotNet.Cli.Commands.Run;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.FileBasedPrograms;
 using Microsoft.TemplateEngine.Cli.Commands;
 
 namespace Microsoft.DotNet.Cli.Commands.Project.Convert;
@@ -29,7 +30,7 @@ public override int Execute()
 
         // Find directives (this can fail, so do this before creating the target directory).
         var sourceFile = SourceFile.Load(file);
-        var directives = VirtualProjectBuildingCommand.FindDirectives(sourceFile, reportAllErrors: !_force, DiagnosticBag.ThrowOnFirst());
+        var directives = AppDirectiveHelpers.FindDirectives(sourceFile, reportAllErrors: !_force, DiagnosticBag.ThrowOnFirst());
 
         // Find other items to copy over, e.g., default Content items like JSON files in Web apps.
         var includeItems = FindIncludedItems().ToList();

src/Cli/dotnet/Commands/Run/Api/RunApiCommand.cs

@@ -8,6 +8,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.FileBasedPrograms;
 
 namespace Microsoft.DotNet.Cli.Commands.Run.Api;
 
@@ -64,7 +65,7 @@ public sealed class GetProject : RunApiInput
         public override RunApiOutput Execute()
         {
             var sourceFile = SourceFile.Load(EntryPointFileFullPath);
-            var directives = VirtualProjectBuildingCommand.FindDirectives(sourceFile, reportAllErrors: true, DiagnosticBag.Collect(out var diagnostics));
+            var directives = AppDirectiveHelpers.FindDirectives(sourceFile, reportAllErrors: true, DiagnosticBag.Collect(out var diagnostics));
             string artifactsPath = ArtifactsPath ?? VirtualProjectBuildingCommand.GetArtifactsPath(EntryPointFileFullPath);
 
             var csprojWriter = new StringWriter();
@@ -160,6 +161,9 @@ public sealed class RunCommand : RunApiOutput
     }
 }
 
+// TODO: getting the following error, which is not suppressible with pragma.
+// error SYSLIB1225: The type 'Encoding' includes the ref like property, field or constructor parameter 'Preamble'. No source code will be generated for the property, field or constructor. (https://learn.microsoft.com/dotnet/fundamentals/syslib-diagnostics/syslib1225)
+// I have no idea how the type 'Encoding' is ending up getting used as a result of my change.
 [JsonSerializable(typeof(RunApiInput))]
 [JsonSerializable(typeof(RunApiOutput))]
 internal partial class RunFileApiJsonSerializerContext : JsonSerializerContext;

src/Cli/dotnet/Commands/Run/FileBasedAppSourceEditor.cs

@@ -7,6 +7,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Text;
+using Microsoft.DotNet.FileBasedPrograms;
 
 namespace Microsoft.DotNet.Cli.Commands.Run;
 
@@ -33,7 +34,7 @@ public ImmutableArray<CSharpDirective> Directives
         {
             if (field.IsDefault)
             {
-                field = VirtualProjectBuildingCommand.FindDirectives(SourceFile, reportAllErrors: false, DiagnosticBag.Ignore());
+                field = AppDirectiveHelpers.FindDirectives(SourceFile, reportAllErrors: false, DiagnosticBag.Ignore());
                 Debug.Assert(!field.IsDefault);
             }
 
@@ -116,7 +117,7 @@ private TextChange DetermineAddChange(CSharpDirective directive)
         // Otherwise, we will add the directive to the top of the file.
         int start = 0;
 
-        var tokenizer = VirtualProjectBuildingCommand.CreateTokenizer(SourceFile.Text);
+        var tokenizer = AppDirectiveHelpers.CreateTokenizer(SourceFile.Text);
         var result = tokenizer.ParseNextToken();
         var leadingTrivia = result.Token.LeadingTrivia;
 

src/Cli/dotnet/Commands/Run/RunTelemetry.cs

@@ -6,6 +6,7 @@
 using Microsoft.Build.Execution;
 using Microsoft.DotNet.Cli.Commands.Run.LaunchSettings;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.FileBasedPrograms;
 
 namespace Microsoft.DotNet.Cli.Commands.Run;