Skip to content
Permalink
Browse files

Migration cleanup

- Remove mono dependency in Travis
- Fix file not found error
  - Filenames are case sensitive in *nix
- Update license headers
- PR Feedback
  • Loading branch information...
JunTaoLuo committed Jan 29, 2019
1 parent 6418421 commit 5521bb3d1348f90be9335885a324691015453232
Showing with 599 additions and 488 deletions.
  1. +4 −1 .travis.yml
  2. +1 −1 Directory.Build.props
  3. +42 −41 Grpc.AspNetCore.sln
  4. +1 −1 benchmarks/Grpc.AspNetCore.Performance/DefaultCoreConfig.cs
  5. +4 −4 benchmarks/Grpc.AspNetCore.Performance/Grpc.AspNetCore.Performance.csproj
  6. +19 −1 benchmarks/Grpc.AspNetCore.Performance/Properties/AssemblyInfo.cs
  7. +14 −0 benchmarks/Grpc.AspNetCore.Performance/Proto/chat.proto
  8. +3 −3 build/dependencies.props
  9. +37 −287 doc/packages.md
  10. 0 {sample → examples}/Certs/Readme.md
  11. 0 {sample → examples}/Certs/ca.crt
  12. 0 {sample → examples}/Certs/ca.key
  13. 0 {sample → examples}/Certs/client.crt
  14. 0 {sample → examples}/Certs/client.key
  15. 0 {sample → examples}/Certs/server.crt
  16. 0 {sample → examples}/Certs/server.key
  17. BIN {sample → examples}/Certs/server.pfx
  18. +4 −4 {sample → examples}/Clients/Chatter/Chatter.csproj
  19. +28 −2 {sample → examples}/Clients/Chatter/Program.cs
  20. +4 −4 {sample → examples}/Clients/Counter/Counter.csproj
  21. +19 −1 {sample → examples}/Clients/Counter/Program.cs
  22. +4 −4 {sample → examples}/Clients/Greeter/Greeter.csproj
  23. +19 −1 {sample → examples}/Clients/Greeter/Program.cs
  24. +29 −0 examples/Proto/chat.proto
  25. +36 −0 examples/Proto/count.proto
  26. +34 −0 examples/Proto/greet.proto
  27. +19 −1 {sample → examples}/Server/Chatter.cs
  28. +19 −1 {sample → examples}/Server/Counter.cs
  29. +18 −1 {sample → examples}/Server/Greeter.cs
  30. +30 −0 examples/Server/IncrementingCounter.cs
  31. +19 −1 {sample → examples}/Server/Program.cs
  32. +4 −6 {sample → examples}/Server/Server.csproj
  33. +19 −1 {sample → examples}/Server/Startup.cs
  34. +33 −0 examples/Shared/ClientResources.cs
  35. +20 −2 {sample → examples}/Shared/Resources.cs
  36. +1 −1 global.json
  37. +3 −1 keys/README.md
  38. +0 −15 sample/Proto/chat.proto
  39. +0 −22 sample/Proto/count.proto
  40. +0 −20 sample/Proto/greet.proto
  41. +0 −12 sample/Server/IncrementingCounter.cs
  42. +0 −15 sample/Shared/ClientResources.cs
  43. +3 −2 src/Grpc.AspNetCore.Server/GrpcEndpointRouteBuilderExtensions.cs
  44. +1 −1 src/Grpc.AspNetCore.Server/GrpcServiceExtensions.cs
  45. +2 −2 src/Grpc.AspNetCore.Server/Internal/ClientStreamingServerCallHandler.cs
  46. +1 −1 src/Grpc.AspNetCore.Server/Internal/CompositeEndpointConventionBuilder.cs
  47. +4 −6 src/Grpc.AspNetCore.Server/Internal/Constants.cs
  48. +1 −1 src/Grpc.AspNetCore.Server/Internal/DuplexStreamingServerCallHandler.cs
  49. +4 −0 src/Grpc.AspNetCore.Server/Internal/GrpcMarkerService.cs
  50. +1 −1 src/Grpc.AspNetCore.Server/Internal/HttpContextStreamWriter.cs
  51. +17 −2 src/Grpc.AspNetCore.Server/Internal/ObjectMethodExecutor/AwaitableInfo.cs
  52. +17 −2 src/Grpc.AspNetCore.Server/Internal/ObjectMethodExecutor/CoercedAwaitableInfo.cs
  53. +18 −3 src/Grpc.AspNetCore.Server/Internal/ObjectMethodExecutor/ObjectMethodExecutor.cs
  54. +18 −3 src/Grpc.AspNetCore.Server/Internal/ObjectMethodExecutor/ObjectMethodExecutorAwaitable.cs
  55. +17 −2 src/Grpc.AspNetCore.Server/Internal/ObjectMethodExecutor/ObjectMethodExecutorFSharpSupport.cs
  56. +3 −3 src/Grpc.AspNetCore.Server/Internal/ServerStreamingServerCallHandler.cs
  57. +4 −4 src/Grpc.AspNetCore.Server/Internal/UnaryServerCallHandler.cs
  58. +1 −1 src/Grpc.AspNetCore.Server/Properties/AssemblyInfo.cs
