Skip to content

Commit bc5d8fb

Browse files
committed
Try fix running of CI for dotnet
1 parent 3fcf14d commit bc5d8fb

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,18 +120,21 @@ matrix:
120120
stage: extended-test
121121
- os: osx
122122
osx_image: xcode10.2
123+
dotnet: 2.0
123124
env:
124125
- TARGET=dotnet
125126
- GROUP=LEXER
126127
stage: extended-test
127128
- os: osx
128129
osx_image: xcode10.2
130+
dotnet: 2.0
129131
env:
130132
- TARGET=dotnet
131133
- GROUP=PARSER
132134
stage: extended-test
133135
- os: osx
134136
osx_image: xcode10.2
137+
dotnet: 2.0
135138
env:
136139
- TARGET=dotnet
137140
- GROUP=RECURSION
@@ -162,20 +165,23 @@ matrix:
162165
stage: main-test
163166
- os: linux
164167
jdk: openjdk8
168+
dotnet: 2.0
165169
dist: trusty
166170
env:
167171
- TARGET=dotnet
168172
- GROUP=LEXER
169173
stage: extended-test
170174
- os: linux
171175
jdk: openjdk8
176+
dotnet: 2.0
172177
dist: trusty
173178
env:
174179
- TARGET=dotnet
175180
- GROUP=PARSER
176181
stage: extended-test
177182
- os: linux
178183
jdk: openjdk8
184+
dotnet: 2.0
179185
dist: trusty
180186
env:
181187
- TARGET=dotnet

.travis/before-install-linux-dotnet.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,3 @@
22

33
set -euo pipefail
44

5-
# install dotnet
6-
sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
7-
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
8-
sudo apt-get update
9-
sudo apt-get --allow-unauthenticated install dotnet-dev-1.0.4
10-

.travis/run-tests-dotnet.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ set -euo pipefail
55
# we need to build the runtime before test run, since we used "--no-dependencies"
66
# when we call dotnet cli for restore and build, in order to speed up
77

8-
dotnet restore ../runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.dotnet.csproj
9-
dotnet build -c Release -f netstandard1.3 ../runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.dotnet.csproj
8+
dotnet build -c Release -f netstandard2.0 ../runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.csproj
109

1110
# call test
1211

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ install:
1111
- cinst -y dart-sdk --version=2.8.4
1212
build_script:
1313
- mvn -DskipTests install --batch-mode
14-
- 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
14+
- dotnet build runtime/CSharp/runtime/CSharp/Antlr4.sln -c Release
1515
after_build:
16-
- msbuild /target:pack /property:Configuration=Release /verbosity:detailed runtime/CSharp/runtime/CSharp/Antlr4.sln
16+
- dotnet pack runtime/CSharp/runtime/CSharp/Antlr4.sln -c Release
1717
test_script:
1818
- 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
1919
artifacts:
1.57 KB
Loading

runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<Authors>Eric Vergnaud, Terence Parr, Sam Harwell</Authors>
1616
<Description>The .NET Core C# ANTLR 4 runtime from the ANTLR Organization</Description>
1717
<Summary>The runtime library for parsers generated by the C# target of the standard ANTLR 4 tool.</Summary>
18-
<Copyright>Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.</Copyright>
18+
<Copyright>Copyright (c) 2012-2020 The ANTLR Project. All rights reserved.</Copyright>
1919
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
20-
<PackageLicenseUrl>https://github.com/antlr/antlr4/blob/master/LICENSE.txt</PackageLicenseUrl>
20+
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
2121
<PackageProjectUrl>https://github.com/antlr/antlr4</PackageProjectUrl>
22-
<PackageIconUrl>https://raw.github.com/antlr/website-antlr4/master/images/icons/antlr.png</PackageIconUrl>
22+
<PackageIcon>Antlr.png</PackageIcon>
2323
<PackageReleaseNotes>https://github.com/antlr/antlr4/releases</PackageReleaseNotes>
2424
<PackageTags>antlr parsing grammar</PackageTags>
2525
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>

0 commit comments

Comments
 (0)