From 3bfd0991a3b3f45f987289875efb53c368189648 Mon Sep 17 00:00:00 2001
From: Jon Sequeira <jonsequeira@gmail.com>
Date: Thu, 25 Jul 2024 15:24:54 -0700
Subject: [PATCH] move some linked files into
 Microsoft.Dotnet.Interactive.Http.Parsing for complete source package
 creation

---
 ...Microsoft.DotNet.Interactive.Http.Parsing.csproj |  9 +--------
 .../Parsing/DiagnosticInfo.cs                       |  0
 .../Parsing/SyntaxNode.cs                           |  0
 .../Parsing/SyntaxNodeOrToken.cs                    |  0
 .../Parsing/SyntaxToken.cs                          |  0
 .../Parsing/SyntaxTree.cs                           |  0
 .../Parsing/TokenKind.cs                            |  0
 .../Microsoft.DotNet.Interactive.Http.Tests.csproj  |  6 ------
 .../Microsoft.DotNet.Interactive.Http.csproj        | 13 -------------
 ...icrosoft.DotNet.Interactive.Parsing.Tests.csproj | 13 +++++++------
 .../Microsoft.DotNet.Interactive.csproj             |  9 +++++++++
 11 files changed, 17 insertions(+), 33 deletions(-)
 rename src/{Microsoft.DotNet.Interactive => Microsoft.DotNet.Interactive.Http.Parsing}/Parsing/DiagnosticInfo.cs (100%)
 rename src/{Microsoft.DotNet.Interactive => Microsoft.DotNet.Interactive.Http.Parsing}/Parsing/SyntaxNode.cs (100%)
 rename src/{Microsoft.DotNet.Interactive => Microsoft.DotNet.Interactive.Http.Parsing}/Parsing/SyntaxNodeOrToken.cs (100%)
 rename src/{Microsoft.DotNet.Interactive => Microsoft.DotNet.Interactive.Http.Parsing}/Parsing/SyntaxToken.cs (100%)
 rename src/{Microsoft.DotNet.Interactive => Microsoft.DotNet.Interactive.Http.Parsing}/Parsing/SyntaxTree.cs (100%)
 rename src/{Microsoft.DotNet.Interactive => Microsoft.DotNet.Interactive.Http.Parsing}/Parsing/TokenKind.cs (100%)

diff --git a/src/Microsoft.DotNet.Interactive.Http.Parsing/Microsoft.DotNet.Interactive.Http.Parsing.csproj b/src/Microsoft.DotNet.Interactive.Http.Parsing/Microsoft.DotNet.Interactive.Http.Parsing.csproj
index 8b0afdab0c..2aad064bd7 100644
--- a/src/Microsoft.DotNet.Interactive.Http.Parsing/Microsoft.DotNet.Interactive.Http.Parsing.csproj
+++ b/src/Microsoft.DotNet.Interactive.Http.Parsing/Microsoft.DotNet.Interactive.Http.Parsing.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -18,14 +18,7 @@
     <!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
     <NoWarn>$(NoWarn);NU5128</NoWarn>
   </PropertyGroup>
-
   <ItemGroup>
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\DiagnosticInfo.cs" Link="Parsing\DiagnosticInfo.cs" LinkBase="Parsing" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxNodeOrToken.cs" Link="Parsing\SyntaxNodeOrToken.cs" LinkBase="Parsing" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxNode.cs" Link="Parsing\SyntaxNode.cs" LinkBase="Parsing" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxToken.cs" Link="Parsing\SyntaxToken.cs" LinkBase="Parsing" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxTree.cs" Link="Parsing\SyntaxTree.cs" LinkBase="Parsing" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\TokenKind.cs" Link="Parsing\TokenKind.cs" LinkBase="Parsing" />
     <Compile Include="..\Microsoft.DotNet.Interactive\Utility\NullableAttributes.cs" Link="NullableAttributes.cs" />
   </ItemGroup>
 
