Manually pull in changes from release/10.0.2xx

Author: RikkiGibson

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

@@ -27,14 +27,11 @@ namespace Microsoft.DotNet.FileBasedPrograms;
 
 internal static class AppDirectiveHelpers
 {
-
-#pragma warning disable RSEXPERIMENTAL003 // 'SyntaxTokenParser' is experimental
     public static SyntaxTokenParser CreateTokenizer(SourceText text)
     {
         return SyntaxFactory.CreateTokenParser(text,
             CSharpParseOptions.Default.WithFeatures([new("FileBasedProgram", "true")]));
     }
-#pragma warning restore RSEXPERIMENTAL003 // 'SyntaxTokenParser' is experimental
 
     /// <param name="reportAllErrors">
     /// If <see langword="true"/>, the whole <paramref name="sourceFile"/> is parsed to find diagnostics about every app directive.
@@ -140,8 +137,8 @@ public static void FindLeadingDirectives(
                 // TODO: original impl was using more recent span-oriented APIs. Optimal sharing may be tricky.
                 // var parts = Patterns.Whitespace.EnumerateSplits(message, 2);
                 var parts = Patterns.Whitespace.Split(message.ToString(), 2);
-                var name = parts.Length > 0 ? parts[0] : null;
-                var value = parts.Length > 1 ? parts[1] : null;
+                var name = parts.Length > 0 ? parts[0] : "";
+                var value = parts.Length > 1 ? parts[1] : "";
                 Debug.Assert(!(parts.Length > 2));
 
                 var whiteSpace = GetWhiteSpaceInfo(triviaList, index);
@@ -155,9 +152,16 @@ public static void FindLeadingDirectives(
                     },
                     Diagnostics = diagnostics,
                     SourceFile = sourceFile,
-                    DirectiveKind = name ?? "",
-                    DirectiveText = value ?? ""
+                    DirectiveKind = name,
+                    DirectiveText = value,
                 };
+
+                // Block quotes now so we can later support quoted values without a breaking change. https://github.com/dotnet/sdk/issues/49367
+                if (value.Contains('"'))
+                {
+                    diagnostics.AddError(sourceFile, context.Info.Span, FileBasedProgramsResources.QuoteInDirective);
+                }
+
                 if (CSharpDirective.Parse(context) is { } directive)
                 {
                     // If the directive is already present, report an error.
@@ -477,7 +481,11 @@ public sealed class Project(in ParseInfo info) : Named(info)
                 if (Directory.Exists(resolvedProjectPath))
                 {
                     var fullFilePath = GetProjectFileFromDirectory(resolvedProjectPath).FullName;
-                    directiveText = ExternalHelpers.GetRelativePath(sourceDirectory, fullFilePath);
+
+                    // Keep a relative path only if the original directive was a relative path.
+                    directiveText = ExternalHelpers.IsPathFullyQualified(directiveText)
+                        ? fullFilePath
+                        : ExternalHelpers.GetRelativePath(relativeTo: sourceDirectory, fullFilePath);
                 }
                 else if (!File.Exists(resolvedProjectPath))
                 {
@@ -495,6 +503,11 @@ public sealed class Project(in ParseInfo info) : Named(info)
             };
         }
 
+        public Project WithName(string name)
+        {
+            return new Project(Info) { Name = name };
+        }
+
         public static FileInfo GetProjectFileFromDirectory(string projectDirectory)
         {
             DirectoryInfo dir;
@@ -571,10 +584,14 @@ internal sealed class SimpleDiagnostic
     /// </summary>
     public readonly struct Position
     {
-        public required SourceFile SourceFile { get; init; }
-        public required TextSpan TextSpan { get; init; }
-        public string Path => SourceFile.Path;
-        public LinePositionSpan Span => SourceFile.GetFileLinePositionSpan(TextSpan).Span;
+        public string Path { get; init; }
+        public LinePositionSpan Span { get; init; }
+
+        public static implicit operator Position(FileLinePositionSpan fileLinePositionSpan) => new()
+        {
+            Path = fileLinePositionSpan.Path,
+            Span = fileLinePositionSpan.Span,
+        };
     }
 }
 
@@ -596,7 +613,7 @@ public void AddError(SourceFile sourceFile, TextSpan span, string message, Excep
         if (Builder != null)
         {
             Debug.Assert(!IgnoreDiagnostics);
-            Builder.Add(new SimpleDiagnostic { Location = new SimpleDiagnostic.Position { SourceFile = sourceFile, TextSpan = span }, Message = message });
+            Builder.Add(new SimpleDiagnostic { Location = sourceFile.GetFileLinePositionSpan(span), Message = message });
         }
         else if (!IgnoreDiagnostics)
         {

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

@@ -10,24 +10,34 @@ namespace Microsoft.DotNet.FileBasedPrograms;
 
 /// <summary>
 /// When targeting netstandard2.0, the user of the source package must "implement" certain methods by declaring members in this type.
+/// </summary>
 partial class ExternalHelpers
 {
     public static partial int CombineHashCodes(int value1, int value2);
     public static partial string GetRelativePath(string relativeTo, string path);
 
+    public static partial bool IsPathFullyQualified(string path);
+
 #if NET
     public static partial int CombineHashCodes(int value1, int value2)
         => HashCode.Combine(value1, value2);
 
     public static partial string GetRelativePath(string relativeTo, string path)
         => Path.GetRelativePath(relativeTo, path);
 
+    public static partial bool IsPathFullyQualified(string path)
+        => Path.IsPathFullyQualified(path);
+
 #elif FILE_BASED_PROGRAMS_SOURCE_PACKAGE_BUILD
+    // This path should only be used when we are verifying that the source package itself builds under netstandard2.0.
     public static partial int CombineHashCodes(int value1, int value2)
-        => throw new NotImplementedException("Please declare and implement this method in `Microsoft.DotNet.FileBasedPrograms.ExternalHelpers`.");
+        => throw new NotImplementedException();
 
     public static partial string GetRelativePath(string relativeTo, string path)
-        => throw new NotImplementedException("Please declare and implement this method in `Microsoft.DotNet.FileBasedPrograms.ExternalHelpers`.");
+        => throw new NotImplementedException();
+
+    public static partial bool IsPathFullyQualified(string path)
+        => throw new NotImplementedException();
 
 #endif
 }
@@ -43,7 +53,7 @@ public GracefulException(string? message) : base(message)
     {
     }
 
-    public GracefulException(string? message, string? todo2) : base(message)
+    public GracefulException(string? message, string? arg) : base(message)
     {
     }
 

src/Cli/Microsoft.DotNet.FileBasedPrograms/FileBasedProgramsResources.resx

@@ -154,6 +154,9 @@
     <value>Duplicate directives are not supported: {0}</value>
     <comment>{0} is the directive type and name.</comment>
   </data>
+  <data name="QuoteInDirective" xml:space="preserve">
+    <value>Directives currently cannot contain double quotes (").</value>
+  </data>
   <data name="InvalidProjectDirective" xml:space="preserve">
     <value>The '#:project' directive is invalid: {0}</value>
     <comment>{0} is the inner error message.</comment>