diff options
author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-07-18 20:04:59 +0200 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-18 11:04:59 -0700 |
commit | f50be7de91854e1c97e156018fdef152ac8922a3 (patch) | |
tree | 8256b3203f31cc9161e4d71d4271d91bec7bc80c | |
parent | d2980062c859649523d5fd51d6b55ab310e47482 (diff) | |
download | protobuf-f50be7de91854e1c97e156018fdef152ac8922a3.tar.gz protobuf-f50be7de91854e1c97e156018fdef152ac8922a3.tar.bz2 protobuf-f50be7de91854e1c97e156018fdef152ac8922a3.zip |
Fix C# nuget build on Kokoro (#4912)
* upgrade dotnet SDK to 2.1.3 on kokoro linux
-rw-r--r-- | csharp/global.json | 2 | ||||
-rw-r--r-- | kokoro/linux/prepare_build_linux_rc | 2 | ||||
-rw-r--r-- | kokoro/release/csharp/windows/build_nuget.bat | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/csharp/global.json b/csharp/global.json index 5ab775b9..080dcb94 100644 --- a/csharp/global.json +++ b/csharp/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "2.0.3" + "version": "2.1.3" } } diff --git a/kokoro/linux/prepare_build_linux_rc b/kokoro/linux/prepare_build_linux_rc index f64ea952..d9b3bec3 100644 --- a/kokoro/linux/prepare_build_linux_rc +++ b/kokoro/linux/prepare_build_linux_rc @@ -7,7 +7,7 @@ sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsof sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EB3E94ADBE1229CF sudo apt-get update # We use the .NET Core SDK 2.x to build... -sudo apt-get install -y dotnet-sdk-2.0.3 +sudo apt-get install -y dotnet-sdk-2.1.3 # But we also need the 1.x framework to test against, as we # target netstandard1.x sudo apt-get install -y dotnet-sharedframework-microsoft.netcore.app-1.0.5 diff --git a/kokoro/release/csharp/windows/build_nuget.bat b/kokoro/release/csharp/windows/build_nuget.bat index bc15bd57..5da1e136 100644 --- a/kokoro/release/csharp/windows/build_nuget.bat +++ b/kokoro/release/csharp/windows/build_nuget.bat @@ -1,5 +1,5 @@ @rem enter repo root cd /d %~dp0\..\..\..\.. -cd csharp\src +cd csharp call build_packages.bat |