From ae581b233a258b86e095e8404722e14f5136ef5b Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 2 Mar 2026 18:52:05 +0000
Subject: [PATCH 1/3] Add antlr4 submodule

---
 .gitmodules                               |  3 +++
 eng/Versions.props                        |  1 +
 src/externalPackages/projects/antlr4.proj | 13 +++++++++++++
 src/externalPackages/src/antlr4           |  1 +
 4 files changed, 18 insertions(+)
 create mode 100644 src/externalPackages/projects/antlr4.proj
 create mode 160000 src/externalPackages/src/antlr4

diff --git a/.gitmodules b/.gitmodules
index f7b3b45447..995a75cd7a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "spectre-console"]
 	path = src/externalPackages/src/spectre-console
 	url = https://github.com/spectreconsole/spectre.console
+[submodule "src/externalPackages/src/antlr4"]
+	path = src/externalPackages/src/antlr4
+	url = https://github.com/antlr/antlr4
diff --git a/eng/Versions.props b/eng/Versions.props
index ee32f3b0b4..d261d3d3d9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -14,6 +14,7 @@
 
   <!-- External package versions -->
   <PropertyGroup>
+    <Antlr4Version>4.13.1</Antlr4Version>
     <AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>8.0.1</AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>
     <CssParserReleaseVersionSuffix>20230414.1</CssParserReleaseVersionSuffix>
     <HumanizerReleaseVersion>2.14.1</HumanizerReleaseVersion>
diff --git a/src/externalPackages/projects/antlr4.proj b/src/externalPackages/projects/antlr4.proj
new file mode 100644
index 0000000000..9008d2c3bf
--- /dev/null
+++ b/src/externalPackages/projects/antlr4.proj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+
+  <PropertyGroup>
+    <!-- Project Paths -->
+    <Antlr4Directory>$(ProjectDirectory)runtime/CSharp/src/</Antlr4Directory>
+    <Antlr4ProjectPath>$(Antlr4Directory)Antlr4.csproj</Antlr4ProjectPath>
+    <PackagesOutput>$(Antlr4Directory)bin/$(Configuration)/</PackagesOutput>
+
+    <DotNetToolArgs>$(DotNetToolArgs) /p:Configuration=$(Configuration)</DotNetToolArgs>
+
+    <BuildCommand>$(DotNetTool) build -c $(Configuration) $(Antlr4ProjectPath) /bl:$(ArtifactsLogRepoDir)build.binlog</BuildCommand>
+  </PropertyGroup>
+</Project>
diff --git a/src/externalPackages/src/antlr4 b/src/externalPackages/src/antlr4
new file mode 160000
index 0000000000..7ed420ff2c
--- /dev/null
+++ b/src/externalPackages/src/antlr4
@@ -0,0 +1 @@
+Subproject commit 7ed420ff2c78d62883875c442d75f32e73bc86c8

From e9886d1823cf69c8d83b59b05b621328bd6a92dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Fri, 6 Mar 2026 11:04:31 +0100
Subject: [PATCH 2/3] Apply suggestion from @am11

Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
---
 src/externalPackages/projects/antlr4.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/externalPackages/projects/antlr4.proj b/src/externalPackages/projects/antlr4.proj
index 9008d2c3bf..a45e7e0c24 100644
--- a/src/externalPackages/projects/antlr4.proj
+++ b/src/externalPackages/projects/antlr4.proj
@@ -8,6 +8,6 @@
 
     <DotNetToolArgs>$(DotNetToolArgs) /p:Configuration=$(Configuration)</DotNetToolArgs>
 
-    <BuildCommand>$(DotNetTool) build -c $(Configuration) $(Antlr4ProjectPath) /bl:$(ArtifactsLogRepoDir)build.binlog</BuildCommand>
+    <BuildCommand>$(DotNetTool) build -c $(Configuration) -f netstandard2.0 $(Antlr4ProjectPath) /bl:$(ArtifactsLogRepoDir)build.binlog</BuildCommand>
   </PropertyGroup>
 </Project>

From 1b0e8ee23bd1a394e6dc6b88e8b51c5e25787437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Fri, 6 Mar 2026 13:07:58 +0100
Subject: [PATCH 3/3] Apply suggestion from @akoeplinger

---
 src/externalPackages/projects/antlr4.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/externalPackages/projects/antlr4.proj b/src/externalPackages/projects/antlr4.proj
index a45e7e0c24..9497f2c675 100644
--- a/src/externalPackages/projects/antlr4.proj
+++ b/src/externalPackages/projects/antlr4.proj
@@ -8,6 +8,6 @@
 
     <DotNetToolArgs>$(DotNetToolArgs) /p:Configuration=$(Configuration)</DotNetToolArgs>
 
-    <BuildCommand>$(DotNetTool) build -c $(Configuration) -f netstandard2.0 $(Antlr4ProjectPath) /bl:$(ArtifactsLogRepoDir)build.binlog</BuildCommand>
+    <BuildCommand>$(DotNetTool) build -c $(Configuration) -f netstandard2.0 /p:TargetFrameworks=netstandard2.0 $(Antlr4ProjectPath) /bl:$(ArtifactsLogRepoDir)build.binlog</BuildCommand>
   </PropertyGroup>
 </Project>