diff --git a/src/csharp/.gitignore b/src/csharp/.gitignore index c064ff1fa6ddddd02590f05d90a7dcf45931c925..ae4895656704778ce1da08fb53969bd227566adb 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 f18a81d919e3bc02d484f35dd513787713faf896..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..28ec93d3c5792111d55f92f111f5bb5fbf131d11 --- /dev/null +++ b/src/csharp/Grpc.Auth/Grpc.Auth.nuspec @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<package> + <metadata> + <id>Grpc.Auth</id> + <title>gRPC C# Auth</title> + <summary>Auth library for C# implementation of gRPC - an RPC library and framework</summary> + <description>Auth library for C# implementation of gRPC - an RPC library and framework. See project site for more info.</description> + <version>0.5.0</version> + <authors>Google Inc.</authors> + <owners>jtattermusch</owners> + <licenseUrl>https://github.com/grpc/grpc/blob/master/LICENSE</licenseUrl> + <projectUrl>https://github.com/grpc/grpc</projectUrl> + <requireLicenseAcceptance>false</requireLicenseAcceptance> + <releaseNotes>Release 0.5.0 of gRPC C#</releaseNotes> + <copyright>Copyright 2015, Google Inc.</copyright> + <tags>gRPC RPC Protocol HTTP/2 Auth OAuth2</tags> + <dependencies> + <dependency id="BouncyCastle" version="1.7.0" /> + <dependency id="Google.Apis.Auth" version="1.9.1" /> + <dependency id="Grpc.Core" version="0.5.0" /> + </dependencies> + </metadata> + <files> + <file src="bin/Release/Grpc.Auth.dll" target="lib/net45" /> + </files> +</package> diff --git a/src/csharp/Grpc.Auth/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Auth/Properties/AssemblyInfo.cs index 66b18d0ccf0dea0d17f903b47430ac657efcffec..c442ccc977f443b9b59ee32ffb088b4e247dcd2f 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 e0f047424513a6a9d13eaf018e73aa44625a9905..7f6133a9929253773381d3fc910869c30508e3a7 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 c2dd6641675ac03d8a7e5d6af6f03637ef4cd137..1746e3269ed0fcf5cde6ed13a6543865137868c0 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 4865ead555efc25cbd6e2ff71fa51981c5932534..e54908cb8bacf30e3a202c73cf1d918823f3c97d 100644 --- a/src/csharp/Grpc.Core/Grpc.Core.nuspec +++ b/src/csharp/Grpc.Core/Grpc.Core.nuspec @@ -2,23 +2,21 @@ <package> <metadata> <id>Grpc.Core</id> - <title>gRPC Core</title> + <title>gRPC C# Core</title> <summary>Core C# implementation of gRPC - an RPC library and framework</summary> - <description>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. - </description> - <version>0.2.1</version> + <description>Core C# implementation of gRPC - an RPC library and framework. See project site for more info.</description> + <version>0.5.0</version> <authors>Google Inc.</authors> <owners>jtattermusch</owners> <licenseUrl>https://github.com/grpc/grpc/blob/master/LICENSE</licenseUrl> <projectUrl>https://github.com/grpc/grpc</projectUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> - <releaseNotes>The first experimental release. Not ready to use.</releaseNotes> + <releaseNotes>Release 0.5.0 of gRPC C#</releaseNotes> <copyright>Copyright 2015, Google Inc.</copyright> <tags>gRPC RPC Protocol HTTP/2</tags> <dependencies> <dependency id="Microsoft.Bcl.Immutable" version="1.0.34" /> - <dependency id="grpc.native.csharp_ext" version="0.6.0.0" /> + <dependency id="grpc.native.csharp_ext" version="0.8.0.0" /> </dependencies> </metadata> <files> diff --git a/src/csharp/Grpc.Core/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Core/Properties/AssemblyInfo.cs index 81218cb67e2a769010bb8b55085922f58a936489..03b682181a3cdf40ad4ad74e4a54640a2e7dd74d 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 1989ca84308ea5c276625a880c07076633705593..4b77472fbd71f275f126c22a5ee7ea86be8ea3cd 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 6b3d0516b90f5d5aabfcd116e0ec086fb2d7f933..c18fc251d4cdab26926d3509d166720b3222f09b 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 d78e9210c09cc15cf405daf30aae281f6a20ac76..c1ba396a95cb8e839d1cc51e75601f0862320724 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 fd1cdbbc1c29ef5f31b22025800971ab3d10cc1b..a63e05d7f695d18256d939fef7cc53fc21a8582d 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 d9d36f03e4254ea39c34a1c5dad20cc8c87de8b3..26c0dcc3b9c506bc0e8c2609a0ce25085f4b281b 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 b0b163b883899a618f9657b5fa8d237d033cd59c..2d518d7b72eeb4e45503f85af91247aefe6731f5 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 fe6c8a8aed43cdb2f7395575da6bf2da18773253..f73575e8bd6dcb4c4991912139d5288cf9937083 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 4c106a2ca2e8504d4b18f4e92ef2499d09d444c1..1daff491aff643b22e3323516c729cf3eac04b2c 100644 --- a/src/csharp/Grpc.nuspec +++ b/src/csharp/Grpc.nuspec @@ -1,23 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> -<package > +<package> <metadata> <id>Grpc</id> <title>gRPC</title> <summary>C# implementation of gRPC - an RPC library and framework</summary> - <description>C# implementation of gRPC - an RPC library and framework. See project site for more info. - This is an experimental release, not ready to use. - </description> - <version>0.2.0</version> + <description>C# implementation of gRPC - an RPC library and framework. See project site for more info.</description> + <version>0.5.0</version> <authors>Google Inc.</authors> <owners>jtattermusch</owners> <licenseUrl>https://github.com/grpc/grpc/blob/master/LICENSE</licenseUrl> <projectUrl>https://github.com/grpc/grpc</projectUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> - <releaseNotes>The first experimental release. Not ready to use.</releaseNotes> + <releaseNotes>Release 0.5.0 of gRPC C#</releaseNotes> <copyright>Copyright 2015, Google Inc.</copyright> <tags>gRPC RPC Protocol HTTP/2</tags> <dependencies> - <dependency id="Grpc.Core" version="0.2.0" /> + <dependency id="Grpc.Core" version="0.5.0" /> </dependencies> </metadata> + <files/> </package> diff --git a/src/csharp/build_packages.bat b/src/csharp/build_packages.bat new file mode 100644 index 0000000000000000000000000000000000000000..fab80b0e088c3696bbe8f2317488fdfd47ea5fe1 --- /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 0000000000000000000000000000000000000000..34ad9233074a859e146086766ba30fdc6b9ac12d --- /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 80d84ce8c8c043e31349e88f5c431ab3a49830a5..00bb400d661f6e15bf0aeaeb56f19e094c87704d 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 d225b7719070400e4fe4429caa8bf591d2e18b28..91740ac8fd4b1b4293f940d522189f5f5eb7b85a 100644 --- a/vsprojects/nuget_package/grpc.native.csharp_ext.nuspec +++ b/vsprojects/nuget_package/grpc.native.csharp_ext.nuspec @@ -2,14 +2,14 @@ <package> <metadata> <id>grpc.native.csharp_ext</id> - <version>0.6.0.0</version> + <version>0.8.0.0</version> <authors>Google Inc.</authors> <owners>Jan Tattermusch</owners> <licenseUrl>https://github.com/grpc/grpc/blob/master/LICENSE</licenseUrl> <projectUrl>http://github.com/grpc/grpc</projectUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>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.</description> - <releaseNotes>Release of gRPC C core 0.6.0 libraries.</releaseNotes> + <releaseNotes>Release of gRPC C core 0.8.0 libraries.</releaseNotes> <copyright>Copyright 2015</copyright> <title>gRPC C# Native Extension</title> <summary>Native library required by gRPC C#</summary>