aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2018-08-03 12:11:19 -0700
committerGitHub <noreply@github.com>2018-08-03 12:11:19 -0700
commit199d6f6ea87974a9f80187cefe48f57201b2adf2 (patch)
tree7b8ae4ac74a0879efc7c25e62f265e5d99652b55
parent48cb18e5c419ddd23d9badcfe4e9df7bde1979b2 (diff)
parent149e31a6c046236c2d7d2fc8e2997270ae10fc3d (diff)
downloadprotobuf-199d6f6ea87974a9f80187cefe48f57201b2adf2.tar.gz
protobuf-199d6f6ea87974a9f80187cefe48f57201b2adf2.tar.bz2
protobuf-199d6f6ea87974a9f80187cefe48f57201b2adf2.zip
Merge pull request #4997 from jtattermusch/backport_nuget_building
Backport building C# nuget to 3.6.x branch
-rw-r--r--csharp/global.json2
-rw-r--r--kokoro/linux/prepare_build_linux_rc2
-rw-r--r--kokoro/release/csharp/windows/build_nuget.bat5
-rw-r--r--kokoro/release/csharp/windows/release.cfg11
4 files changed, 18 insertions, 2 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
new file mode 100644
index 00000000..5da1e136
--- /dev/null
+++ b/kokoro/release/csharp/windows/build_nuget.bat
@@ -0,0 +1,5 @@
+@rem enter repo root
+cd /d %~dp0\..\..\..\..
+
+cd csharp
+call build_packages.bat
diff --git a/kokoro/release/csharp/windows/release.cfg b/kokoro/release/csharp/windows/release.cfg
new file mode 100644
index 00000000..f508c65b
--- /dev/null
+++ b/kokoro/release/csharp/windows/release.cfg
@@ -0,0 +1,11 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/release/csharp/windows/build_nuget.bat"
+timeout_mins: 60
+
+action {
+ define_artifacts {
+ regex: "**/*.nupkg"
+ }
+}