Merge pull request #9452 from nicolasnoble/version-change

Changing versions from -dev to -pre1 on the release branch.
8 years ago · 196fdc422c
parent 889b0a4535 da83b376eb
commit 196fdc422c
27 changed files with 36 additions and 36 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -42,7 +42,7 @@
 cmake_minimum_required(VERSION 2.8)

 set(PACKAGE_NAME      "grpc")
-set(PACKAGE_VERSION   "1.1.0-dev")
+set(PACKAGE_VERSION   "1.1.0-pre1")
 set(PACKAGE_STRING    "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 set(PACKAGE_TARNAME   "${PACKAGE_NAME}-${PACKAGE_VERSION}")
 set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")
--- a/6
+++ b/6
@ -441,9 +441,9 @@ E = @echo
 Q = @
 endif

-CORE_VERSION = 2.0.0-dev
-CPP_VERSION = 1.1.0-dev
-CSHARP_VERSION = 1.1.0-dev
+CORE_VERSION = 2.0.0-pre1
+CPP_VERSION = 1.1.0-pre1
+CSHARP_VERSION = 1.1.0-pre1

 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
--- a/build.yaml
+++ b/build.yaml
@ -12,9 +12,9 @@ settings:
  '#08': Use "-preN" suffixes to identify pre-release versions
  '#09': Per-language overrides are possible with (eg) ruby_version tag here
  '#10': See the expand_version.py for all the quirks here
-  core_version: 2.0.0-dev
+  core_version: 2.0.0-pre1
  g_stands_for: good
-  version: 1.1.0-dev
+  version: 1.1.0-pre1
 filegroups:
 - name: census
  public_headers:
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "grpc",
-  "version": "1.1.0-dev",
+  "version": "1.1.0-pre1",
  "author": "Google Inc.",
  "description": "gRPC Library for Node",
  "homepage": "http://www.grpc.io/",
--- a/package.xml
+++ b/package.xml
@ -13,8 +13,8 @@
 <date>2017-01-13</date>
 <time>16:06:07</time>
 <version>
-  <release>1.1.0dev</release>
-  <api>1.1.0dev</api>
+  <release>1.1.0RC1</release>
+  <api>1.1.0RC1</api>
 </version>
 <stability>
  <release>beta</release>
--- a/src/core/lib/surface/version.c
+++ b/src/core/lib/surface/version.c
@ -36,6 +36,6 @@

 #include <grpc/grpc.h>

-const char *grpc_version_string(void) { return "2.0.0-dev"; }
+const char *grpc_version_string(void) { return "2.0.0-pre1"; }

 const char *grpc_g_stands_for(void) { return "good"; }
--- a/src/cpp/common/version_cc.cc
+++ b/src/cpp/common/version_cc.cc
@ -37,5 +37,5 @@
 #include <grpc++/grpc++.h>

 namespace grpc {
-grpc::string Version() { return "1.1.0-dev"; }
+grpc::string Version() { return "1.1.0-pre1"; }
 }
--- a/src/csharp/Grpc.Auth/project.json
+++ b/src/csharp/Grpc.Auth/project.json
@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-dev",
+  "version": "1.1.0-pre1",
  "title": "gRPC C# Auth",
  "authors": [ "Google Inc." ],
  "copyright": "Copyright 2015, Google Inc.",
@ -21,7 +21,7 @@
    }
  },
  "dependencies": {
-    "Grpc.Core": "1.1.0-dev",
+    "Grpc.Core": "1.1.0-pre1",
    "Google.Apis.Auth": "1.16.0"
  },
  "frameworks": {
--- a/src/csharp/Grpc.Core/VersionInfo.cs
+++ b/src/csharp/Grpc.Core/VersionInfo.cs
@ -53,6 +53,6 @@ namespace Grpc.Core
        /// <summary>
        /// Current version of gRPC C#
        /// </summary>
-        public const string CurrentVersion = "1.1.0-dev";
+        public const string CurrentVersion = "1.1.0-pre1";
    }
 }
--- a/src/csharp/Grpc.Core/project.json
+++ b/src/csharp/Grpc.Core/project.json
@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-dev",
+  "version": "1.1.0-pre1",
  "title": "gRPC C# Core",
  "authors": [ "Google Inc." ],
  "copyright": "Copyright 2015, Google Inc.",
--- a/src/csharp/Grpc.HealthCheck/project.json
+++ b/src/csharp/Grpc.HealthCheck/project.json
@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-dev",
+  "version": "1.1.0-pre1",
  "title": "gRPC C# Healthchecking",
  "authors": [ "Google Inc." ],
  "copyright": "Copyright 2015, Google Inc.",
