diff --git a/Makefile b/Makefile index d3597c276ce5f61230d0ceb20e6ac8660641e982..8dfb505424d34053a5ca34f72741477eafec89b5 100644 --- a/Makefile +++ b/Makefile @@ -342,7 +342,7 @@ E = @echo Q = @ endif -VERSION = 0.12.0.0 +VERSION = 0.13.0.0 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) diff --git a/build.yaml b/build.yaml index 500ec855ae40948e9c0e64c2ae149bfb193d94be..36b031003a87a2559344c3cef9ec8626b1758cfd 100644 --- a/build.yaml +++ b/build.yaml @@ -5,7 +5,7 @@ settings: '#': The public version number of the library. version: major: 0 - minor: 12 + minor: 13 micro: 0 build: 0 filegroups: diff --git a/src/core/surface/version.c b/src/core/surface/version.c index 962a72112a15c94d8e089a9efa3ec3f9ec400a67..aada18e07e490db6f6b2b387f6558eb0c706c1c2 100644 --- a/src/core/surface/version.c +++ b/src/core/surface/version.c @@ -36,4 +36,4 @@ #include <grpc/grpc.h> -const char *grpc_version_string(void) { return "0.12.0.0"; } +const char *grpc_version_string(void) { return "0.13.0.0"; } diff --git a/src/csharp/Grpc.Core/Grpc.Core.nuspec b/src/csharp/Grpc.Core/Grpc.Core.nuspec index 7582cdf965c78b64ee1383aa026f74b1b25cfa62..9a4c1a3c8587bcbc00826a4ed0cd97817bed52db 100644 --- a/src/csharp/Grpc.Core/Grpc.Core.nuspec +++ b/src/csharp/Grpc.Core/Grpc.Core.nuspec @@ -16,7 +16,7 @@ <tags>gRPC RPC Protocol HTTP/2</tags> <dependencies> <dependency id="Ix-Async" version="1.2.5" /> - <dependency id="grpc.native.csharp" version="$GrpcNativeCsharpVersion$" /> + <dependency id="grpc.native.csharp" version="$version$" /> </dependencies> </metadata> <files> diff --git a/src/csharp/Grpc.Core/VersionInfo.cs b/src/csharp/Grpc.Core/VersionInfo.cs index 818ddb83b918f85d2af1275aae7e6aa2593c1122..4c6d50356c6d4b89eb5bf3afc0eb14b827d5a692 100644 --- a/src/csharp/Grpc.Core/VersionInfo.cs +++ b/src/csharp/Grpc.Core/VersionInfo.cs @@ -41,6 +41,6 @@ namespace Grpc.Core /// <summary> /// Current version of gRPC C# /// </summary> - public const string CurrentVersion = "0.12.0"; + public const string CurrentVersion = "0.13.0"; } } diff --git a/src/csharp/build_packages.bat b/src/csharp/build_packages.bat index 6912dad2136fcba2bbae511b4df8f00036ef6148..7a34bf3fd65d22eb357b43942bd56257690b5daf 100644 --- a/src/csharp/build_packages.bat +++ b/src/csharp/build_packages.bat @@ -1,8 +1,7 @@ @rem Builds gRPC NuGet packages @rem Current package versions -set VERSION=0.12.0 -set CORE_VERSION=0.12.0 +set VERSION=0.13.0 set PROTOBUF_VERSION=3.0.0-beta2 @rem Packages that depend on prerelease packages (like Google.Protobuf) need to have prerelease suffix as well. @@ -38,9 +37,9 @@ endlocal @rem TODO(jtattermusch): re-enable protoc plugin building @rem @call ..\..\vsprojects\build_plugins.bat || goto :error -%NUGET% pack grpc.native.csharp\grpc.native.csharp.nuspec -Version %CORE_VERSION% || goto :error +%NUGET% pack grpc.native.csharp\grpc.native.csharp.nuspec -Version %VERSION% || goto :error %NUGET% pack Grpc.Auth\Grpc.Auth.nuspec -Symbols -Version %VERSION% || goto :error -%NUGET% pack Grpc.Core\Grpc.Core.nuspec -Symbols -Version %VERSION% -Properties GrpcNativeCsharpVersion=%CORE_VERSION% || goto :error +%NUGET% pack Grpc.Core\Grpc.Core.nuspec -Symbols -Version %VERSION% || goto :error %NUGET% pack Grpc.HealthCheck\Grpc.HealthCheck.nuspec -Symbols -Version %VERSION_WITH_BETA% -Properties ProtobufVersion=%PROTOBUF_VERSION% || goto :error %NUGET% pack Grpc.nuspec -Version %VERSION% || goto :error diff --git a/templates/src/csharp/Grpc.Core/VersionInfo.cs.template b/templates/src/csharp/Grpc.Core/VersionInfo.cs.template new file mode 100644 index 0000000000000000000000000000000000000000..00a14e7b89d143da29a1aaaf40a958f267dee697 --- /dev/null +++ b/templates/src/csharp/Grpc.Core/VersionInfo.cs.template @@ -0,0 +1,48 @@ +%YAML 1.2 +--- | + #region Copyright notice and license + + // Copyright 2015, Google Inc. + // All rights reserved. + // + // Redistribution and use in source and binary forms, with or without + // modification, are permitted provided that the following conditions are + // met: + // + // * Redistributions of source code must retain the above copyright + // notice, this list of conditions and the following disclaimer. + // * Redistributions in binary form must reproduce the above + // copyright notice, this list of conditions and the following disclaimer + // in the documentation and/or other materials provided with the + // distribution. + // * Neither the name of Google Inc. nor the names of its + // contributors may be used to endorse or promote products derived from + // this software without specific prior written permission. + // + // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #endregion + + namespace Grpc.Core + { + /// <summary> + /// Provides info about current version of gRPC. + /// </summary> + public static class VersionInfo + { + /// <summary> + /// Current version of gRPC C# + /// </summary> + public const string CurrentVersion = "${settings.version.major}.${settings.version.minor}.${settings.version.micro}"; + } + } diff --git a/templates/src/csharp/build_packages.bat.template b/templates/src/csharp/build_packages.bat.template new file mode 100644 index 0000000000000000000000000000000000000000..bf831a9e3ba2d1fef8ceed234f6c322b7b2087e3 --- /dev/null +++ b/templates/src/csharp/build_packages.bat.template @@ -0,0 +1,58 @@ +%YAML 1.2 +--- | + @rem Builds gRPC NuGet packages + + @rem Current package versions + set VERSION=${settings.version.major}.${settings.version.minor}.${settings.version.micro} + set PROTOBUF_VERSION=3.0.0-beta2 + + @rem Packages that depend on prerelease packages (like Google.Protobuf) need to have prerelease suffix as well. + set VERSION_WITH_BETA=%VERSION%-beta + + @rem Adjust the location of nuget.exe + set NUGET=C:\nuget\nuget.exe + + @rem Collect the artifacts built by the previous build step if running on Jenkins + @rem TODO(jtattermusch): is there a better way to do this? + xcopy /Y /I ..\..\architecture=x86,language=csharp,platform=windows\artifacts\* grpc.native.csharp\windows_x86${"\\"} + xcopy /Y /I ..\..\architecture=x64,language=csharp,platform=windows\artifacts\* grpc.native.csharp\windows_x64${"\\"} + xcopy /Y /I ..\..\architecture=x86,language=csharp,platform=linux\artifacts\* grpc.native.csharp\linux_x86${"\\"} + xcopy /Y /I ..\..\architecture=x64,language=csharp,platform=linux\artifacts\* grpc.native.csharp\linux_x64${"\\"} + xcopy /Y /I ..\..\architecture=x86,language=csharp,platform=macos\artifacts\* grpc.native.csharp\macosx_x86${"\\"} + xcopy /Y /I ..\..\architecture=x64,language=csharp,platform=macos\artifacts\* grpc.native.csharp\macosx_x64${"\\"} + + @rem Fetch all dependencies + %%NUGET% restore ..\..\vsprojects\grpc_csharp_ext.sln || goto :error + %%NUGET% restore Grpc.sln || goto :error + + setlocal + + @call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" x86 + + @rem We won't use the native libraries from this step, but without this Grpc.sln will fail. + msbuild ..\..\vsprojects\grpc_csharp_ext.sln /p:Configuration=Release /p:PlatformToolset=v120 || goto :error + + msbuild Grpc.sln /p:Configuration=ReleaseSigned || goto :error + + endlocal + + @rem TODO(jtattermusch): re-enable protoc plugin building + @rem @call ..\..\vsprojects\build_plugins.bat || goto :error + + %%NUGET% pack grpc.native.csharp\grpc.native.csharp.nuspec -Version %VERSION% || goto :error + %%NUGET% pack Grpc.Auth\Grpc.Auth.nuspec -Symbols -Version %VERSION% || goto :error + %%NUGET% pack Grpc.Core\Grpc.Core.nuspec -Symbols -Version %VERSION% || goto :error + %%NUGET% pack Grpc.HealthCheck\Grpc.HealthCheck.nuspec -Symbols -Version %VERSION_WITH_BETA% -Properties ProtobufVersion=%PROTOBUF_VERSION% || goto :error + %%NUGET% pack Grpc.nuspec -Version %VERSION% || goto :error + + @rem TODO(jtattermusch): re-enable building Grpc.Tools package + @rem %NUGET% pack Grpc.Tools.nuspec -Version %VERSION% || goto :error + + @rem copy resulting nuget packages to artifacts directory + xcopy /Y /I *.nupkg ..\..\artifacts${"\\"} + + goto :EOF + + :error + echo Failed! + exit /b %errorlevel% diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++ index 500d110ad0f86920c3d390ede9b4018d7080fffd..ad0ad65cb13e1d0a703007a7d4cabee2272f9abc 100644 --- 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 = 0.12.0.0 +PROJECT_NUMBER = 0.13.0.0 # 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 diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index ba1dec0d3897835e0b4d67a6837f76b32648c1fe..1d4b0cec7b032c08c966aff923220c2004d292c3 100644 --- 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 = 0.12.0.0 +PROJECT_NUMBER = 0.13.0.0 # 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 diff --git a/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core index 3a1d097fb950ae3165594257ebd4b8b5570f5bbc..db3db4e20031f3d633bb03846652ef6bd1665fd5 100644 --- 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 = 0.12.0.0 +PROJECT_NUMBER = 0.13.0.0 # 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 diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index f6b6e59dfd93f36946567c93805602364552b563..97dd4a90e7d9df5ddd38e2dbe39e36ce99c7dc80 100644 --- 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 = 0.12.0.0 +PROJECT_NUMBER = 0.13.0.0 # 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