diff --git a/src/Microsoft.DotNet.Interactive/Parsing/DiagnosticInfo.cs b/src/Microsoft.DotNet.Interactive.Http.Parsing/Parsing/DiagnosticInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Interactive/Parsing/DiagnosticInfo.cs
rename to src/Microsoft.DotNet.Interactive.Http.Parsing/Parsing/DiagnosticInfo.cs
diff --git a/src/Microsoft.DotNet.Interactive/Parsing/SyntaxNode.cs b/src/Microsoft.DotNet.Interactive.Http.Parsing/Parsing/SyntaxNode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Interactive/Parsing/SyntaxNode.cs
rename to src/Microsoft.DotNet.Interactive.Http.Parsing/Parsing/SyntaxNode.cs
diff --git a/src/Microsoft.DotNet.Interactive/Parsing/SyntaxNodeOrToken.cs b/src/Microsoft.DotNet.Interactive.Http.Parsing/Parsing/SyntaxNodeOrToken.cs
similarity index 100%
rename from src/Microsoft.DotNet.Interactive/Parsing/SyntaxNodeOrToken.cs
rename to src/Microsoft.DotNet.Interactive.Http.Parsing/Parsing/SyntaxNodeOrToken.cs
diff --git a/src/Microsoft.DotNet.Interactive/Parsing/SyntaxToken.cs b/src/Microsoft.DotNet.Interactive.Http.Parsing/Parsing/SyntaxToken.cs
similarity index 100%
rename from src/Microsoft.DotNet.Interactive/Parsing/SyntaxToken.cs
rename to src/Microsoft.DotNet.Interactive.Http.Parsing/Parsing/SyntaxToken.cs
diff --git a/src/Microsoft.DotNet.Interactive/Parsing/SyntaxTree.cs b/src/Microsoft.DotNet.Interactive.Http.Parsing/Parsing/SyntaxTree.cs
similarity index 100%
rename from src/Microsoft.DotNet.Interactive/Parsing/SyntaxTree.cs
rename to src/Microsoft.DotNet.Interactive.Http.Parsing/Parsing/SyntaxTree.cs
diff --git a/src/Microsoft.DotNet.Interactive/Parsing/TokenKind.cs b/src/Microsoft.DotNet.Interactive.Http.Parsing/Parsing/TokenKind.cs
similarity index 100%
rename from src/Microsoft.DotNet.Interactive/Parsing/TokenKind.cs
rename to src/Microsoft.DotNet.Interactive.Http.Parsing/Parsing/TokenKind.cs
diff --git a/src/Microsoft.DotNet.Interactive.Http.Tests/Microsoft.DotNet.Interactive.Http.Tests.csproj b/src/Microsoft.DotNet.Interactive.Http.Tests/Microsoft.DotNet.Interactive.Http.Tests.csproj
index caeaf810fa..c7445b7e4c 100644
--- a/src/Microsoft.DotNet.Interactive.Http.Tests/Microsoft.DotNet.Interactive.Http.Tests.csproj
+++ b/src/Microsoft.DotNet.Interactive.Http.Tests/Microsoft.DotNet.Interactive.Http.Tests.csproj
@@ -23,12 +23,6 @@
     <Compile Include="..\Microsoft.DotNet.Interactive.Parsing.Tests\Utility\ISyntaxSpec.cs" Link="Utility\ISyntaxSpec.cs" />
     <Compile Include="..\Microsoft.DotNet.Interactive.Parsing.Tests\Utility\SyntaxSpecBase{T}.cs" Link="Utility\SyntaxSpecBase{T}.cs" />
     <Compile Include="..\Microsoft.DotNet.Interactive.Parsing.Tests\Utility\SyntaxAssertionExtensions.cs" Link="Utility\SyntaxAssertionExtensions.cs" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\DiagnosticInfo.cs" Link="Parsing\DiagnosticInfo.cs" LinkBase="Parsing" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxNode.cs" Link="Parsing\SyntaxNode.cs" LinkBase="Parsing" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxNodeOrToken.cs" Link="Parsing\SyntaxNodeOrToken.cs" LinkBase="Parsing" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxToken.cs" Link="Parsing\SyntaxToken.cs" LinkBase="Parsing" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxTree.cs" Link="SyntaxTree.cs" LinkBase="Parsing" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\TokenKind.cs" Link="Parsing\TokenKind.cs" LinkBase="Parsing" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Interactive.Http/Microsoft.DotNet.Interactive.Http.csproj b/src/Microsoft.DotNet.Interactive.Http/Microsoft.DotNet.Interactive.Http.csproj
