Index: third_party/protobuf/csharp/buildall.sh |
diff --git a/third_party/protobuf/csharp/buildall.sh b/third_party/protobuf/csharp/buildall.sh |
index 45af705f385782dcdbeafd149cd85359aca4fb6c..cab3222992dd7c0c4e2c0f523ef43b94ead71283 100755 |
--- a/third_party/protobuf/csharp/buildall.sh |
+++ b/third_party/protobuf/csharp/buildall.sh |
@@ -1,17 +1,16 @@ |
#!/bin/bash |
-# Use mono to build solution and run all tests. |
-# Adjust these to reflect the location of nunit-console in your system. |
-NUNIT_CONSOLE=nunit-console |
- |
-# The rest you can leave intact |
CONFIG=Release |
SRC=$(dirname $0)/src |
set -ex |
-echo Building the solution. |
-xbuild /p:Configuration=$CONFIG $SRC/Google.Protobuf.sln |
+echo Building relevant projects. |
+dotnet build -c $CONFIG $SRC/Google.Protobuf $SRC/Google.Protobuf.Test $SRC/Google.Protobuf.Conformance |
echo Running tests. |
-$NUNIT_CONSOLE $SRC/Google.Protobuf.Test/bin/$CONFIG/Google.Protobuf.Test.dll |
+# Only test netcoreapp1.0, which uses the .NET Core runtime. |
+# If we want to test the .NET 4.5 version separately, we could |
+# run Mono explicitly. However, we don't have any differences between |
+# the .NET 4.5 and netstandard1.0 assemblies. |
+dotnet test -c $CONFIG -f netcoreapp1.0 $SRC/Google.Protobuf.Test |