diff options
| author | Bo Yang <teboring@google.com> | 2019-03-04 10:18:18 -0800 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2019-03-04 10:18:18 -0800 |
| commit | cb6fa92ee8f924e8c524efdbe502858e97e6975d (patch) | |
| tree | fd47f781115c7a55aac7538e652ce96b94a1a7af /csharp | |
| parent | 50bd9f0a7c14ed7689fcb9f5885e9ffacf9b80a9 (diff) | |
| parent | 582743bf40c5d3639a70f98f183914a2c0cd0680 (diff) | |
| download | platform_external_protobuf-cb6fa92ee8f924e8c524efdbe502858e97e6975d.tar.gz platform_external_protobuf-cb6fa92ee8f924e8c524efdbe502858e97e6975d.tar.bz2 platform_external_protobuf-cb6fa92ee8f924e8c524efdbe502858e97e6975d.zip | |
Merge branch '3.7.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 411ee2805..396fdf951 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.1</version> + <version>3.7.0</version> <authors>Google Inc.</authors> <owners>protobuf-packages</owners> <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl> diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index 9c8edc156..291d41c44 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.1</VersionPrefix> + <VersionPrefix>3.7.0</VersionPrefix> <LangVersion>6</LangVersion> <Authors>Google Inc.</Authors> <TargetFrameworks>netstandard1.0;net45</TargetFrameworks> |