diff options
| author | Adam Cozzette <acozzette@google.com> | 2018-06-25 13:22:10 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2018-06-25 13:22:10 -0700 |
| commit | 82d3d7d250645322f8a7343188e5ae6246a76414 (patch) | |
| tree | 34b7acb87b15c3b8395df3d311f2e795a1285d60 /csharp | |
| parent | 35567c166842cca3ff6af3226ff526f25c79507f (diff) | |
| parent | f7ada1280fac4af717d478e6a9765d3f02b418b3 (diff) | |
| download | protobuf-82d3d7d250645322f8a7343188e5ae6246a76414.tar.gz protobuf-82d3d7d250645322f8a7343188e5ae6246a76414.tar.bz2 protobuf-82d3d7d250645322f8a7343188e5ae6246a76414.zip | |
Merge branch '3.6.x' into merge-3-6-x
Diffstat (limited to 'csharp')
| -rw-r--r-- | csharp/Google.Protobuf.Tools.nuspec | 2 | ||||
| -rw-r--r-- | csharp/src/Google.Protobuf/Google.Protobuf.csproj | 2 | ||||
| -rw-r--r-- | csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index e3386047..0ba7cc9f 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 93dcd854..46728b72 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> 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> |