index 68b06e21fd..5148bbaa29 100644
--- a/src/Microsoft.DotNet.Interactive.Http/Microsoft.DotNet.Interactive.Http.csproj
+++ b/src/Microsoft.DotNet.Interactive.Http/Microsoft.DotNet.Interactive.Http.csproj
@@ -20,19 +20,6 @@
     <Compile Include="..\Microsoft.DotNet.Interactive.Http.Parsing\Parsing\*.cs" LinkBase="Parsing" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Remove="..\Microsoft.DotNet.Interactive.Http.Parsing\Parsing\DiagnosticInfo.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\DiagnosticInfo.cs" Link="Parsing\DiagnosticInfo.cs" LinkBase="Parsing"  />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxNode.cs" Link="Parsing\SyntaxNode.cs" LinkBase="Parsing"  />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxNodeOrToken.cs" Link="Parsing\SyntaxNodeOrToken.cs" LinkBase="Parsing"  />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxToken.cs" Link="Parsing\SyntaxToken.cs" LinkBase="Parsing"  />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxTree.cs" Link="Parsing\SyntaxTree.cs" LinkBase="Parsing"  />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\TokenKind.cs" Link="Parsing\TokenKind.cs" LinkBase="Parsing" />
-  </ItemGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.Formatting\Microsoft.DotNet.Interactive.Formatting.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive\Microsoft.DotNet.Interactive.csproj" />
diff --git a/src/Microsoft.DotNet.Interactive.Parsing.Tests/Microsoft.DotNet.Interactive.Parsing.Tests.csproj b/src/Microsoft.DotNet.Interactive.Parsing.Tests/Microsoft.DotNet.Interactive.Parsing.Tests.csproj
index ac97edb0ef..dc181b8e81 100644
--- a/src/Microsoft.DotNet.Interactive.Parsing.Tests/Microsoft.DotNet.Interactive.Parsing.Tests.csproj
+++ b/src/Microsoft.DotNet.Interactive.Parsing.Tests/Microsoft.DotNet.Interactive.Parsing.Tests.csproj
@@ -34,7 +34,13 @@
     <Compile Include="..\Microsoft.DotNet.Interactive\Events\CompletionItem.cs" Link="CompletionItem.cs" LinkBase="Parsing" />
     <Compile Include="..\Microsoft.DotNet.Interactive\Events\InsertTextFormat.cs" Link="InsertTextFormat.cs" LinkBase="Parsing" />
 
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\DiagnosticInfo.cs" Link="Parsing\DiagnosticInfo.cs" LinkBase="Parsing" />
+    <Compile Include="..\Microsoft.DotNet.Interactive.Http.Parsing\Parsing\DiagnosticInfo.cs" Link="Parsing\DiagnosticInfo.cs" LinkBase="Parsing" />
+    <Compile Include="..\Microsoft.DotNet.Interactive.Http.Parsing\Parsing\SyntaxNode.cs" Link="Parsing\SyntaxNode.cs" LinkBase="Parsing" />
+    <Compile Include="..\Microsoft.DotNet.Interactive.Http.Parsing\Parsing\SyntaxNodeOrToken.cs" Link="Parsing\SyntaxNodeOrToken.cs" LinkBase="Parsing" />
+    <Compile Include="..\Microsoft.DotNet.Interactive.Http.Parsing\Parsing\SyntaxToken.cs" Link="Parsing\SyntaxToken.cs" LinkBase="Parsing" />
+    <Compile Include="..\Microsoft.DotNet.Interactive.Http.Parsing\Parsing\SyntaxTree.cs" Link="Parsing\SyntaxTree.cs" LinkBase="Parsing" />
+    <Compile Include="..\Microsoft.DotNet.Interactive.Http.Parsing\Parsing\TokenKind.cs" Link="Parsing\TokenKind.cs" LinkBase="Parsing" />
+    
     <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\DirectiveBindingDelegate.cs" Link="DirectiveBindingDelegate.cs" LinkBase="Parsing" />
     <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\DirectiveBindingResult{T}.cs" Link="DirectiveBindingResult{T}.cs" LinkBase="Parsing" />
     <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\DirectiveExpressionNode.cs" Link="Parsing\DirectiveExpressionNode.cs" LinkBase="Parsing" />
