From 74f64b667cc558cdc6318275d640e742e7f9cd8b Mon Sep 17 00:00:00 2001
From: Jon Skeet <jonskeet@google.com>
Date: Tue, 28 Nov 2017 12:06:08 +0000
Subject: Fix JsonTokenizer exception message

---
 csharp/src/Google.Protobuf/JsonTokenizer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'csharp/src/Google.Protobuf')

diff --git a/csharp/src/Google.Protobuf/JsonTokenizer.cs b/csharp/src/Google.Protobuf/JsonTokenizer.cs
index 2fc1e7c3..0e403f78 100644
--- a/csharp/src/Google.Protobuf/JsonTokenizer.cs
+++ b/csharp/src/Google.Protobuf/JsonTokenizer.cs
@@ -245,7 +245,7 @@ namespace Google.Protobuf
                             state = State.ObjectAfterColon;
                             break;
                         case ',':
-                            ValidateState(State.ObjectAfterProperty | State.ArrayAfterValue, "Invalid state to read a colon: ");
+                            ValidateState(State.ObjectAfterProperty | State.ArrayAfterValue, "Invalid state to read a comma: ");
                             state = state == State.ObjectAfterProperty ? State.ObjectAfterComma : State.ArrayAfterComma;
                             break;
                         case '"':
-- 
cgit v1.2.3


From 6d6099553b4e9a0cc6bd5a6a92359862a1728db8 Mon Sep 17 00:00:00 2001
From: Jie Luo <anandolee@gmail.com>
Date: Wed, 29 Nov 2017 16:10:44 -0800
Subject: Update csharp version number (#3958)

---
 csharp/src/Google.Protobuf/Google.Protobuf.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'csharp/src/Google.Protobuf')

diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj
index 75b38175..bf7a5e7d 100644
--- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj
+++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj
@@ -4,7 +4,7 @@
     <Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
     <Copyright>Copyright 2015, Google Inc.</Copyright>
     <AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
-    <VersionPrefix>3.4.1</VersionPrefix>
+    <VersionPrefix>3.5.0</VersionPrefix>
     <Authors>Google Inc.</Authors>
     <TargetFrameworks>netstandard1.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-- 
cgit v1.2.3