Skip to content

Commit e613eae

Browse files
authored
Merge pull request #2987 from KvanTTT/CSharpRuntimeUpgrade
C# runtime upgrade
2 parents 47e9734 + a001c2f commit e613eae

File tree

230 files changed

+1974
-5549
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+1974
-5549
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ xcuserdata
9797
# VSCode Java plugin temporary files
9898
javac-services.0.log
9999
javac-services.0.log.lck
100-
test/
101100

102101
# Don't ignore python tests
103102
!runtime/Python3/test/

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,9 @@ matrix:
147147
stage: smoke-test
148148
- os: linux
149149
jdk: openjdk8
150-
env: TARGET=csharp
150+
env:
151+
- TARGET=dotnet
152+
- GROUP=MAIN
151153
stage: main-test
152154
- os: linux
153155
jdk: openjdk8
@@ -162,21 +164,18 @@ matrix:
162164
stage: main-test
163165
- os: linux
164166
jdk: openjdk8
165-
dist: trusty
166167
env:
167168
- TARGET=dotnet
168169
- GROUP=LEXER
169170
stage: extended-test
170171
- os: linux
171172
jdk: openjdk8
172-
dist: trusty
173173
env:
174174
- TARGET=dotnet
175175
- GROUP=PARSER
176176
stage: extended-test
177177
- os: linux
178178
jdk: openjdk8
179-
dist: trusty
180179
env:
181180
- TARGET=dotnet
182181
- GROUP=RECURSION

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
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-
5+
wget https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
6+
sudo dpkg -i packages-microsoft-prod.deb
7+
sudo apt-get update; \
8+
sudo apt-get install -y apt-transport-https && \
9+
sudo apt-get update && \
10+
sudo apt-get install -y dotnet-sdk-3.1

0 commit comments

Comments
 (0)