Bump target frameworks of C# programs from netcoreapp1.0 to netcoreapp2.1 #5838

ObsidianMinor · 2019-03-05T23:58:54Z

Moved global.json up to root of repo, changed SDK version to 2.2.100.
Changed .NET Core SDK in dockerfile for kokoro to version 2.2.100.

.NET Core 1.0 is reaching end of life, it's hard to install, and it's getting in the way of everyone's fun.

This should fix issues with #5802

Move global.json up to root of repo, change SDK ver to 2.2.100 Change .net core sdk in dockerfile for kokoro to ver 2.2.100

ObsidianMinor · 2019-03-06T00:04:44Z

@acozzette can you run a kokoro build to make sure this works?

acozzette · 2019-03-06T00:06:58Z

Sure, I just added the tag to start the build.

csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj

jtattermusch · 2019-03-06T10:38:57Z

This will need a run of https://github.com/protocolbuffers/protobuf/blob/c3340b20a8dbf230ddbc68096ea1e8631317d528/kokoro/linux/dockerfile/push_testing_images.sh to make sure the updated docker images are available.

kokoro/linux/64-bit/Dockerfile

jtattermusch · 2019-03-06T15:08:12Z

I pushed a few more changes to this PR - basically introducing a separate Dockerfile for C# tests (which seems to be in alignment with what protobuf team has been striving to do) - I was getting errors when re-building the multi-language Dockerfile

jtattermusch · 2019-03-06T15:18:25Z

@anandolee @TeBoring can you give me push access to https://hub.docker.com/u/protobuftesting or build and push the C# docker image from this PR yourself? (my dockerhub ID is https://hub.docker.com/u/jtattermusch)

https://github.com/protocolbuffers/protobuf/blob/c3340b20a8dbf230ddbc68096ea1e8631317d528/kokoro/linux/dockerfile/push_testing_images.sh

ObsidianMinor · 2019-03-06T22:49:37Z

conformance/Makefile.am

@@ -316,7 +316,7 @@ conformance-java-lite: javac_middleman_lite
 conformance-csharp: $(other_language_protoc_outputs)
 	@echo "Writing shortcut script conformance-csharp..."
 	@echo '#! /bin/sh' > conformance-csharp
-	@echo 'dotnet ../csharp/src/Google.Protobuf.Conformance/bin/Release/netcoreapp1.0/Google.Protobuf.Conformance.dll "$$@"' >> conformance-csharp
+	@echo 'dotnet ../csharp/src/Google.Protobuf.Conformance/bin/Release/netcoreapp2.1/Google.Protobuf.Conformance.dll "$$@"' >> conformance-csharp


Why do we call the dll directly instead of dotnet run --no-build?

I personally feel more confident that this will really only run the pre-built dll as opposed to to running a dotnet command that can potentially do something extra. No reason to change this in this PR.

jtattermusch · 2019-03-07T18:40:34Z

I pushed the new testing image for C#, restarting tests.

jtattermusch · 2019-03-07T19:03:01Z

The new docker image seems to be working fine, but the c# compatibility test is now failing with
https://source.cloud.google.com/results/invocations/95f1e9c3-988e-46b3-9875-ec63b2cd6564/log. Any idea what's wrong? Help is appreciated.

+ cp ../../../src/protoc protoc_1
+ cp old_protoc protoc_2
+ run_test
+ ./protoc_1 -Iprotos/src -I../../../src/ --csharp_out=src/Google.Protobuf.Test --csharp_opt=base_namespace=Google.Protobuf protos/src/google/protobuf/unittest_import_proto3.proto protos/src/google/protobuf/unittest_import_public_proto3.proto protos/src/google/protobuf/unittest_well_known_types.proto
./protoc_1: error: '/tmp/protobuf/protobuf/csharp/compatibility_tests/v3.0.0/.libs/protoc' does not exist
This script is just a wrapper for protoc.
See the libtool documentation for more information.
+ FAILED=true
+ docker rm -f build_and_run_docker_490e5066-dae0-49b4-8620-d4d8d44a628d
build_and_run_docker_490e5066-dae0-49b4-8620-d4d8d44a628d
+ '[' -z true ']'
+ exit 1
[ID: 7381063] Build finished after 273 secs, exit value: 1

ObsidianMinor · 2019-03-07T19:44:25Z

kokoro/linux/dockerfile/test/csharp/Dockerfile

@@ -0,0 +1,36 @@
+FROM debian:stretch


Original was debian:latest, why change it to stretch? Could this cause the issues we're seeing with compatibility testing?

currently latest = stretch, but meaning of debian:latest can change over time, and the idea of the docker image is to provide a stable runtime environment, so pinning to a specific version seems as a logical choice.
In the past, when debian:lastest changed from jessie to streche, that broke many of our dockerfiles.

The only difference I can see between the last successful run I can find (22 days ago) and this one is that the base image was updated from Debian 9.7 to 9.8 but I don't know if that's the issue (I highly doubt it is).

We could just change the script to use path variables rather than copying files. I believe it'd easier to understand and manage that way in the long run.

ObsidianMinor · 2019-03-08T00:25:30Z

Try the tests one more time @jtattermusch

jtattermusch · 2019-03-11T12:20:32Z

the required dotnet SDK was not available on Kokoro Windows workers, so I added a script to install the right version of SDK before starting a windows build.
5e3e9fb

jtattermusch · 2019-03-11T12:21:40Z

I think the PR is ready for review and merging now.
Please doublecheck the sanity of changes to the compatibility script in
0efbd9a while reviewing.

Bump target frameworks from netcoreapp1.0 to netcoreapp2.2.

d96bec2

