Skip to content

Commit 0c52335

Browse files
committed
Update .NET SDK to 2.0.3
This will allow SourceLink as per protocolbuffers#4179, and mean that we can use C# 7.0 language features in the library (but not in generated code). This does not affect which platforms we're *targeting*, so end users won't see any difference. It would be nice to update to 2.1.4, but AppVeyor's "Visual Studio 2017" environment is only 2.0.3.
1 parent 94f3be0 commit 0c52335

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

Diff for: .travis.yml

+9-2
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,16 @@ matrix:
5959
env: CONFIG=csharp
6060
language: csharp
6161
dist: trusty
62-
sudo: required
63-
dotnet: 1.0.4
62+
dotnet: 2.0.3
6463
mono: none
64+
# Install the .NET Core 1.0 runtime as that's what we test against
65+
addons:
66+
apt:
67+
sources:
68+
- sourceline: 'deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main'
69+
key_url: 'https://packages.microsoft.com/keys/microsoft.asc'
70+
packages:
71+
- dotnet-sharedframework-microsoft.netcore.app-1.0.5
6572
# This test is kept on travis because it doesn't play nicely with other
6673
# tests on jenkins running in parallel.
6774
- os: linux

Diff for: csharp/global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "1.0.0"
3+
"version": "2.0.3"
44
}
55
}

Diff for: kokoro/linux/prepare_build_linux_rc

+7-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
# Source this rc script to prepare the environment for Linux builds
44

55
# Set up 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
6+
sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
7+
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EB3E94ADBE1229CF
88
sudo apt-get update
9-
sudo apt-get install -y dotnet-dev-1.0.4
9+
# We use the .NET Core SDK 2.x to build...
10+
sudo apt-get install -y dotnet-sdk-2.0.3
11+
# But we also need the 1.x framework to test against, as we
12+
# target netstandard1.x
13+
sudo apt-get install -y dotnet-sharedframework-microsoft.netcore.app-1.0.5

0 commit comments

Comments
 (0)