aboutsummaryrefslogtreecommitdiff
path: root/csharp
diff options
context:
space:
mode:
authorJisi Liu <liujisi@google.com>2016-07-29 14:27:53 -0700
committerGitHub <noreply@github.com>2016-07-29 14:27:53 -0700
commit169d0ca43c5663c1b36cf4918f08aa031f5df468 (patch)
tree4781b8c492591d73e7eea2b2abd4c546baf1d135 /csharp
parent42e54876be41fdf0b22dea4e4ea7f416d5d1f3ec (diff)
parentc4790429fc454a687312a48a22e30d93c29efd4d (diff)
downloadprotobuf-169d0ca43c5663c1b36cf4918f08aa031f5df468.tar.gz
protobuf-169d0ca43c5663c1b36cf4918f08aa031f5df468.tar.bz2
protobuf-169d0ca43c5663c1b36cf4918f08aa031f5df468.zip
Merge pull request #1893 from google/3.0.0-GA
Merge 3.0.0-GA into master
Diffstat (limited to 'csharp')
-rw-r--r--csharp/Google.Protobuf.Tools.nuspec2
-rw-r--r--csharp/src/Google.Protobuf/project.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec
index 659b2e77..24b4a776 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-beta4</version>
+ <version>3.0.0</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/project.json b/csharp/src/Google.Protobuf/project.json
index c8eae6d0..9b831f12 100644
--- a/csharp/src/Google.Protobuf/project.json
+++ b/csharp/src/Google.Protobuf/project.json
@@ -1,5 +1,5 @@
{
- "version": "3.0.0-beta4",
+ "version": "3.0.0",
"title": "Google Protocol Buffers",
"description": "See project site for more info.",
"authors": [ "Google Inc." ],