move some linked files into Microsoft.Dotnet.Interactive.Http.Parsing…

… for complete source package creation
dotnet · Jul 25, 2024 · 3bfd099 · 3bfd099
1 parent 6ae9245
commit 3bfd099
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 33 deletions.
diff --git a/...icrosoft.DotNet.Interactive.Http.Parsing/Microsoft.DotNet.Interactive.Http.Parsing.csproj b/...icrosoft.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/...Net.Interactive/Parsing/DiagnosticInfo.cs → ...ve.Http.Parsing/Parsing/DiagnosticInfo.cs b/...Net.Interactive/Parsing/DiagnosticInfo.cs → ...ve.Http.Parsing/Parsing/DiagnosticInfo.cs
diff --git a/....DotNet.Interactive/Parsing/SyntaxNode.cs → ...active.Http.Parsing/Parsing/SyntaxNode.cs b/....DotNet.Interactive/Parsing/SyntaxNode.cs → ...active.Http.Parsing/Parsing/SyntaxNode.cs
diff --git a/....Interactive/Parsing/SyntaxNodeOrToken.cs → ...Http.Parsing/Parsing/SyntaxNodeOrToken.cs b/....Interactive/Parsing/SyntaxNodeOrToken.cs → ...Http.Parsing/Parsing/SyntaxNodeOrToken.cs
diff --git a/...DotNet.Interactive/Parsing/SyntaxToken.cs → ...ctive.Http.Parsing/Parsing/SyntaxToken.cs b/...DotNet.Interactive/Parsing/SyntaxToken.cs → ...ctive.Http.Parsing/Parsing/SyntaxToken.cs
diff --git a/....DotNet.Interactive/Parsing/SyntaxTree.cs → ...active.Http.Parsing/Parsing/SyntaxTree.cs b/....DotNet.Interactive/Parsing/SyntaxTree.cs → ...active.Http.Parsing/Parsing/SyntaxTree.cs
diff --git a/...t.DotNet.Interactive/Parsing/TokenKind.cs → ...ractive.Http.Parsing/Parsing/TokenKind.cs b/...t.DotNet.Interactive/Parsing/TokenKind.cs → ...ractive.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
@@ -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
@@ -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/...rosoft.DotNet.Interactive.Parsing.Tests/Microsoft.DotNet.Interactive.Parsing.Tests.csproj b/...rosoft.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
@@ -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>