From a6c9a9121ec68a6754f4020bed357498bb237b37 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Wed, 15 Jun 2016 10:11:43 -0700
Subject: [PATCH] update project.json
---
src/csharp/Grpc.Auth/project.json | 25 +++++------
src/csharp/Grpc.Core.Tests/project.json | 14 +++---
src/csharp/Grpc.Core/project.json | 44 +++++++++----------
.../Grpc.Examples.MathClient/project.json | 13 +++---
.../Grpc.Examples.MathServer/project.json | 13 +++---
src/csharp/Grpc.Examples.Tests/project.json | 13 +++---
src/csharp/Grpc.Examples/project.json | 13 ++++--
.../Grpc.HealthCheck.Tests/project.json | 15 ++++---
src/csharp/Grpc.HealthCheck/project.json | 30 ++++++++-----
.../project.json | 13 +++---
.../project.json | 13 +++---
.../project.json | 13 +++---
.../Grpc.IntegrationTesting/project.json | 14 +++---
13 files changed, 133 insertions(+), 100 deletions(-)
diff --git a/src/csharp/Grpc.Auth/project.json b/src/csharp/Grpc.Auth/project.json
index 513325f749..25579982a9 100644
--- a/src/csharp/Grpc.Auth/project.json
+++ b/src/csharp/Grpc.Auth/project.json
@@ -1,20 +1,17 @@
{
"version": "0.14.0-anexperiment",
-
"title": "gRPC C# Auth",
- "summary": "Auth library for C# implementation of gRPC - an RPC library and framework",
- "description": "Auth library for C# implementation of gRPC - an RPC library and framework. See project site for more info.",
- "authors": ["Google Inc."],
- "owners": ["grpc-packages"],
- "licenseUrl": "https://github.com/grpc/grpc/blob/master/LICENSE",
- "projectUrl": "https://github.com/grpc/grpc",
- "requireLicenseAcceptance": false,
+ "authors": [ "Google Inc." ],
"copyright": "Copyright 2015, Google Inc.",
- "tags": ["gRPC RPC Protocol HTTP/2 Auth OAuth2"],
-
- "compile": "**/*.cs",
- "resourceFiles": ["../../../etc/roots.pem"],
-
+ "packOptions": {
+ "summary": "Auth library for C# implementation of gRPC - an RPC library and framework",
+ "description": "Auth library for C# implementation of gRPC - an RPC library and framework. See project site for more info.",
+ "owners": [ "grpc-packages" ],
+ "licenseUrl": "https://github.com/grpc/grpc/blob/master/LICENSE",
+ "projectUrl": "https://github.com/grpc/grpc",
+ "requireLicenseAcceptance": false,
+ "tags": [ "gRPC RPC Protocol HTTP/2 Auth OAuth2" ],
+ },
"dependencies": {
"Grpc.Core": "0.14.0-anexperiment",
"Google.Apis.Auth": "1.11.1"
@@ -28,7 +25,7 @@
"dependencies": {
"Microsoft.CSharp": "4.0.1-beta-23516",
"Microsoft.NETCore.Portable.Compatibility": "1.0.1-beta-23516",
- "System.Threading.Tasks": "4.0.11-beta-23516"
+ "System.Threading.Tasks": "4.0.11-beta-23516"
}
}
}
diff --git a/src/csharp/Grpc.Core.Tests/project.json b/src/csharp/Grpc.Core.Tests/project.json
index 0c5d935435..dc90e04ccf 100644
--- a/src/csharp/Grpc.Core.Tests/project.json
+++ b/src/csharp/Grpc.Core.Tests/project.json
@@ -1,13 +1,17 @@
{
- "compile": "**/*.cs",
- "compilationOptions": {
+ "buildOptions": {
+ "compile": "**/*.cs",
+ "copyToOutput": {
+ "mappings": {
+ "nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Debug/grpc_csharp_ext.dll",
+ "nativelibs/windows_x86/grpc_csharp_ext.dll": "../../../vsprojects/Debug/grpc_csharp_ext.dll"
+ }
+ },
"emitEntryPoint": true
},
-
- "content": "../nativelibs/**",
-
"dependencies": {
"Grpc.Core": "0.14.0-anexperiment",
+ "Newtonsoft.Json": "8.0.3",
"NUnit": "3.2.0",
"NUnitLite": "3.2.0-*"
},
diff --git a/src/csharp/Grpc.Core/project.json b/src/csharp/Grpc.Core/project.json
index 8aece57856..a916bbd09a 100644
--- a/src/csharp/Grpc.Core/project.json
+++ b/src/csharp/Grpc.Core/project.json
@@ -1,32 +1,30 @@
{
"version": "0.14.0-anexperiment",
-
"title": "gRPC C# Core",
- "summary": "Core C# implementation of gRPC - an RPC library and framework",
- "description": "Core C# implementation of gRPC - an RPC library and framework. See project site for more info.",
"authors": [ "Google Inc." ],
- "owners": [ "grpc-packages" ],
- "licenseUrl": "https://github.com/grpc/grpc/blob/master/LICENSE",
- "projectUrl": "https://github.com/grpc/grpc",
- "requireLicenseAcceptance": false,
"copyright": "Copyright 2015, Google Inc.",
- "tags": [ "gRPC RPC Protocol HTTP/2" ],
-
- "compile": "**/*.cs",
- "resourceFiles": [ "../../../etc/roots.pem" ],
-
- "content": "../nativelibs/**",
-
- "packInclude": {
- "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"
+ "packOptions": {
+ "summary": "Core C# implementation of gRPC - an RPC library and framework",
+ "description": "Core C# implementation of gRPC - an RPC library and framework. See project site for more info.",
+ "owners": [ "grpc-packages" ],
+ "licenseUrl": "https://github.com/grpc/grpc/blob/master/LICENSE",
+ "projectUrl": "https://github.com/grpc/grpc",
+ "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"
+ }
+ },
+ "buildOptions": {
+ "compile": "**/*.cs",
+ "embed": [ "../../../etc/roots.pem" ]
},
-
"dependencies": {
"Ix-Async": "1.2.5"
},
diff --git a/src/csharp/Grpc.Examples.MathClient/project.json b/src/csharp/Grpc.Examples.MathClient/project.json
index 67af09721c..4abf8a5e34 100644
--- a/src/csharp/Grpc.Examples.MathClient/project.json
+++ b/src/csharp/Grpc.Examples.MathClient/project.json
@@ -1,11 +1,14 @@
{
- "compile": "**/*.cs",
- "compilationOptions": {
+ "buildOptions": {
+ "compile": "**/*.cs",
+ "copyToOutput": {
+ "mappings": {
+ "nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Debug/grpc_csharp_ext.dll",
+ "nativelibs/windows_x86/grpc_csharp_ext.dll": "../../../vsprojects/Debug/grpc_csharp_ext.dll"
+ }
+ },
"emitEntryPoint": true
},
-
- "content": "../nativelibs/**",
-
"dependencies": {
"Grpc.Examples": "1.0.0"
},
diff --git a/src/csharp/Grpc.Examples.MathServer/project.json b/src/csharp/Grpc.Examples.MathServer/project.json
index 67af09721c..4abf8a5e34 100644
--- a/src/csharp/Grpc.Examples.MathServer/project.json
+++ b/src/csharp/Grpc.Examples.MathServer/project.json
@@ -1,11 +1,14 @@
{
- "compile": "**/*.cs",
- "compilationOptions": {
+ "buildOptions": {
+ "compile": "**/*.cs",
+ "copyToOutput": {
+ "mappings": {
+ "nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Debug/grpc_csharp_ext.dll",
+ "nativelibs/windows_x86/grpc_csharp_ext.dll": "../../../vsprojects/Debug/grpc_csharp_ext.dll"
+ }
+ },
"emitEntryPoint": true
},
-
- "content": "../nativelibs/**",
-
"dependencies": {
"Grpc.Examples": "1.0.0"
},
diff --git a/src/csharp/Grpc.Examples.Tests/project.json b/src/csharp/Grpc.Examples.Tests/project.json
index e61aa65abf..bd74812c15 100644
--- a/src/csharp/Grpc.Examples.Tests/project.json
+++ b/src/csharp/Grpc.Examples.Tests/project.json
@@ -1,11 +1,14 @@
{
- "compile": "**/*.cs",
- "compilationOptions": {
+ "buildOptions": {
+ "compile": "**/*.cs",
+ "copyToOutput": {
+ "mappings": {
+ "nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Debug/grpc_csharp_ext.dll",
+ "nativelibs/windows_x86/grpc_csharp_ext.dll": "../../../vsprojects/Debug/grpc_csharp_ext.dll"
+ }
+ },
"emitEntryPoint": true
},
-
- "content": "../nativelibs/**",
-
"dependencies": {
"Grpc.Examples": "1.0.0",
"NUnit": "3.2.0",
diff --git a/src/csharp/Grpc.Examples/project.json b/src/csharp/Grpc.Examples/project.json
index f259459a71..e2b4c10422 100644
--- a/src/csharp/Grpc.Examples/project.json
+++ b/src/csharp/Grpc.Examples/project.json
@@ -1,14 +1,19 @@
{
- "compile": "**/*.cs",
-
- "content": "../nativelibs/**",
+ "buildOptions": {
+ "compile": "**/*.cs"
+ },
"dependencies": {
"Grpc.Core": "0.0.1",
"Google.Protobuf": "3.0.0-beta3"
},
"frameworks": {
- "net45": { },
+ "net45": {
+ "frameworkAssemblies": {
+ "System.Runtime": "",
+ "System.IO": ""
+ }
+ },
"dotnet54": {
"imports": [
"portable-net45"
diff --git a/src/csharp/Grpc.HealthCheck.Tests/project.json b/src/csharp/Grpc.HealthCheck.Tests/project.json
index 5ecb17c967..248a1324f6 100644
--- a/src/csharp/Grpc.HealthCheck.Tests/project.json
+++ b/src/csharp/Grpc.HealthCheck.Tests/project.json
@@ -1,13 +1,16 @@
{
- "compile": "**/*.cs",
- "compilationOptions": {
+ "buildOptions": {
+ "compile": "**/*.cs",
+ "copyToOutput": {
+ "mappings": {
+ "nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Debug/grpc_csharp_ext.dll",
+ "nativelibs/windows_x86/grpc_csharp_ext.dll": "../../../vsprojects/Debug/grpc_csharp_ext.dll"
+ }
+ },
"emitEntryPoint": true
},
-
- "content": "../nativelibs/**",
-
"dependencies": {
- "Grpc.HealthCheck": "1.0.0",
+ "Grpc.HealthCheck": "0.0.1",
"NUnit": "3.2.0",
"NUnitLite": "3.2.0-*"
},
diff --git a/src/csharp/Grpc.HealthCheck/project.json b/src/csharp/Grpc.HealthCheck/project.json
index 220224819f..ad42df595d 100644
--- a/src/csharp/Grpc.HealthCheck/project.json
+++ b/src/csharp/Grpc.HealthCheck/project.json
@@ -1,25 +1,31 @@
{
"version": "0.14.0-anexperiment",
-
"title": "gRPC C# Healthchecking",
- "summary": "Implementation of gRPC health service",
- "description": "Example implementation of grpc.health.v1 service that can be used for health-checking.",
"authors": [ "Google Inc." ],
- "owners": [ "grpc-packages" ],
- "licenseUrl": "https://github.com/grpc/grpc/blob/master/LICENSE",
- "projectUrl": "https://github.com/grpc/grpc",
- "requireLicenseAcceptance": false,
"copyright": "Copyright 2015, Google Inc.",
- "tags": [ "gRPC health check" ],
-
- "compile": "**/*.cs",
-
+ "packOptions": {
+ "summary": "Implementation of gRPC health service",
+ "description": "Example implementation of grpc.health.v1 service that can be used for health-checking.",
+ "owners": [ "grpc-packages" ],
+ "licenseUrl": "https://github.com/grpc/grpc/blob/master/LICENSE",
+ "projectUrl": "https://github.com/grpc/grpc",
+ "requireLicenseAcceptance": false,
+ "tags": [ "gRPC health check" ]
+ },
+ "buildOptions": {
+ "compile": "**/*.cs"
+ },
"dependencies": {
"Grpc.Core": "0.14.0-anexperiment",
"Google.Protobuf": "3.0.0-beta3"
},
"frameworks": {
- "net45": { },
+ "net45": {
+ "frameworkAssemblies": {
+ "System.Runtime": "",
+ "System.IO": ""
+ }
+ },
"dotnet54": {
"imports": [
"portable-net45"
diff --git a/src/csharp/Grpc.IntegrationTesting.Client/project.json b/src/csharp/Grpc.IntegrationTesting.Client/project.json
index e023a9815b..6ad74d5998 100644
--- a/src/csharp/Grpc.IntegrationTesting.Client/project.json
+++ b/src/csharp/Grpc.IntegrationTesting.Client/project.json
@@ -1,11 +1,14 @@
{
- "compile": "**/*.cs",
- "compilationOptions": {
+ "buildOptions": {
+ "compile": "**/*.cs",
+ "copyToOutput": {
+ "mappings": {
+ "nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Debug/grpc_csharp_ext.dll",
+ "nativelibs/windows_x86/grpc_csharp_ext.dll": "../../../vsprojects/Debug/grpc_csharp_ext.dll"
+ }
+ },
"emitEntryPoint": true
},
-
- "content": "../nativelibs/**",
-
"dependencies": {
"Grpc.IntegrationTesting": "1.0.0"
},
diff --git a/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json b/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json
index e023a9815b..6ad74d5998 100644
--- a/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json
+++ b/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json
@@ -1,11 +1,14 @@
{
- "compile": "**/*.cs",
- "compilationOptions": {
+ "buildOptions": {
+ "compile": "**/*.cs",
+ "copyToOutput": {
+ "mappings": {
+ "nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Debug/grpc_csharp_ext.dll",
+ "nativelibs/windows_x86/grpc_csharp_ext.dll": "../../../vsprojects/Debug/grpc_csharp_ext.dll"
+ }
+ },
"emitEntryPoint": true
},
-
- "content": "../nativelibs/**",
-
"dependencies": {
"Grpc.IntegrationTesting": "1.0.0"
},
diff --git a/src/csharp/Grpc.IntegrationTesting.Server/project.json b/src/csharp/Grpc.IntegrationTesting.Server/project.json
index e023a9815b..6ad74d5998 100644
--- a/src/csharp/Grpc.IntegrationTesting.Server/project.json
+++ b/src/csharp/Grpc.IntegrationTesting.Server/project.json
@@ -1,11 +1,14 @@
{
- "compile": "**/*.cs",
- "compilationOptions": {
+ "buildOptions": {
+ "compile": "**/*.cs",
+ "copyToOutput": {
+ "mappings": {
+ "nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Debug/grpc_csharp_ext.dll",
+ "nativelibs/windows_x86/grpc_csharp_ext.dll": "../../../vsprojects/Debug/grpc_csharp_ext.dll"
+ }
+ },
"emitEntryPoint": true
},
-
- "content": "../nativelibs/**",
-
"dependencies": {
"Grpc.IntegrationTesting": "1.0.0"
},
diff --git a/src/csharp/Grpc.IntegrationTesting/project.json b/src/csharp/Grpc.IntegrationTesting/project.json
index 93cabf21bc..0093531fa9 100644
--- a/src/csharp/Grpc.IntegrationTesting/project.json
+++ b/src/csharp/Grpc.IntegrationTesting/project.json
@@ -1,11 +1,8 @@
{
- "compile": "**/*.cs",
- "compilationOptions": {
+ "buildOptions": {
+ "compile": "**/*.cs",
"emitEntryPoint": true
},
-
- "content": "../nativelibs/**",
-
"dependencies": {
"Grpc.Auth": "0.0.1",
"Grpc.Core": "0.0.1",
@@ -16,6 +13,11 @@
"NUnitLite": "3.2.0-*"
},
"frameworks": {
- "net45": { }
+ "net45": {
+ "frameworkAssemblies": {
+ "System.Runtime": "",
+ "System.IO": ""
+ }
+ }
}
}
--
GitLab