diff options
| author |  Jisi Liu <liujisi@google.com> | 2016-05-16 13:46:16 -0700 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2016-05-16 13:46:16 -0700 |
| commit | c8be6ee00c3afd59aee970a8c648099d78bdd576 (patch) | |
| tree | 9b3acf76ea61e776f7de414d59c205bd69badddd /csharp | |
| parent | dc4970684ab8b76795cfb2a1e6bdbf54b79848f2 (diff) | |
| parent | 3470b6895aa659b7559ed678e029a5338e535f14 (diff) | |
Merge pull request #1542 from google/beta-3
Merge Beta 3 release branch into master
Diffstat (limited to 'csharp')
| -rw-r--r-- | csharp/Google.Protobuf.Tools.nuspec | 4 | ||||
| -rw-r--r-- | csharp/src/Google.Protobuf/Google.Protobuf.nuspec | 4 | ||||
| -rw-r--r-- | csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index 2b66b081..e4240dae 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.0.0-beta2</version> + <version>3.0.0-beta3</version> <authors>Google Inc.</authors> <owners>protobuf-packages</owners> <licenseUrl>https://github.com/google/protobuf/blob/master/LICENSE</licenseUrl> @@ -34,4 +34,4 @@ <file src="..\src\google\protobuf\type.proto" target="tools\google\protobuf" /> <file src="..\src\google\protobuf\wrappers.proto" target="tools\google\protobuf" /> </files> -</package>
\ No newline at end of file +</package> diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.nuspec b/csharp/src/Google.Protobuf/Google.Protobuf.nuspec index 2892b8bf..90e3da3d 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.nuspec +++ b/csharp/src/Google.Protobuf/Google.Protobuf.nuspec @@ -5,7 +5,7 @@ <title>Google Protocol Buffers C#</title> <summary>C# runtime library for Protocol Buffers - Google's data interchange format.</summary> <description>See project site for more info.</description> - <version>3.0.0-beta2</version> + <version>3.0.0-beta3</version> <authors>Google Inc.</authors> <owners>protobuf-packages</owners> <licenseUrl>https://github.com/google/protobuf/blob/master/LICENSE</licenseUrl> @@ -51,4 +51,4 @@ <file src="bin/ReleaseSigned/Google.Protobuf.xml" target="lib/dotnet" /> <file src="**\*.cs" target="src" /> </files> -</package>
\ No newline at end of file +</package> diff --git a/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs b/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs index 225ac0dd..0516f18e 100644 --- a/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs +++ b/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs @@ -64,4 +64,4 @@ using System.Security; [assembly: AssemblyVersion("3.0.0.0")]
[assembly: AssemblyFileVersion("3.0.0.0")]
-[assembly: AssemblyInformationalVersion("3.0.0-alpha4")]
+[assembly: AssemblyInformationalVersion("3.0.0-beta3")]
|