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.Test/Google.Protobuf.Test.xproj | |
| 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.Test/Google.Protobuf.Test.xproj')
| -rw-r--r-- | csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.xproj | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.xproj b/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.xproj index a9a1cc04..6370441e 100644 --- a/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.xproj +++ b/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.xproj @@ -11,9 +11,11 @@ <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath> <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath> </PropertyGroup> - <PropertyGroup> <SchemaVersion>2.0</SchemaVersion> </PropertyGroup> + <ItemGroup> + <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> + </ItemGroup> <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" /> </Project>
\ No newline at end of file |