@@ -1,7 +1,10 @@
language: csharp
sudo: required
dist: xenial
mono: latest
env:
global:
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
mono: none
branches:
only:
- master
@@ -7,4 +7,4 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

</Project>
</Project>
@@ -3,44 +3,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.136
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{EA330592-E294-4A29-B60E-196AA05831DD}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{EA330592-E294-4A29-B60E-196AA05831DD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8C62055F-8CD7-4859-9001-634D544DF2AE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Proto", "Proto", "{AC41B2B2-62D9-454E-8521-F71E331B07F3}"
ProjectSection(SolutionItems) = preProject
sample\Proto\chat.proto = sample\Proto\chat.proto
sample\Proto\count.proto = sample\Proto\count.proto
sample\Proto\greet.proto = sample\Proto\greet.proto
examples\Proto\chat.proto = examples\Proto\chat.proto
examples\Proto\count.proto = examples\Proto\count.proto
examples\Proto\greet.proto = examples\Proto\greet.proto
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Clients", "Clients", "{F6E0F9D7-64E5-4C7B-A9BC-3C2AD687710B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{A7E09CBD-853F-4C42-B4C4-A1C2CBA10C0B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "sample\Server\Server.csproj", "{47795F46-3E85-4B13-85E3-3344555600F9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Counter", "sample\Clients\Counter\Counter.csproj", "{747D03F5-8512-44FF-A3F3-7A985B0C45FC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greeter", "sample\Clients\Greeter\Greeter.csproj", "{2CFA655E-1A19-4A34-A4D2-AEE3E5B0583E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Chatter", "sample\Clients\Chatter\Chatter.csproj", "{1E882855-D205-4139-BE55-C44511FF43B0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Certs", "Certs", "{409A27EF-A5E9-45C5-9041-7210C6C8FC17}"
ProjectSection(SolutionItems) = preProject
sample\Certs\ca.crt = sample\Certs\ca.crt
sample\Certs\ca.key = sample\Certs\ca.key
sample\Certs\client.crt = sample\Certs\client.crt
sample\Certs\client.key = sample\Certs\client.key
sample\Certs\Readme.md = sample\Certs\Readme.md
sample\Certs\server.crt = sample\Certs\server.crt
sample\Certs\server.key = sample\Certs\server.key
sample\Certs\server.pfx = sample\Certs\server.pfx
examples\Certs\ca.crt = examples\Certs\ca.crt
examples\Certs\ca.key = examples\Certs\ca.key
examples\Certs\client.crt = examples\Certs\client.crt
examples\Certs\client.key = examples\Certs\client.key
examples\Certs\Readme.md = examples\Certs\Readme.md
examples\Certs\server.crt = examples\Certs\server.crt
examples\Certs\server.key = examples\Certs\server.key
examples\Certs\server.pfx = examples\Certs\server.pfx
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{3E045DF6-62EF-4331-B712-9CF5EC56F04C}"
ProjectSection(SolutionItems) = preProject
sample\Shared\Utils.cs = sample\Shared\Utils.cs
examples\Shared\ClientResources.cs = examples\Shared\ClientResources.cs
examples\Shared\Resources.cs = examples\Shared\Resources.cs
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grpc.AspNetCore.Server", "src\Grpc.AspNetCore.Server\Grpc.AspNetCore.Server.csproj", "{89ED416F-92F1-4425-9379-D4E76A285860}"
@@ -49,28 +42,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grpc.AspNetCore.Performance", "benchmarks\Grpc.AspNetCore.Performance\Grpc.AspNetCore.Performance.csproj", "{01C2E73D-CE9C-44B5-92D9-4E3B448106F0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Chatter", "examples\Clients\Chatter\Chatter.csproj", "{1AD4D7AC-9B2E-498B-BB78-BCAF15055B48}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Counter", "examples\Clients\Counter\Counter.csproj", "{F65AE56A-E6C8-467D-A097-3766D51720C0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greeter", "examples\Clients\Greeter\Greeter.csproj", "{265BE0B1-9002-441B-BA96-5C9E01115840}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "examples\Server\Server.csproj", "{CD6E11AE-34B2-4054-AD14-A27653131762}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{47795F46-3E85-4B13-85E3-3344555600F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{47795F46-3E85-4B13-85E3-3344555600F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{47795F46-3E85-4B13-85E3-3344555600F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{47795F46-3E85-4B13-85E3-3344555600F9}.Release|Any CPU.Build.0 = Release|Any CPU
{747D03F5-8512-44FF-A3F3-7A985B0C45FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{747D03F5-8512-44FF-A3F3-7A985B0C45FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{747D03F5-8512-44FF-A3F3-7A985B0C45FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{747D03F5-8512-44FF-A3F3-7A985B0C45FC}.Release|Any CPU.Build.0 = Release|Any CPU
{2CFA655E-1A19-4A34-A4D2-AEE3E5B0583E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2CFA655E-1A19-4A34-A4D2-AEE3E5B0583E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2CFA655E-1A19-4A34-A4D2-AEE3E5B0583E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2CFA655E-1A19-4A34-A4D2-AEE3E5B0583E}.Release|Any CPU.Build.0 = Release|Any CPU
{1E882855-D205-4139-BE55-C44511FF43B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1E882855-D205-4139-BE55-C44511FF43B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1E882855-D205-4139-BE55-C44511FF43B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1E882855-D205-4139-BE55-C44511FF43B0}.Release|Any CPU.Build.0 = Release|Any CPU
{89ED416F-92F1-4425-9379-D4E76A285860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{89ED416F-92F1-4425-9379-D4E76A285860}.Debug|Any CPU.Build.0 = Debug|Any CPU
{89ED416F-92F1-4425-9379-D4E76A285860}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -79,6 +64,22 @@ Global
{01C2E73D-CE9C-44B5-92D9-4E3B448106F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{01C2E73D-CE9C-44B5-92D9-4E3B448106F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{01C2E73D-CE9C-44B5-92D9-4E3B448106F0}.Release|Any CPU.Build.0 = Release|Any CPU
{1AD4D7AC-9B2E-498B-BB78-BCAF15055B48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1AD4D7AC-9B2E-498B-BB78-BCAF15055B48}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1AD4D7AC-9B2E-498B-BB78-BCAF15055B48}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1AD4D7AC-9B2E-498B-BB78-BCAF15055B48}.Release|Any CPU.Build.0 = Release|Any CPU
{F65AE56A-E6C8-467D-A097-3766D51720C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F65AE56A-E6C8-467D-A097-3766D51720C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F65AE56A-E6C8-467D-A097-3766D51720C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F65AE56A-E6C8-467D-A097-3766D51720C0}.Release|Any CPU.Build.0 = Release|Any CPU
{265BE0B1-9002-441B-BA96-5C9E01115840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{265BE0B1-9002-441B-BA96-5C9E01115840}.Debug|Any CPU.Build.0 = Debug|Any CPU
{265BE0B1-9002-441B-BA96-5C9E01115840}.Release|Any CPU.ActiveCfg = Release|Any CPU
{265BE0B1-9002-441B-BA96-5C9E01115840}.Release|Any CPU.Build.0 = Release|Any CPU
{CD6E11AE-34B2-4054-AD14-A27653131762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CD6E11AE-34B2-4054-AD14-A27653131762}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CD6E11AE-34B2-4054-AD14-A27653131762}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CD6E11AE-34B2-4054-AD14-A27653131762}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -87,14 +88,14 @@ Global
{AC41B2B2-62D9-454E-8521-F71E331B07F3} = {EA330592-E294-4A29-B60E-196AA05831DD}
{F6E0F9D7-64E5-4C7B-A9BC-3C2AD687710B} = {EA330592-E294-4A29-B60E-196AA05831DD}
{A7E09CBD-853F-4C42-B4C4-A1C2CBA10C0B} = {EA330592-E294-4A29-B60E-196AA05831DD}
{47795F46-3E85-4B13-85E3-3344555600F9} = {A7E09CBD-853F-4C42-B4C4-A1C2CBA10C0B}
{747D03F5-8512-44FF-A3F3-7A985B0C45FC} = {F6E0F9D7-64E5-4C7B-A9BC-3C2AD687710B}
{2CFA655E-1A19-4A34-A4D2-AEE3E5B0583E} = {F6E0F9D7-64E5-4C7B-A9BC-3C2AD687710B}
{1E882855-D205-4139-BE55-C44511FF43B0} = {F6E0F9D7-64E5-4C7B-A9BC-3C2AD687710B}
{409A27EF-A5E9-45C5-9041-7210C6C8FC17} = {EA330592-E294-4A29-B60E-196AA05831DD}
{3E045DF6-62EF-4331-B712-9CF5EC56F04C} = {EA330592-E294-4A29-B60E-196AA05831DD}
{89ED416F-92F1-4425-9379-D4E76A285860} = {8C62055F-8CD7-4859-9001-634D544DF2AE}
{01C2E73D-CE9C-44B5-92D9-4E3B448106F0} = {4163E1B3-4D75-46B4-9107-9A158FD708FC}
{1AD4D7AC-9B2E-498B-BB78-BCAF15055B48} = {F6E0F9D7-64E5-4C7B-A9BC-3C2AD687710B}
{F65AE56A-E6C8-467D-A097-3766D51720C0} = {F6E0F9D7-64E5-4C7B-A9BC-3C2AD687710B}
{265BE0B1-9002-441B-BA96-5C9E01115840} = {F6E0F9D7-64E5-4C7B-A9BC-3C2AD687710B}
{CD6E11AE-34B2-4054-AD14-A27653131762} = {A7E09CBD-853F-4C42-B4C4-A1C2CBA10C0B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {CD5C2B19-49B4-480A-990C-36D98A719B07}
@@ -43,7 +43,7 @@ public DefaultCoreConfig()

Add(JitOptimizationsValidator.FailOnError);

// TODO: Change to out of process and enable server GC when https://github.com/dotnet/BenchmarkDotNet/issues/1023 is fixed
// TODO(JamesNK): Change to out of process and enable server GC when https://github.com/dotnet/BenchmarkDotNet/issues/1023 is fixed
Add(Job.Core
.With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.0", null, ".NET Core 3.0")))
.With(InProcessToolchain.Instance)
@@ -10,16 +10,16 @@
</ItemGroup>

<ItemGroup>
<ProtoBuf Include=".\Proto\*.proto" GrpcServices="Server" Generator="MSBuild:Compile" />
<Protobuf Include=".\Proto\*.proto" GrpcServices="Server" Generator="MSBuild:Compile" />

<None Remove="@(ProtoBuf)" />
<Content Include="@(ProtoBuf)" LinkBase="" />
<None Remove="@(Protobuf)" />
<Content Include="@(Protobuf)" LinkBase="" />

<FrameworkReference Include="Microsoft.AspNetCore.App" />

<PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetPackageVersion)" />
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
<PackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)" />
<PackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)" PrivateAssets="All" />
</ItemGroup>

</Project>
@@ -1,3 +1,21 @@
using Grpc.AspNetCore.Performance;
#region Copyright notice and license

// Copyright 2019 The gRPC Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#endregion

using Grpc.AspNetCore.Performance;

[assembly: DefaultCoreConfigAttribute]
@@ -1,3 +1,17 @@
// Copyright 2019 The gRPC Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

syntax = "proto3";

package Chat;
@@ -2,12 +2,12 @@
<PropertyGroup>
<BenchmarkDotNetPackageVersion>0.11.3</BenchmarkDotNetPackageVersion>
<GoogleProtobufPackageVersion>3.6.1</GoogleProtobufPackageVersion>
<GrpcCorePackageVersion>1.17.0-pre3</GrpcCorePackageVersion>
<GrpcToolsPackageVersion>1.17.0-pre3</GrpcToolsPackageVersion>
<GrpcCorePackageVersion>1.18.0</GrpcCorePackageVersion>
<GrpcToolsPackageVersion>1.18.0</GrpcToolsPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-preview-18579-0056</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftNETTestSdkPackageVersion>16.0.0-preview-20181205-02</MicrosoftNETTestSdkPackageVersion>
<MoqPackageVersion>4.10.0</MoqPackageVersion>
<NunitPackageVersion>3.11.0</NunitPackageVersion>
<Nunit3TestAdapterPackageVersion>3.12.0</Nunit3TestAdapterPackageVersion>
</PropertyGroup>
</Project>
</Project>
Oops, something went wrong.

0 comments on commit 5521bb3

Please sign in to comment.
You can’t perform that action at this time.