Move global.json up to root of repo, change SDK ver to 2.2.100 Change .net core sdk in dockerfile for kokoro to ver 2.2.100

googlebot added the cla: yes label Mar 5, 2019

acozzette added the kokoro:run label Mar 6, 2019

kokoro-team removed the kokoro:run label Mar 6, 2019

Re-add curl install

5808f00

ObsidianMinor mentioned this pull request Mar 6, 2019

First pass at C# benchmarks #5802

Merged

jtattermusch reviewed Mar 6, 2019

View reviewed changes

csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj Outdated Show resolved Hide resolved

This was referenced Mar 6, 2019

Add a kokoro presubmit job for C# on windows #5844

Closed

C#: add System.Memory dependency #5835

Merged

Change all exe target to 2.1

ad28622

jtattermusch reviewed Mar 6, 2019

View reviewed changes

kokoro/linux/64-bit/Dockerfile Outdated Show resolved Hide resolved

jtattermusch added the kokoro:run label Mar 6, 2019

kokoro-team removed the kokoro:run label Mar 6, 2019

Fix incorrect versions in global.json and Dockerfile

afae499

ObsidianMinor changed the title ~~Bump target frameworks of C# programs from netcoreapp1.0 to netcoreapp2.2.~~ Bump target frameworks of C# programs from netcoreapp1.0 to netcoreapp2.1 Mar 6, 2019

jtattermusch reviewed Mar 6, 2019

View reviewed changes

kokoro/linux/64-bit/Dockerfile Outdated Show resolved Hide resolved

Downgrade version to 2.1 to match exe targets

e4dc27d

jtattermusch added the kokoro:run label Mar 6, 2019

kokoro-team removed the kokoro:run label Mar 6, 2019

jtattermusch added 3 commits March 6, 2019 09:28

introduce separate testing Dockerfile for C#

c24ec68

revert changes to the shared Dockerfile

7d246f6

use netcoreapp2.1 for C# conformance tests

b2e8f97

use language specific dockerfile for testing C#

dfb873a

jtattermusch added the kokoro:run label Mar 6, 2019

kokoro-team removed the kokoro:run label Mar 6, 2019

jtattermusch assigned anandolee and TeBoring Mar 6, 2019

ObsidianMinor commented Mar 6, 2019

View reviewed changes

jtattermusch added the kokoro:force-run label Mar 7, 2019

kokoro-team removed the kokoro:force-run label Mar 7, 2019

ObsidianMinor commented Mar 7, 2019

View reviewed changes

Edit compatibility tests script to use parameters instead of file copies

0efbd9a

jtattermusch added the kokoro:run label Mar 8, 2019

kokoro-team removed the kokoro:run label Mar 8, 2019

jtattermusch added the kokoro:run label Mar 11, 2019

kokoro-team removed the kokoro:run label Mar 11, 2019

install dotnet SDK on windows before running the tests

5e3e9fb

jtattermusch force-pushed the csharp/project-runtime-bump branch from 918d198 to 5e3e9fb Compare March 11, 2019 11:25

jtattermusch added the kokoro:run label Mar 11, 2019

kokoro-team removed the kokoro:run label Mar 11, 2019

update csharp_EXTRA_DIST

da2db2a

jtattermusch added the kokoro:run label Mar 11, 2019

kokoro-team removed the kokoro:run label Mar 11, 2019

anandolee approved these changes Mar 11, 2019

View reviewed changes

anandolee merged commit 15fab91 into protocolbuffers:master Mar 11, 2019

jtattermusch mentioned this pull request Mar 12, 2019

C# testing improvements #5876

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump target frameworks of C# programs from netcoreapp1.0 to netcoreapp2.1 #5838

Bump target frameworks of C# programs from netcoreapp1.0 to netcoreapp2.1 #5838

ObsidianMinor commented Mar 5, 2019

ObsidianMinor commented Mar 6, 2019

acozzette commented Mar 6, 2019

jtattermusch commented Mar 6, 2019

jtattermusch commented Mar 6, 2019

jtattermusch commented Mar 6, 2019

ObsidianMinor Mar 6, 2019

jtattermusch Mar 7, 2019

jtattermusch commented Mar 7, 2019

jtattermusch commented Mar 7, 2019

ObsidianMinor Mar 7, 2019 •

edited

Loading

jtattermusch Mar 7, 2019

ObsidianMinor Mar 7, 2019

ObsidianMinor commented Mar 8, 2019

jtattermusch commented Mar 11, 2019

jtattermusch commented Mar 11, 2019

Bump target frameworks of C# programs from netcoreapp1.0 to netcoreapp2.1 #5838

Bump target frameworks of C# programs from netcoreapp1.0 to netcoreapp2.1 #5838

Conversation

ObsidianMinor commented Mar 5, 2019

ObsidianMinor commented Mar 6, 2019

acozzette commented Mar 6, 2019

jtattermusch commented Mar 6, 2019

jtattermusch commented Mar 6, 2019

jtattermusch commented Mar 6, 2019

ObsidianMinor Mar 6, 2019

Choose a reason for hiding this comment

jtattermusch Mar 7, 2019

Choose a reason for hiding this comment

jtattermusch commented Mar 7, 2019

jtattermusch commented Mar 7, 2019

ObsidianMinor Mar 7, 2019 • edited Loading

Choose a reason for hiding this comment

jtattermusch Mar 7, 2019

Choose a reason for hiding this comment

ObsidianMinor Mar 7, 2019

Choose a reason for hiding this comment

ObsidianMinor commented Mar 8, 2019

jtattermusch commented Mar 11, 2019

jtattermusch commented Mar 11, 2019

ObsidianMinor Mar 7, 2019 •

edited

Loading