Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7102 from jtattermusch/coreclr_update

Browse Source 
(CoreCLR support) Improvements to nugets generated by dotnet CLI.
pull/6959/merge
Jan Tattermusch 9 years ago committed by GitHub
parent 94f0a50d1e 652c00043f
commit d5fadaafeb
21 changed files with 127 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/csharp/Grpc.Auth/project.json
  2. 8
      src/csharp/Grpc.Core.Tests/project.json
  3. 7
      src/csharp/Grpc.Core/project.json
  4. 8
      src/csharp/Grpc.Examples.MathClient/project.json
  5. 8
      src/csharp/Grpc.Examples.MathServer/project.json
  6. 8
      src/csharp/Grpc.Examples.Tests/project.json
  7. 8
      src/csharp/Grpc.HealthCheck.Tests/project.json
  8. 6
      src/csharp/Grpc.HealthCheck/project.json
  9. 8
      src/csharp/Grpc.IntegrationTesting.Client/project.json
  10. 8
      src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json
  11. 8
      src/csharp/Grpc.IntegrationTesting.Server/project.json
  12. 8
      src/csharp/Grpc.IntegrationTesting.StressClient/project.json
  13. 8
      src/csharp/Grpc.IntegrationTesting/project.json
  14. 6
      templates/src/csharp/Grpc.Auth/project.json.template
  15. 7
      templates/src/csharp/Grpc.Core/project.json.template
  16. 6
      templates/src/csharp/Grpc.HealthCheck/project.json.template
  17. 8
      templates/src/csharp/build_options.include
  18. 2
      templates/tools/dockerfile/test/csharp_coreclr_x64/Dockerfile.template
  19. 2
      tools/dockerfile/test/csharp_coreclr_x64/Dockerfile
  20. 4
      tools/run_tests/build_csharp_coreclr.sh
  21. 2
      tools/run_tests/run_tests.py

6
src/csharp/Grpc.Auth/project.json
Unescape View File

@ -12,6 +12,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": "0.16.0-dev",
"Google.Apis.Auth": "1.11.1"

8
src/csharp/Grpc.Core.Tests/project.json
Unescape View File

@ -5,6 +5,10 @@
"configurations": {
"Debug": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"mappings": {
"nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Debug/grpc_csharp_ext.dll",
@ -17,6 +21,10 @@
},
"Release": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"mappings": {
"nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Release/grpc_csharp_ext.dll",

7
src/csharp/Grpc.Core/project.json
Unescape View File

@ -21,8 +21,13 @@
"build/native/bin/macosx_x64/": "../nativelibs/macosx_x64/libgrpc_csharp_ext.dylib"
}
},
"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"

8
src/csharp/Grpc.Examples.MathClient/project.json
Unescape View File

