From ecd2b0e74c7aeecec1aac95f765edc2e4ddd6520 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 27 Jun 2016 18:07:08 -0700 Subject: share Version.cs among all project.json projects --- templates/src/csharp/Grpc.Core/project.json.template | 1 + 1 file changed, 1 insertion(+) (limited to 'templates/src') diff --git a/templates/src/csharp/Grpc.Core/project.json.template b/templates/src/csharp/Grpc.Core/project.json.template index 6f9197f572..033efe8a2d 100644 --- a/templates/src/csharp/Grpc.Core/project.json.template +++ b/templates/src/csharp/Grpc.Core/project.json.template @@ -23,6 +23,7 @@ "build/native/bin/macosx_x64/": "../nativelibs/macosx_x64/libgrpc_csharp_ext.dylib" } }, + "shared": "Version.cs", "buildOptions": { "embed": [ "../../../etc/roots.pem" ] }, -- cgit v1.2.3 From eb8bfc61e0f5ea3c911c9365fe26a89805d8f76a Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 27 Jun 2016 18:38:59 -0700 Subject: modify templates to sign C# coreclr projects and generate xmlDoc --- templates/src/csharp/Grpc.Auth/project.json.template | 6 ++++++ templates/src/csharp/Grpc.Core/project.json.template | 6 +++++- templates/src/csharp/Grpc.HealthCheck/project.json.template | 6 ++++++ templates/src/csharp/build_options.include | 8 ++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) (limited to 'templates/src') diff --git a/templates/src/csharp/Grpc.Auth/project.json.template b/templates/src/csharp/Grpc.Auth/project.json.template index 90ad0eb089..483e34c2e8 100644 --- a/templates/src/csharp/Grpc.Auth/project.json.template +++ b/templates/src/csharp/Grpc.Auth/project.json.template @@ -14,6 +14,12 @@ "requireLicenseAcceptance": false, "tags": [ "gRPC RPC Protocol HTTP/2 Auth OAuth2" ], }, + "buildOptions": { + "define": [ "SIGNED" ], + "keyFile": "../keys/Grpc.snk", + "publicSign": true, + "xmlDoc": true + }, "dependencies": { "Grpc.Core": "${settings.csharp_version}", "Google.Apis.Auth": "1.11.1" diff --git a/templates/src/csharp/Grpc.Core/project.json.template b/templates/src/csharp/Grpc.Core/project.json.template index 033efe8a2d..e1c05fc8a3 100644 --- a/templates/src/csharp/Grpc.Core/project.json.template +++ b/templates/src/csharp/Grpc.Core/project.json.template @@ -25,7 +25,11 @@ }, "shared": "Version.cs", "buildOptions": { - "embed": [ "../../../etc/roots.pem" ] + "embed": [ "../../../etc/roots.pem" ], + "define": [ "SIGNED" ], + "keyFile": "../keys/Grpc.snk", + "publicSign": true, + "xmlDoc": true }, "dependencies": { "Ix-Async": "1.2.5" diff --git a/templates/src/csharp/Grpc.HealthCheck/project.json.template b/templates/src/csharp/Grpc.HealthCheck/project.json.template index 59073af7ee..1f2cc798ba 100644 --- a/templates/src/csharp/Grpc.HealthCheck/project.json.template +++ b/templates/src/csharp/Grpc.HealthCheck/project.json.template @@ -14,6 +14,12 @@ "requireLicenseAcceptance": false, "tags": [ "gRPC health check" ] }, + "buildOptions": { + "define": [ "SIGNED" ], + "keyFile": "../keys/Grpc.snk", + "publicSign": true, + "xmlDoc": true + }, "dependencies": { "Grpc.Core": "${settings.csharp_version}", "Google.Protobuf": "3.0.0-beta3" diff --git a/templates/src/csharp/build_options.include b/templates/src/csharp/build_options.include index 468d281618..0af76b81b2 100644 --- a/templates/src/csharp/build_options.include +++ b/templates/src/csharp/build_options.include @@ -8,6 +8,10 @@ "configurations": { "Debug": { "buildOptions": { + "define": [ "SIGNED" ], + "keyFile": "../keys/Grpc.snk", + "publicSign": true, + "xmlDoc": true, "copyToOutput": { % if includeData: "include": "data/*", @@ -23,6 +27,10 @@ }, "Release": { "buildOptions": { + "define": [ "SIGNED" ], + "keyFile": "../keys/Grpc.snk", + "publicSign": true, + "xmlDoc": true, "copyToOutput": { % if includeData: "include": "data/*", -- cgit v1.2.3 From 103cd6de60911eec98d590eb5640850f48628ae8 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 29 Jun 2016 11:50:55 -0700 Subject: fix files/mappings in Grpc.Core nuget --- src/csharp/Grpc.Core/project.json | 16 +++++++++------- templates/src/csharp/Grpc.Core/project.json.template | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) (limited to 'templates/src') diff --git a/src/csharp/Grpc.Core/project.json b/src/csharp/Grpc.Core/project.json index 775764e1d7..cd3720ddc2 100644 --- a/src/csharp/Grpc.Core/project.json +++ b/src/csharp/Grpc.Core/project.json @@ -12,13 +12,15 @@ "requireLicenseAcceptance": false, "tags": [ "gRPC RPC Protocol HTTP/2" ], "files": { - "build/net45/": "Grpc.Core.targets", - "build/native/bin/windows_x86/": "../nativelibs/windows_x86/grpc_csharp_ext.dll", - "build/native/bin/windows_x64/": "../nativelibs/windows_x64/grpc_csharp_ext.dll", - "build/native/bin/linux_x86/": "../nativelibs/linux_x86/libgrpc_csharp_ext.so", - "build/native/bin/linux_x64/": "../nativelibs/linux_x64/libgrpc_csharp_ext.so", - "build/native/bin/macosx_x86/": "../nativelibs/macosx_x86/libgrpc_csharp_ext.dylib", - "build/native/bin/macosx_x64/": "../nativelibs/macosx_x64/libgrpc_csharp_ext.dylib" + "mappings": { + "build/net45/": "Grpc.Core.targets", + "build/native/bin/windows_x86/": "../nativelibs/windows_x86/grpc_csharp_ext.dll", + "build/native/bin/windows_x64/": "../nativelibs/windows_x64/grpc_csharp_ext.dll", + "build/native/bin/linux_x86/": "../nativelibs/linux_x86/libgrpc_csharp_ext.so", + "build/native/bin/linux_x64/": "../nativelibs/linux_x64/libgrpc_csharp_ext.so", + "build/native/bin/macosx_x86/": "../nativelibs/macosx_x86/libgrpc_csharp_ext.dylib", + "build/native/bin/macosx_x64/": "../nativelibs/macosx_x64/libgrpc_csharp_ext.dylib" + } } }, "shared": "Version.cs", diff --git a/templates/src/csharp/Grpc.Core/project.json.template b/templates/src/csharp/Grpc.Core/project.json.template index e1c05fc8a3..fb9b168bc6 100644 --- a/templates/src/csharp/Grpc.Core/project.json.template +++ b/templates/src/csharp/Grpc.Core/project.json.template @@ -14,13 +14,15 @@ "requireLicenseAcceptance": false, "tags": [ "gRPC RPC Protocol HTTP/2" ], "files": { - "build/net45/": "Grpc.Core.targets", - "build/native/bin/windows_x86/": "../nativelibs/windows_x86/grpc_csharp_ext.dll", - "build/native/bin/windows_x64/": "../nativelibs/windows_x64/grpc_csharp_ext.dll", - "build/native/bin/linux_x86/": "../nativelibs/linux_x86/libgrpc_csharp_ext.so", - "build/native/bin/linux_x64/": "../nativelibs/linux_x64/libgrpc_csharp_ext.so", - "build/native/bin/macosx_x86/": "../nativelibs/macosx_x86/libgrpc_csharp_ext.dylib", - "build/native/bin/macosx_x64/": "../nativelibs/macosx_x64/libgrpc_csharp_ext.dylib" + "mappings": { + "build/net45/": "Grpc.Core.targets", + "build/native/bin/windows_x86/": "../nativelibs/windows_x86/grpc_csharp_ext.dll", + "build/native/bin/windows_x64/": "../nativelibs/windows_x64/grpc_csharp_ext.dll", + "build/native/bin/linux_x86/": "../nativelibs/linux_x86/libgrpc_csharp_ext.so", + "build/native/bin/linux_x64/": "../nativelibs/linux_x64/libgrpc_csharp_ext.so", + "build/native/bin/macosx_x86/": "../nativelibs/macosx_x86/libgrpc_csharp_ext.dylib", + "build/native/bin/macosx_x64/": "../nativelibs/macosx_x64/libgrpc_csharp_ext.dylib" + } } }, "shared": "Version.cs", -- cgit v1.2.3 From 3f594c117d27ae5fba4e2f6bb054bb5590892863 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 29 Jun 2016 12:03:21 -0700 Subject: using shared option for Version.cs leaks it to nuget file --- templates/src/csharp/Grpc.Auth/project.json.template | 5 ++++- templates/src/csharp/Grpc.Core/project.json.template | 1 - templates/src/csharp/Grpc.HealthCheck/project.json.template | 5 ++++- templates/src/csharp/build_options.include | 6 ++++++ 4 files changed, 14 insertions(+), 3 deletions(-) (limited to 'templates/src') diff --git a/templates/src/csharp/Grpc.Auth/project.json.template b/templates/src/csharp/Grpc.Auth/project.json.template index 483e34c2e8..d91bd8ce1d 100644 --- a/templates/src/csharp/Grpc.Auth/project.json.template +++ b/templates/src/csharp/Grpc.Auth/project.json.template @@ -18,7 +18,10 @@ "define": [ "SIGNED" ], "keyFile": "../keys/Grpc.snk", "publicSign": true, - "xmlDoc": true + "xmlDoc": true, + "compile": { + "includeFiles": [ "../Grpc.Core/Version.cs" ] + } }, "dependencies": { "Grpc.Core": "${settings.csharp_version}", diff --git a/templates/src/csharp/Grpc.Core/project.json.template b/templates/src/csharp/Grpc.Core/project.json.template index fb9b168bc6..cdcebc5303 100644 --- a/templates/src/csharp/Grpc.Core/project.json.template +++ b/templates/src/csharp/Grpc.Core/project.json.template @@ -25,7 +25,6 @@ } } }, - "shared": "Version.cs", "buildOptions": { "embed": [ "../../../etc/roots.pem" ], "define": [ "SIGNED" ], diff --git a/templates/src/csharp/Grpc.HealthCheck/project.json.template b/templates/src/csharp/Grpc.HealthCheck/project.json.template index 1f2cc798ba..264ed29205 100644 --- a/templates/src/csharp/Grpc.HealthCheck/project.json.template +++ b/templates/src/csharp/Grpc.HealthCheck/project.json.template @@ -18,7 +18,10 @@ "define": [ "SIGNED" ], "keyFile": "../keys/Grpc.snk", "publicSign": true, - "xmlDoc": true + "xmlDoc": true, + "compile": { + "includeFiles": [ "../Grpc.Core/Version.cs" ] + } }, "dependencies": { "Grpc.Core": "${settings.csharp_version}", diff --git a/templates/src/csharp/build_options.include b/templates/src/csharp/build_options.include index 0af76b81b2..ae96b94f72 100644 --- a/templates/src/csharp/build_options.include +++ b/templates/src/csharp/build_options.include @@ -12,6 +12,9 @@ "keyFile": "../keys/Grpc.snk", "publicSign": true, "xmlDoc": true, + "compile": { + "includeFiles": [ "../Grpc.Core/Version.cs" ] + }, "copyToOutput": { % if includeData: "include": "data/*", @@ -31,6 +34,9 @@ "keyFile": "../keys/Grpc.snk", "publicSign": true, "xmlDoc": true, + "compile": { + "includeFiles": [ "../Grpc.Core/Version.cs" ] + }, "copyToOutput": { % if includeData: "include": "data/*", -- cgit v1.2.3