diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2018-01-03 09:28:40 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2018-01-03 09:28:40 -0800 |
| commit | 383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a (patch) | |
| tree | 45bdce007f64e47ff2a0b60fb1920efc3eaf3b00 /csharp | |
| parent | 8529f2aee33ae793c9ce362a45370b98f675370a (diff) | |
| parent | 88e5573b9a8a5c4038f9db3633610f032aab277d (diff) | |
Merge remote-tracking branch 'origin/3.5.x' into master
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> |