diff --git a/src/csharp/.gitignore b/src/csharp/.gitignore index c064ff1fa6d..ae489565670 100644 --- a/src/csharp/.gitignore +++ b/src/csharp/.gitignore @@ -5,3 +5,4 @@ test-results packages Grpc.v12.suo TestResult.xml +*.nupkg diff --git a/src/csharp/EXPERIMENTAL-ONLY b/src/csharp/EXPERIMENTAL-ONLY deleted file mode 100644 index f18a81d919e..00000000000 --- a/src/csharp/EXPERIMENTAL-ONLY +++ /dev/null @@ -1 +0,0 @@ -gRPC C# is work-in-progress and is not intended to be used. See README. diff --git a/src/csharp/Grpc.Auth/Grpc.Auth.nuspec b/src/csharp/Grpc.Auth/Grpc.Auth.nuspec new file mode 100644 index 00000000000..28ec93d3c57 --- /dev/null +++ b/src/csharp/Grpc.Auth/Grpc.Auth.nuspec @@ -0,0 +1,26 @@ + + + + Grpc.Auth + gRPC C# Auth + Auth library for C# implementation of gRPC - an RPC library and framework + Auth library for C# implementation of gRPC - an RPC library and framework. See project site for more info. + 0.5.0 + Google Inc. + jtattermusch + https://github.com/grpc/grpc/blob/master/LICENSE + https://github.com/grpc/grpc + false + Release 0.5.0 of gRPC C# + Copyright 2015, Google Inc. + gRPC RPC Protocol HTTP/2 Auth OAuth2 + + + + + + + + + + diff --git a/src/csharp/Grpc.Auth/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Auth/Properties/AssemblyInfo.cs index 66b18d0ccf0..c442ccc977f 100644 --- a/src/csharp/Grpc.Auth/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.Auth/Properties/AssemblyInfo.cs @@ -9,6 +9,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Google Inc. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("0.2.*")] +[assembly: AssemblyVersion("0.5.*")] -[assembly: InternalsVisibleTo("Grpc.Auth.Tests")] \ No newline at end of file +[assembly: InternalsVisibleTo("Grpc.Auth.Tests")] diff --git a/src/csharp/Grpc.Core.Tests/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Core.Tests/Properties/AssemblyInfo.cs index e0f04742451..7f6133a9929 100644 --- a/src/csharp/Grpc.Core.Tests/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.Core.Tests/Properties/AssemblyInfo.cs @@ -9,4 +9,4 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Google Inc. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("0.2.*")] +[assembly: AssemblyVersion("0.5.*")] diff --git a/src/csharp/Grpc.Core/.gitignore b/src/csharp/Grpc.Core/.gitignore index c2dd6641675..1746e3269ed 100644 --- a/src/csharp/Grpc.Core/.gitignore +++ b/src/csharp/Grpc.Core/.gitignore @@ -1,3 +1,2 @@ bin obj -*.nupkg diff --git a/src/csharp/Grpc.Core/Grpc.Core.nuspec b/src/csharp/Grpc.Core/Grpc.Core.nuspec index 4865ead555e..e54908cb8ba 100644 --- a/src/csharp/Grpc.Core/Grpc.Core.nuspec +++ b/src/csharp/Grpc.Core/Grpc.Core.nuspec @@ -2,23 +2,21 @@ Grpc.Core - gRPC Core + gRPC C# Core Core C# implementation of gRPC - an RPC library and framework - Core C# implementation of gRPC - an RPC library and framework. See project site for more info. - This is an experimental release, not ready to use. - - 0.2.1 + Core C# implementation of gRPC - an RPC library and framework. See project site for more info. + 0.5.0 Google Inc. jtattermusch https://github.com/grpc/grpc/blob/master/LICENSE https://github.com/grpc/grpc false - The first experimental release. Not ready to use. + Release 0.5.0 of gRPC C# Copyright 2015, Google Inc. gRPC RPC Protocol HTTP/2 - + diff --git a/src/csharp/Grpc.Core/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Core/Properties/AssemblyInfo.cs index 81218cb67e2..03b682181a3 100644 --- a/src/csharp/Grpc.Core/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.Core/Properties/AssemblyInfo.cs @@ -9,6 +9,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Google Inc. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("0.2.*")] +[assembly: AssemblyVersion("0.5.*")] [assembly: InternalsVisibleTo("Grpc.Core.Tests")] diff --git a/src/csharp/Grpc.Examples.MathClient/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Examples.MathClient/Properties/AssemblyInfo.cs index 1989ca84308..4b77472fbd7 100644 --- a/src/csharp/Grpc.Examples.MathClient/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.Examples.MathClient/Properties/AssemblyInfo.cs @@ -9,4 +9,4 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Google Inc. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("0.2.*")] +[assembly: AssemblyVersion("0.5.*")] diff --git a/src/csharp/Grpc.Examples.MathServer/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Examples.MathServer/Properties/AssemblyInfo.cs index 6b3d0516b90..c18fc251d4c 100644 --- a/src/csharp/Grpc.Examples.MathServer/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.Examples.MathServer/Properties/AssemblyInfo.cs @@ -9,4 +9,4 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Google Inc. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("0.1.*")] +[assembly: AssemblyVersion("0.5.*")] diff --git a/src/csharp/Grpc.Examples.Tests/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Examples.Tests/Properties/AssemblyInfo.cs index d78e9210c09..c1ba396a95c 100644 --- a/src/csharp/Grpc.Examples.Tests/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.Examples.Tests/Properties/AssemblyInfo.cs @@ -9,4 +9,4 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Google Inc. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("0.2.*")] +[assembly: AssemblyVersion("0.5.*")] diff --git a/src/csharp/Grpc.Examples/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Examples/Properties/AssemblyInfo.cs index fd1cdbbc1c2..a63e05d7f69 100644 --- a/src/csharp/Grpc.Examples/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.Examples/Properties/AssemblyInfo.cs @@ -9,4 +9,4 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Google Inc. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("0.2.*")] +[assembly: AssemblyVersion("0.5.*")] diff --git a/src/csharp/Grpc.IntegrationTesting.Client/Properties/AssemblyInfo.cs b/src/csharp/Grpc.IntegrationTesting.Client/Properties/AssemblyInfo.cs index d9d36f03e42..26c0dcc3b9c 100644 --- a/src/csharp/Grpc.IntegrationTesting.Client/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.IntegrationTesting.Client/Properties/AssemblyInfo.cs @@ -9,4 +9,4 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Google Inc. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("0.2.*")] +[assembly: AssemblyVersion("0.5.*")] diff --git a/src/csharp/Grpc.IntegrationTesting.Server/Properties/AssemblyInfo.cs b/src/csharp/Grpc.IntegrationTesting.Server/Properties/AssemblyInfo.cs index b0b163b8838..2d518d7b72e 100644 --- a/src/csharp/Grpc.IntegrationTesting.Server/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.IntegrationTesting.Server/Properties/AssemblyInfo.cs @@ -9,4 +9,4 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Google Inc. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("0.2.*")] +[assembly: AssemblyVersion("0.5.*")] diff --git a/src/csharp/Grpc.IntegrationTesting/Properties/AssemblyInfo.cs b/src/csharp/Grpc.IntegrationTesting/Properties/AssemblyInfo.cs index fe6c8a8aed4..f73575e8bd6 100644 --- a/src/csharp/Grpc.IntegrationTesting/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.IntegrationTesting/Properties/AssemblyInfo.cs @@ -9,4 +9,4 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Google Inc. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("0.2.*")] +[assembly: AssemblyVersion("0.5.*")] diff --git a/src/csharp/Grpc.nuspec b/src/csharp/Grpc.nuspec index 4c106a2ca2e..1daff491aff 100644 --- a/src/csharp/Grpc.nuspec +++ b/src/csharp/Grpc.nuspec @@ -1,23 +1,22 @@ - + Grpc gRPC C# implementation of gRPC - an RPC library and framework - C# implementation of gRPC - an RPC library and framework. See project site for more info. - This is an experimental release, not ready to use. - - 0.2.0 + C# implementation of gRPC - an RPC library and framework. See project site for more info. + 0.5.0 Google Inc. jtattermusch https://github.com/grpc/grpc/blob/master/LICENSE https://github.com/grpc/grpc false - The first experimental release. Not ready to use. + Release 0.5.0 of gRPC C# Copyright 2015, Google Inc. gRPC RPC Protocol HTTP/2 - + + diff --git a/src/csharp/build_packages.bat b/src/csharp/build_packages.bat new file mode 100644 index 00000000000..fab80b0e088 --- /dev/null +++ b/src/csharp/build_packages.bat @@ -0,0 +1,16 @@ +@rem Builds NuGet packages + +@rem Adjust the location of nuget.exe +set NUGET=C:\nuget\nuget.exe + +@call buildall.bat || goto :error + +%NUGET% pack Grpc.Core\Grpc.Core.nuspec || goto :error +%NUGET% pack Grpc.Auth\Grpc.Auth.nuspec || goto :error +%NUGET% pack Grpc.nuspec || goto :error + +goto :EOF + +:error +echo Failed! +exit /b %errorlevel% diff --git a/src/csharp/buildall.bat b/src/csharp/buildall.bat new file mode 100644 index 00000000000..34ad9233074 --- /dev/null +++ b/src/csharp/buildall.bat @@ -0,0 +1,18 @@ +@rem Convenience script to build gRPC C# from command line + +setlocal +@rem Set VS variables (uses Visual Studio 2013) +@call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" x86 + +@rem Build the C# native extension +msbuild ..\..\vsprojects\grpc.sln /t:grpc_csharp_ext || goto :error + +msbuild Grpc.sln /p:Configuration=Debug || goto :error +msbuild Grpc.sln /p:Configuration=Release || goto :error +endlocal + +goto :EOF + +:error +echo Failed! +exit /b %errorlevel% diff --git a/vsprojects/nuget_package/README.md b/vsprojects/nuget_package/README.md index 80d84ce8c8c..00bb400d661 100644 --- a/vsprojects/nuget_package/README.md +++ b/vsprojects/nuget_package/README.md @@ -16,5 +16,7 @@ Build all flavors of gRPC C# extension and package them as a NuGet package. ``` buildall.bat -nuget pack grpc.native.csharp_ext -``` \ No newline at end of file +nuget pack grpc.native.csharp_ext.nuspec +``` + +When building the NuGet package, ignore the "Assembly outside lib folder" warnings (they DLLs are not assemblies, they are native libraries). diff --git a/vsprojects/nuget_package/grpc.native.csharp_ext.nuspec b/vsprojects/nuget_package/grpc.native.csharp_ext.nuspec index d225b771907..91740ac8fd4 100644 --- a/vsprojects/nuget_package/grpc.native.csharp_ext.nuspec +++ b/vsprojects/nuget_package/grpc.native.csharp_ext.nuspec @@ -2,14 +2,14 @@ grpc.native.csharp_ext - 0.6.0.0 + 0.8.0.0 Google Inc. Jan Tattermusch https://github.com/grpc/grpc/blob/master/LICENSE http://github.com/grpc/grpc false Native extension needed by gRPC C# library. This is not the package you are looking for, it is only meant to be used as a dependency. - Release of gRPC C core 0.6.0 libraries. + Release of gRPC C core 0.8.0 libraries. Copyright 2015 gRPC C# Native Extension Native library required by gRPC C#