diff options
| author | Adam Cozzette <acozzette@google.com> | 2018-08-01 13:44:55 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2018-08-01 13:44:55 -0700 |
| commit | 94d55e529204cc8575bf1070dc1e2375dbc8a4c5 (patch) | |
| tree | 20730e597f914fd2430c66b9bebe633e017a4fe0 /csharp | |
| parent | 3d62db3ecd5377025a458bca827ab4ca12d5c1f0 (diff) | |
| parent | 48cb18e5c419ddd23d9badcfe4e9df7bde1979b2 (diff) | |
| download | protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.tar.gz protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.tar.bz2 protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.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 |
2 files changed, 2 insertions, 2 deletions
diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index 0ba7cc9f..901d5ce9 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.6.0</version> + <version>3.6.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 46728b72..a056b435 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.6.0</VersionPrefix> + <VersionPrefix>3.6.1</VersionPrefix> <Authors>Google Inc.</Authors> <TargetFrameworks>netstandard1.0;net45</TargetFrameworks> <GenerateDocumentationFile>true</GenerateDocumentationFile> |