aboutsummaryrefslogtreecommitdiffhomepage
path: root/csharp/src
diff options
context:
space:
mode:
authorGravatar John Brock <JohnHBrock@gmail.com>2017-05-24 14:35:06 -0700
committerGravatar Jon Skeet <skeet@pobox.com>2017-05-25 20:20:31 +0100
commit95749d5af626cfb1925c932d23f5080fc609e11e (patch)
tree19250a4d347dc20b763872d35fbe33905768bcca /csharp/src
parent0b07d7eb9e15d897bfd3f3d569e0a66b2bb48d18 (diff)
update csharp README and fix .NET 3.5 build error
Diffstat (limited to 'csharp/src')
-rwxr-xr-x[-rw-r--r--]csharp/src/Google.Protobuf.Test/Program.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf.Test/Program.cs b/csharp/src/Google.Protobuf.Test/Program.cs
index 6e4daac9..954c02b5 100644..100755
--- a/csharp/src/Google.Protobuf.Test/Program.cs
+++ b/csharp/src/Google.Protobuf.Test/Program.cs
@@ -38,7 +38,11 @@ namespace Google.Protobuf.Test
{
public static int Main(string[] args)
{
- return new AutoRun(typeof(Program).GetTypeInfo().Assembly).Execute(args);
+ #if NET35
+ return new AutoRun(typeof(Program).Assembly).Execute(args);
+ #else
+ return new AutoRun(typeof(Program).GetTypeInfo().Assembly).Execute(args);
+ #endif
}
}
} \ No newline at end of file