Skip to content

Migrate from Antlr.Runtime to Antlr.Runtime.Standard #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate from Antlr.Runtime to Antlr.Runtime.Standard #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Update="Antlr4.Runtime" Version="4.6.6" />
<PackageReference Update="Antlr4.CodeGenerator" Version="4.6.6">
<PackageReference Update="Antlr4.Runtime.Standard" Version="4.13.1" />
<PackageReference Update="Antlr4BuildTasks" Version="12.10.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -42,8 +42,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Update="Antlr4.Runtime" Version="4.6.6" />
<PackageReference Update="Antlr4.CodeGenerator" Version="4.6.6">
<PackageReference Update="Antlr4.Runtime.Standard" Version="4.13.1" />
<PackageReference Update="Antlr4BuildTasks" Version="12.10.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
3 changes: 1 addition & 2 deletions src/Balea/Authorization/Abac/Grammars/BAL/BALVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using Antlr4.Runtime.Misc;
using Balea.Authorization.Abac.Context;
using Balea.Authorization.Abac.Grammars.BAL;
using System;
using System.Globalization;
using System.Linq.Expressions;
using static Balea.Authorization.Abac.Grammars.BAL.BalParser;
using static BalParser;

namespace Balea.DSL.Grammar.Bal
{
Expand Down
1 change: 0 additions & 1 deletion src/Balea/Authorization/Abac/Parsers/BALParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Antlr4.Runtime;
using Balea.Authorization.Abac.Context;
using Balea.Authorization.Abac.Grammars;
using Balea.Authorization.Abac.Grammars.BAL;
using Balea.DSL.Grammar.Bal;

namespace Balea.Authorization.Abac.Parsers
Expand Down
9 changes: 6 additions & 3 deletions src/Balea/Balea.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Antlr4.CodeGenerator" />
<PackageReference Include="Antlr4.Runtime" />
<PackageReference Include="Antlr4BuildTasks" />
<PackageReference Include="Antlr4.Runtime.Standard" />
</ItemGroup>


<ItemGroup>
<Antlr4 Include="Authorization/Abac/Grammars/BAL/Bal.g4" />
</ItemGroup>

</Project>
7 changes: 2 additions & 5 deletions test/FunctionalTests/FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Antlr4.CodeGenerator">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Antlr4.Runtime" />
<PackageReference Include="Antlr4BuildTasks" />
<PackageReference Include="Antlr4.Runtime.Standard" />
</ItemGroup>
<ItemGroup>
<None Update="balea.json">
Expand Down