From 45eb28b588a3b4ef5e54abf92b1f2b7eafb2cbf8 Mon Sep 17 00:00:00 2001
From: Jisi Liu <jisi.liu@gmail.com>
Date: Mon, 14 May 2018 16:06:22 -0700
Subject: Update version number to 3.6.0

---
 csharp/Google.Protobuf.Tools.nuspec               | 2 +-
 csharp/src/Google.Protobuf/Google.Protobuf.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'csharp')

diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec
index 4294949f..ae8cdd74 100644
--- a/csharp/Google.Protobuf.Tools.nuspec
+++ b/csharp/Google.Protobuf.Tools.nuspec
@@ -5,7 +5,7 @@
     <title>Google Protocol Buffers tools</title>
     <summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
     <description>See project site for more info.</description>
-    <version>3.5.2</version>
+    <version>3.6.0</version>
     <authors>Google Inc.</authors>
     <owners>protobuf-packages</owners>
     <licenseUrl>https://github.com/google/protobuf/blob/master/LICENSE</licenseUrl>
diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj
index 6e4e1e2b..d19531aa 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.5.2</VersionPrefix>
+    <VersionPrefix>3.6.0</VersionPrefix>
     <Authors>Google Inc.</Authors>
     <TargetFrameworks>netstandard1.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-- 
cgit v1.2.3


From 9d64d740a142aa705113c1e7a643003857ca8cf0 Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Tue, 29 May 2018 14:29:59 -0700
Subject: Removed duplicate using statement from ReflectionUtil.cs

---
 csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'csharp')

diff --git a/csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs b/csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs
index 18a70b80..feaeba0e 100644
--- a/csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs
+++ b/csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs
@@ -34,10 +34,6 @@ using Google.Protobuf.Compatibility;
 using System;
 using System.Reflection;
 
-#if NET35
-using Google.Protobuf.Compatibility;
-#endif
-
 namespace Google.Protobuf.Reflection
 {
     /// <summary>
-- 
cgit v1.2.3