@ -21,7 +21,7 @@
    }
  },
  "dependencies": {
-    "Grpc.Core": "1.1.0-dev",
+    "Grpc.Core": "1.1.0-pre1",
    "Google.Protobuf": "3.0.0"
  },
  "frameworks": {
--- a/src/csharp/Grpc.Reflection/project.json
+++ b/src/csharp/Grpc.Reflection/project.json
@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-dev",
+  "version": "1.1.0-pre1",
  "title": "gRPC C# Reflection",
  "authors": [ "Google Inc." ],
  "copyright": "Copyright 2016, Google Inc.",
@ -21,7 +21,7 @@
    }
  },
  "dependencies": {
-    "Grpc.Core": "1.1.0-dev",
+    "Grpc.Core": "1.1.0-pre1",
    "Google.Protobuf": "3.0.0"
  },
  "frameworks": {
--- a/src/csharp/build_packages_dotnetcli.bat
+++ b/src/csharp/build_packages_dotnetcli.bat
@ -28,7 +28,7 @@
@rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

@rem Current package versions
-set VERSION=1.1.0-dev
+set VERSION=1.1.0-pre1
 set PROTOBUF_VERSION=3.0.0

@rem Adjust the location of nuget.exe
--- a/src/csharp/build_packages_dotnetcli.sh
+++ b/src/csharp/build_packages_dotnetcli.sh
@ -65,7 +65,7 @@ dotnet pack --configuration Release Grpc.Auth/project.json --output ../../artifa
 dotnet pack --configuration Release Grpc.HealthCheck/project.json --output ../../artifacts
 dotnet pack --configuration Release Grpc.Reflection/project.json --output ../../artifacts

-nuget pack Grpc.nuspec -Version "1.1.0-dev" -OutputDirectory ../../artifacts
-nuget pack Grpc.Tools.nuspec -Version "1.1.0-dev" -OutputDirectory ../../artifacts
+nuget pack Grpc.nuspec -Version "1.1.0-pre1" -OutputDirectory ../../artifacts
+nuget pack Grpc.Tools.nuspec -Version "1.1.0-pre1" -OutputDirectory ../../artifacts

 (cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg)
--- a/src/node/health_check/package.json
+++ b/src/node/health_check/package.json
@ -1,6 +1,6 @@
 {
  "name": "grpc-health-check",
-  "version": "1.1.0-dev",
+  "version": "1.1.0-pre1",
  "author": "Google Inc.",
  "description": "Health check service for use with gRPC",
  "repository": {
@ -15,7 +15,7 @@
    }
  ],
  "dependencies": {
-    "grpc": "^1.1.0-dev",
+    "grpc": "^1.1.0-pre1",
    "lodash": "^3.9.3",
    "google-protobuf": "^3.0.0"
  },
--- a/src/node/tools/package.json
+++ b/src/node/tools/package.json
@ -1,6 +1,6 @@
 {
  "name": "grpc-tools",
-  "version": "1.1.0-dev",
+  "version": "1.1.0-pre1",
  "author": "Google Inc.",
  "description": "Tools for developing with gRPC on Node.js",
  "homepage": "http://www.grpc.io/",
--- a/src/python/grpcio/grpc_version.py
+++ b/src/python/grpcio/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!

-VERSION='1.1.0.dev0'
+VERSION='1.1.0rc1'
--- a/src/python/grpcio_health_checking/grpc_version.py
+++ b/src/python/grpcio_health_checking/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!

-VERSION='1.1.0.dev0'
+VERSION='1.1.0rc1'
--- a/src/python/grpcio_reflection/grpc_version.py
+++ b/src/python/grpcio_reflection/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!

-VERSION='1.1.0.dev0'
+VERSION='1.1.0rc1'
--- a/src/python/grpcio_tests/grpc_version.py
+++ b/src/python/grpcio_tests/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!

-VERSION='1.1.0.dev0'
+VERSION='1.1.0rc1'
--- a/src/ruby/lib/grpc/version.rb
+++ b/src/ruby/lib/grpc/version.rb
@ -29,5 +29,5 @@

 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.1.0.dev'
+  VERSION = '1.1.0.pre1'
 end
--- a/src/ruby/tools/version.rb
+++ b/src/ruby/tools/version.rb
@ -29,6 +29,6 @@

 module GRPC
  module Tools
-    VERSION = '1.1.0.dev'
+    VERSION = '1.1.0.pre1'
  end
 end
--- a/tools/distrib/python/grpcio_tools/grpc_version.py
+++ b/tools/distrib/python/grpcio_tools/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!

-VERSION='1.1.0.dev0'
+VERSION='1.1.0rc1'
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 1.1.0-dev
+PROJECT_NUMBER         = 1.1.0-pre1

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 1.1.0-dev
+PROJECT_NUMBER         = 1.1.0-pre1

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/tools/doxygen/Doxyfile.core
+++ b/tools/doxygen/Doxyfile.core
@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Core"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 2.0.0-dev
+PROJECT_NUMBER         = 2.0.0-pre1

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Core"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 2.0.0-dev
+PROJECT_NUMBER         = 2.0.0-pre1

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a