diff options
| author | Jon Skeet <skeet@pobox.com> | 2016-07-14 22:01:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-14 22:01:47 +0100 |
| commit | 10a8fb4e73b3dada58123aeabc393288ac791dc8 (patch) | |
| tree | 54b058cfaff68b49a20aa8dfaec297faaddda109 /conformance/Makefile.am | |
| parent | 042993b3dd8c52f979870c91ea7fcbcf0dcf94a0 (diff) | |
| download | protobuf-10a8fb4e73b3dada58123aeabc393288ac791dc8.tar.gz protobuf-10a8fb4e73b3dada58123aeabc393288ac791dc8.tar.bz2 protobuf-10a8fb4e73b3dada58123aeabc393288ac791dc8.zip | |
Move to dotnet cli for building, and .NET Core (netstandard1.0) as target platform (#1727)
Move to dotnet cli for building, and .NET Core (netstandard1.0) as target platform
This also updates the version number to 3.0.0-beta4
Diffstat (limited to 'conformance/Makefile.am')
| -rw-r--r-- | conformance/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conformance/Makefile.am b/conformance/Makefile.am index 5538cc75..78be9c8a 100644 --- a/conformance/Makefile.am +++ b/conformance/Makefile.am @@ -246,7 +246,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 'mono ../csharp/src/Google.Protobuf.Conformance/bin/Release/Google.Protobuf.Conformance.exe "$$@"' >> conformance-csharp + @echo 'dotnet ../csharp/src/Google.Protobuf.Conformance/bin/Release/netcoreapp1.0/Google.Protobuf.Conformance.dll "$$@"' >> conformance-csharp @chmod +x conformance-csharp # Targets for actually running tests. |