Skip to content

Commit cd17dca

Browse files
committed
Lucene.Net.Expressions: Set the Antlr4ToolPath so Antlr4BuildTasks can find the jar file without including any assets from Antlr4.CodeGenerator.
1 parent 8a49e07 commit cd17dca

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,16 @@
4242
<ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
4343
</ItemGroup>
4444

45-
<ItemGroup>
45+
<PropertyGroup>
46+
<Antlr4CodeGeneratorVersion>$([System.IO.Path]::GetFileName('$(PkgAntlr4_CodeGenerator)'))</Antlr4CodeGeneratorVersion>
4647
<!-- Required for Antlr4BuildTasks to find the antlr4 .jar file. When missing,
4748
it causes an error on the SonarCloud workflow. -->
48-
<PackageReference Include="Antlr4.CodeGenerator" Version="$(Antlr4CodeGeneratorPackageVersion)">
49-
<PrivateAssets>all</PrivateAssets>
50-
<ExcludeAssets>runtime;compile;build;native;contentfiles;analyzers</ExcludeAssets>
51-
</PackageReference>
49+
<Antlr4ToolPath>$(PkgAntlr4_CodeGenerator)\tools\antlr4-csharp-$(Antlr4CodeGeneratorVersion)-complete.jar</Antlr4ToolPath>
50+
</PropertyGroup>
51+
52+
<ItemGroup>
53+
<!-- Required to supply the antlr4 .jar file to Antlr4BuildTasks. -->
54+
<PackageReference Include="Antlr4.CodeGenerator" Version="$(Antlr4CodeGeneratorPackageVersion)" PrivateAssets="all" ExcludeAssets="all" GeneratePathProperty="true" />
5255
<PackageReference Include="Antlr4.Runtime.Standard" Version="$(Antlr4RuntimeStandardPackageVersion)" />
5356
<PackageReference Include="Antlr4BuildTasks" Version="$(Antlr4BuildTasksPackageVersion)" PrivateAssets="all" IncludeAssets="build" />
5457
</ItemGroup>
@@ -76,5 +79,5 @@
7679
<Package>Lucene.Net.Expressions.JS</Package>
7780
</Antlr4>
7881
</ItemGroup>
79-
82+
8083
</Project>

0 commit comments

Comments
 (0)