Try fix running of CI for dotnet

antlr · Dec 26, 2020 · bc5d8fb · bc5d8fb
1 parent 3fcf14d
commit bc5d8fb
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -120,18 +120,21 @@ matrix:
       stage: extended-test
     - os: osx
       osx_image: xcode10.2
+      dotnet: 2.0
       env:
         - TARGET=dotnet
         - GROUP=LEXER
       stage: extended-test
     - os: osx
       osx_image: xcode10.2
+      dotnet: 2.0
       env:
         - TARGET=dotnet
         - GROUP=PARSER
       stage: extended-test
     - os: osx
       osx_image: xcode10.2
+      dotnet: 2.0
       env:
         - TARGET=dotnet
         - GROUP=RECURSION
@@ -162,20 +165,23 @@ matrix:
       stage: main-test
     - os: linux
       jdk: openjdk8
+      dotnet: 2.0
       dist: trusty
       env:
         - TARGET=dotnet
         - GROUP=LEXER
       stage: extended-test
     - os: linux
       jdk: openjdk8
+      dotnet: 2.0
       dist: trusty
       env:
         - TARGET=dotnet
         - GROUP=PARSER
       stage: extended-test
     - os: linux
       jdk: openjdk8
+      dotnet: 2.0
       dist: trusty
       env:
         - TARGET=dotnet

diff --git a/.travis/before-install-linux-dotnet.sh b/.travis/before-install-linux-dotnet.sh
@@ -2,9 +2,3 @@
 
 set -euo pipefail
 
-# install dotnet
-sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
-sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
-sudo apt-get update
-sudo apt-get --allow-unauthenticated install dotnet-dev-1.0.4
-
diff --git a/.travis/run-tests-dotnet.sh b/.travis/run-tests-dotnet.sh
@@ -5,8 +5,7 @@ set -euo pipefail
 # we need to build the runtime before test run, since we used "--no-dependencies"
 # when we call dotnet cli for restore and build, in order to speed up
 
-dotnet restore ../runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.dotnet.csproj
-dotnet build -c Release -f netstandard1.3 ../runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.dotnet.csproj
+dotnet build -c Release -f netstandard2.0 ../runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.csproj
 
 # call test
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -11,9 +11,9 @@ install:
   - cinst -y dart-sdk --version=2.8.4
 build_script:
   - mvn -DskipTests install --batch-mode
-  - msbuild /target:restore /target:rebuild /property:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /verbosity:detailed runtime/CSharp/runtime/CSharp/Antlr4.sln
+  - dotnet build runtime/CSharp/runtime/CSharp/Antlr4.sln -c Release
 after_build:
-  - msbuild /target:pack /property:Configuration=Release /verbosity:detailed runtime/CSharp/runtime/CSharp/Antlr4.sln
+  - dotnet pack runtime/CSharp/runtime/CSharp/Antlr4.sln -c Release
 test_script:
   - mvn install -Dantlr-php-php="C:\tools\php\php.exe" -Dantlr-dart-dart="C:\tools\dart-sdk\bin\dart.exe" -Dantlr-dart-pub="C:\tools\dart-sdk\bin\pub.bat" -Dantlr-dart-dart2native="C:\tools\dart-sdk\bin\dart2native.bat" -Dantlr-python2-python="C:\Python27\python.exe" -Dantlr-python3-python="C:\Python35\python.exe" --batch-mode
 artifacts:

diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr.png b/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr.png
diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.csproj b/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.csproj
@@ -15,11 +15,11 @@
     <Authors>Eric Vergnaud, Terence Parr, Sam Harwell</Authors>
     <Description>The .NET Core C# ANTLR 4 runtime from the ANTLR Organization</Description>
     <Summary>The runtime library for parsers generated by the C# target of the standard ANTLR 4 tool.</Summary>
-    <Copyright>Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.</Copyright>
+    <Copyright>Copyright (c) 2012-2020 The ANTLR Project. All rights reserved.</Copyright>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageLicenseUrl>https://github.com/antlr/antlr4/blob/master/LICENSE.txt</PackageLicenseUrl>
+    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/antlr/antlr4</PackageProjectUrl>
-    <PackageIconUrl>https://raw.github.com/antlr/website-antlr4/master/images/icons/antlr.png</PackageIconUrl>
+    <PackageIcon>Antlr.png</PackageIcon>
     <PackageReleaseNotes>https://github.com/antlr/antlr4/releases</PackageReleaseNotes>
     <PackageTags>antlr parsing grammar</PackageTags>
     <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>