diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2016-12-03 11:51:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-03 11:51:25 -0500 |
| commit | f1ce60e7b45c16affa4c8a92a9a129755c5fcfd5 (patch) | |
| tree | b71a425660fc225154547f542ff1dbe0e342ade3 /csharp/src/Google.Protobuf.Conformance/project.json | |
| parent | 4280c2740300f414d95a5f282426f25f5b13e05d (diff) | |
| download | protobuf-f1ce60e7b45c16affa4c8a92a9a129755c5fcfd5.tar.gz protobuf-f1ce60e7b45c16affa4c8a92a9a129755c5fcfd5.tar.bz2 protobuf-f1ce60e7b45c16affa4c8a92a9a129755c5fcfd5.zip | |
Factored Conformance and Benchmark test messages into shared test schema. (#1971)
* Factored Conformance test messages into shared test schema.
* Updated benchmarks to use new proto3 message locations.
* Fixed include path.
* Conformance: fixed include of Python test messages.
* Make maven in Rakefile use --batch-mode.
* Revert changes to benchmarks.
On second thought I think a separate schema for
CPU benchmarking makes sense.
* Try regenerating C# protos for new test protos.
* Removed benchmark messages from test proto.
* Added Jon Skeet's fixes for C#.
* Removed duplicate/old test messages C# file.
* C# fixes for test schema move.
* Fixed C# to use the correct TestAllTypes message.
* Fixes for Objective C test schema move.
* Added missing EXTRA_DIST file.
Diffstat (limited to 'csharp/src/Google.Protobuf.Conformance/project.json')
| -rw-r--r-- | csharp/src/Google.Protobuf.Conformance/project.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf.Conformance/project.json b/csharp/src/Google.Protobuf.Conformance/project.json index 84b23c45..4cf05231 100644 --- a/csharp/src/Google.Protobuf.Conformance/project.json +++ b/csharp/src/Google.Protobuf.Conformance/project.json @@ -4,10 +4,12 @@ "emitEntryPoint": true }, "dependencies": { - "Google.Protobuf": { "target": "project" } + "Google.Protobuf": { "target": "project" }, + "Google.Protobuf.Test": { "target": "project" } }, "frameworks": { "netcoreapp1.0": { + "imports": [ "dnxcore50", "netcoreapp1.0", "portable-net45+win8" ], "dependencies": { "Microsoft.NETCore.App": { "type": "platform", |