You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2025/09/07 23:31:41 UTC

(lucenenet) 01/01: Lucene.Net.Expressions: Set the Antlr4ToolPath so Antlr4BuildTasks can find the jar file without including any assets from Antlr4.CodeGenerator.

This is an automated email from the ASF dual-hosted git repository.

nightowl888 pushed a commit to branch ci/cache-nuget-packages
in repository https://gitbox.apache.org/repos/asf/lucenenet.git

commit cd17dca7de08175bd7b3a5461353bd2f8a1eef0c
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Mon Sep 8 05:18:34 2025 +0700

    Lucene.Net.Expressions: Set the Antlr4ToolPath so Antlr4BuildTasks can find the jar file without including any assets from Antlr4.CodeGenerator.
---
 src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
index a601bef01..04a3196e6 100644
--- a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
+++ b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
@@ -42,13 +42,16 @@
     <ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
+  <PropertyGroup>
+    <Antlr4CodeGeneratorVersion>$([System.IO.Path]::GetFileName('$(PkgAntlr4_CodeGenerator)'))</Antlr4CodeGeneratorVersion>
     <!-- Required for Antlr4BuildTasks to find the antlr4 .jar file. When missing,
         it causes an error on the SonarCloud workflow. -->
-    <PackageReference Include="Antlr4.CodeGenerator" Version="$(Antlr4CodeGeneratorPackageVersion)">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime;compile;build;native;contentfiles;analyzers</ExcludeAssets>
-    </PackageReference>
+    <Antlr4ToolPath>$(PkgAntlr4_CodeGenerator)\tools\antlr4-csharp-$(Antlr4CodeGeneratorVersion)-complete.jar</Antlr4ToolPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Required to supply the antlr4 .jar file to Antlr4BuildTasks. -->
+    <PackageReference Include="Antlr4.CodeGenerator" Version="$(Antlr4CodeGeneratorPackageVersion)" PrivateAssets="all" ExcludeAssets="all" GeneratePathProperty="true" />
     <PackageReference Include="Antlr4.Runtime.Standard" Version="$(Antlr4RuntimeStandardPackageVersion)" />
     <PackageReference Include="Antlr4BuildTasks" Version="$(Antlr4BuildTasksPackageVersion)" PrivateAssets="all" IncludeAssets="build" />
   </ItemGroup>
@@ -76,5 +79,5 @@
       <Package>Lucene.Net.Expressions.JS</Package>
     </Antlr4>
   </ItemGroup>
-
+  
 </Project>