diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2017-12-19 14:50:32 -0800 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2017-12-19 14:50:32 -0800 |
commit | 96810dea740df75e7a3ff65f11dab7f7383cef7f (patch) | |
tree | 75647c1ec4ae38c12ea48e1a2d1e867d979f86cb /csharp | |
parent | 7bd16064847c410c0f1e5169b8f494fee8b14c93 (diff) | |
parent | eff55ece0813c16d318a80ec20c89d81bac34efc (diff) | |
download | protobuf-96810dea740df75e7a3ff65f11dab7f7383cef7f.tar.gz protobuf-96810dea740df75e7a3ff65f11dab7f7383cef7f.tar.bz2 protobuf-96810dea740df75e7a3ff65f11dab7f7383cef7f.zip |
Merge branch '3.5.x' of github.com:google/protobuf into changelog
Diffstat (limited to 'csharp')
-rw-r--r-- | csharp/Google.Protobuf.Tools.nuspec | 2 | ||||
-rw-r--r-- | csharp/src/Google.Protobuf/Google.Protobuf.csproj | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index 7cd9dc59..62eb3b58 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.0</version> + <version>3.5.1</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 bf7a5e7d..4df0bda6 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.0</VersionPrefix> + <VersionPrefix>3.5.1</VersionPrefix> <Authors>Google Inc.</Authors> <TargetFrameworks>netstandard1.0;net45</TargetFrameworks> <GenerateDocumentationFile>true</GenerateDocumentationFile> |