Merge pull request #3 from sharwell/update-v4

Update to ANTLR 4 4.6.5-beta002
tunnelvisionlabs · Apr 8, 2018 · 388a34f · 388a34f
2 parents b859fa4 + f3ded15
commit 388a34f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 36 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,10 +7,10 @@ script:
   - dotnet build -f netcoreapp1.1 DotnetValidation.sln
   - dotnet build -f netcoreapp2.0 DotnetValidation.sln
   - cd ../..
-#  - cd antlr4/CpsConsoleApplication
-#  - dotnet build -f netcoreapp1.1 DotnetValidation.sln
-#  - dotnet build -f netcoreapp2.0 DotnetValidation.sln
-#  - cd ../..
+  - cd antlr4/CpsConsoleApplication
+  - dotnet build -f netcoreapp1.1 DotnetValidation.sln
+  - dotnet build -f netcoreapp2.0 DotnetValidation.sln
+  - cd ../..
   - cd antlr4/CpsConsoleApplicationJavaCodegen
   - unset _JAVA_OPTIONS
   - dotnet build -f netcoreapp1.1 DotnetValidation.sln

diff --git a/antlr4/CpsConsoleApplication/DotnetValidation.csproj b/antlr4/CpsConsoleApplication/DotnetValidation.csproj
@@ -7,22 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Antlr4" Version="4.6.5-beta001" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Antlr4 Include="Grammar.g4">
-      <Generator>MSBuild:Compile</Generator>
-      <CustomToolNamespace>DotnetValidation</CustomToolNamespace>
-    </Antlr4>
-    <Antlr4 Include="SubFolder\SubGrammar.g4">
-      <Generator>MSBuild:Compile</Generator>
-      <CustomToolNamespace>DotnetValidation.SubFolder</CustomToolNamespace>
-    </Antlr4>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="@(Antlr4)" />
+    <PackageReference Include="Antlr4" Version="4.6.5-beta002" />
   </ItemGroup>
 
 </Project>
diff --git a/antlr4/CpsConsoleApplicationJavaCodegen/DotnetValidation.csproj b/antlr4/CpsConsoleApplicationJavaCodegen/DotnetValidation.csproj
@@ -7,22 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Antlr4" Version="4.6.5-beta001" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Antlr4 Include="Grammar.g4">
-      <Generator>MSBuild:Compile</Generator>
-      <CustomToolNamespace>DotnetValidation</CustomToolNamespace>
-    </Antlr4>
-    <Antlr4 Include="SubFolder\SubGrammar.g4">
-      <Generator>MSBuild:Compile</Generator>
-      <CustomToolNamespace>DotnetValidation.SubFolder</CustomToolNamespace>
-    </Antlr4>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="@(Antlr4)" />
+    <PackageReference Include="Antlr4" Version="4.6.5-beta002" />
   </ItemGroup>
 
 </Project>