@@ -52,12 +58,7 @@
     <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\PolyglotSubmissionNode.cs" Link="Parsing\PolyglotSubmissionNode.cs" LinkBase="Parsing" />
     <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\PolyglotSyntaxParser.cs" Link="Parsing\PolyglotSyntaxParser.cs" LinkBase="Parsing" />
     <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\PolyglotSyntaxTree.cs" Link="Parsing\PolyglotSyntaxTree.cs" LinkBase="Parsing" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxNode.cs" Link="Parsing\SyntaxNode.cs" LinkBase="Parsing" />
     <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxNodeOrToken.CodeSubmission.cs" Link="Parsing\SyntaxNodeOrToken.CodeSubmission.cs" LinkBase="Parsing" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxNodeOrToken.cs" Link="Parsing\SyntaxNodeOrToken.cs" LinkBase="Parsing" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxToken.cs" Link="Parsing\SyntaxToken.cs" LinkBase="Parsing" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\SyntaxTree.cs" Link="Parsing\SyntaxTree.cs" LinkBase="Parsing" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\TokenKind.cs" Link="Parsing\TokenKind.cs" LinkBase="Parsing" />
     <Compile Include="..\Microsoft.DotNet.Interactive\Parsing\TopLevelSyntaxNode.cs" Link="Parsing\TopLevelSyntaxNode.cs" LinkBase="Parsing" />
 
     <Compile Include="..\Microsoft.DotNet.Interactive.Tests\Utility\MarkupTestFile.cs" Link="Utility\MarkupTestFile.cs" />
diff --git a/src/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj b/src/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj
index 25b2489627..c7aef5ac7f 100644
--- a/src/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj
+++ b/src/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj
@@ -78,4 +78,13 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\Microsoft.DotNet.Interactive.Http.Parsing\Parsing\DiagnosticInfo.cs" Link="Parsing\DiagnosticInfo.cs" LinkBase="Parsing" />
+    <Compile Include="..\Microsoft.DotNet.Interactive.Http.Parsing\Parsing\SyntaxNode.cs" Link="Parsing\SyntaxNode.cs" LinkBase="Parsing" />
+    <Compile Include="..\Microsoft.DotNet.Interactive.Http.Parsing\Parsing\SyntaxNodeOrToken.cs" Link="Parsing\SyntaxNodeOrToken.cs" LinkBase="Parsing" />
+    <Compile Include="..\Microsoft.DotNet.Interactive.Http.Parsing\Parsing\SyntaxToken.cs" Link="Parsing\SyntaxToken.cs" LinkBase="Parsing" />
+    <Compile Include="..\Microsoft.DotNet.Interactive.Http.Parsing\Parsing\SyntaxTree.cs" Link="Parsing\SyntaxTree.cs" LinkBase="Parsing" />
+    <Compile Include="..\Microsoft.DotNet.Interactive.Http.Parsing\Parsing\TokenKind.cs" Link="Parsing\TokenKind.cs" LinkBase="Parsing" />
+  </ItemGroup>
+
 </Project>