@ -5,6 +5,10 @@
"configurations": {
"Debug": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"mappings": {
"nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Debug/grpc_csharp_ext.dll",
@ -17,6 +21,10 @@
},
"Release": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"mappings": {
"nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Release/grpc_csharp_ext.dll",

8
src/csharp/Grpc.Examples.MathServer/project.json
Unescape View File

@ -5,6 +5,10 @@
"configurations": {
"Debug": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"mappings": {
"nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Debug/grpc_csharp_ext.dll",
@ -17,6 +21,10 @@
},
"Release": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"mappings": {
"nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Release/grpc_csharp_ext.dll",

8
src/csharp/Grpc.Examples.Tests/project.json
Unescape View File

@ -5,6 +5,10 @@
"configurations": {
"Debug": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"mappings": {
"nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Debug/grpc_csharp_ext.dll",
@ -17,6 +21,10 @@
},
"Release": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"mappings": {
"nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Release/grpc_csharp_ext.dll",

8
src/csharp/Grpc.HealthCheck.Tests/project.json
Unescape View File

@ -5,6 +5,10 @@
"configurations": {
"Debug": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"mappings": {
"nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Debug/grpc_csharp_ext.dll",
@ -17,6 +21,10 @@
},
"Release": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"mappings": {
"nativelibs/windows_x64/grpc_csharp_ext.dll": "../../../vsprojects/x64/Release/grpc_csharp_ext.dll",

6
src/csharp/Grpc.HealthCheck/project.json
Unescape View File

@ -12,6 +12,12 @@
"requireLicenseAcceptance": false,
"tags": [ "gRPC health check" ]
},
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true
},
"dependencies": {
"Grpc.Core": "0.16.0-dev",
"Google.Protobuf": "3.0.0-beta3"

8
src/csharp/Grpc.IntegrationTesting.Client/project.json
Unescape View File

@ -5,6 +5,10 @@
"configurations": {
"Debug": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"include": "data/*",
"mappings": {
@ -18,6 +22,10 @@
},
"Release": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"include": "data/*",
"mappings": {

8
src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json
Unescape View File

@ -5,6 +5,10 @@
"configurations": {
"Debug": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"include": "data/*",
"mappings": {
@ -18,6 +22,10 @@
},
"Release": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"include": "data/*",
"mappings": {

8
src/csharp/Grpc.IntegrationTesting.Server/project.json
Unescape View File

@ -5,6 +5,10 @@
"configurations": {
"Debug": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"include": "data/*",
"mappings": {
@ -18,6 +22,10 @@
},
"Release": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"include": "data/*",
"mappings": {

8
src/csharp/Grpc.IntegrationTesting.StressClient/project.json
Unescape View File

@ -5,6 +5,10 @@
"configurations": {
"Debug": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"include": "data/*",
"mappings": {
@ -18,6 +22,10 @@
},
"Release": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"include": "data/*",
"mappings": {

8
src/csharp/Grpc.IntegrationTesting/project.json
Unescape View File

@ -5,6 +5,10 @@
"configurations": {
"Debug": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"include": "data/*",
"mappings": {
@ -18,6 +22,10 @@
},
"Release": {
"buildOptions": {
"define": [ "SIGNED" ],
"keyFile": "../keys/Grpc.snk",
"publicSign": true,
"xmlDoc": true,
"copyToOutput": {
"include": "data/*",
"mappings": {

6
templates/src/csharp/Grpc.Auth/project.json.template
Unescape View File

@ -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"

7
templates/src/csharp/Grpc.Core/project.json.template
Unescape View File

@ -23,8 +23,13 @@
"build/native/bin/macosx_x64/": "../nativelibs/macosx_x64/libgrpc_csharp_ext.dylib"
}
},
"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"

6
templates/src/csharp/Grpc.HealthCheck/project.json.template
Unescape View File

@ -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"

8
templates/src/csharp/build_options.include
Unescape View File

@ -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/*",

2
templates/tools/dockerfile/test/csharp_coreclr_x64/Dockerfile.template
Unescape View File

@ -29,7 +29,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
FROM microsoft/dotnet:1.0.0-preview1
FROM microsoft/dotnet:1.0.0-preview2-sdk
<%include file="../../apt_get_basic.include"/>
<%include file="../../run_tests_addons.include"/>

2
tools/dockerfile/test/csharp_coreclr_x64/Dockerfile
Unescape View File

@ -27,7 +27,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
FROM microsoft/dotnet:1.0.0-preview1
FROM microsoft/dotnet:1.0.0-preview2-sdk
# Install Git and basic packages.
RUN apt-get update && apt-get install -y \

4
tools/run_tests/build_csharp_coreclr.sh
Unescape View File

@ -36,7 +36,3 @@ cd $(dirname $0)/../../src/csharp
dotnet restore .
dotnet build -f netstandard1.5 --configuration $MSBUILD_CONFIG '**/project.json'
# Grpc.IntegrationTesting doesn't get built by the previous command for some reason.
# TODO(jtattermusch): get rid of the hack
dotnet build -f netstandard1.5 --configuration $MSBUILD_CONFIG Grpc.IntegrationTesting/project.json

2
tools/run_tests/run_tests.py
Unescape View File

@ -522,7 +522,7 @@ class CSharpLanguage(object):
if self.platform == 'linux':
assembly_subdir += '/netstandard1.5/debian.8-x64'
assembly_extension = ''
if self.platform == 'mac':
elif self.platform == 'mac':
assembly_subdir += '/netstandard1.5/osx.10.11-x64'
assembly_extension = ''
else:

Write Preview
Loading…
Cancel
Save