huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gRPC template updates (#11473)

This commit is contained in:
John Luo 2019-06-27 15:04:01 -07:00 committed by GitHub
parent 2745349822
commit 82149f92ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eng/Versions.props
View File

@ -217,8 +217,7 @@
<CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
<FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
<GoogleProtobufPackageVersion>3.8.0</GoogleProtobufPackageVersion>
<GrpcAspNetCoreServerPackageVersion>0.1.21-pre1</GrpcAspNetCoreServerPackageVersion>
<GrpcToolsPackageVersion>1.21.0</GrpcToolsPackageVersion>
<GrpcAspNetCorePackageVersion>0.1.22-pre1</GrpcAspNetCorePackageVersion>
<IdentityServer4AspNetIdentityPackageVersion>3.0.0-preview3.4</IdentityServer4AspNetIdentityPackageVersion>
<IdentityServer4EntityFrameworkPackageVersion>3.0.0-preview3.4</IdentityServer4EntityFrameworkPackageVersion>
<IdentityServer4PackageVersion>3.0.0-preview3.4</IdentityServer4PackageVersion>

5
src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/.template.config/template.json
View File

@ -24,6 +24,11 @@
],
"defaultName": "protobuf",
"symbols": {
"namespace": {
"description": "namespace for the generated code",
"replaces": "MyApp.Namespace",
"type": "parameter"
},
"HostIdentifier": {
"type": "bind",
"binding": "HostIdentifier"

2
src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/protobuf.proto
View File

@ -1 +1,3 @@
syntax = "proto3";
option csharp_namespace = "MyApp.Namespace";

5
src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in
View File

@ -9,10 +9,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Grpc.AspNetCore.Server" Version="${GrpcAspNetCoreServerPackageVersion}" />
<PackageReference Include="Google.Protobuf" Version="${GoogleProtobufPackageVersion}" />
<PackageReference Include="Grpc.Tools" Version="${GrpcToolsPackageVersion}" PrivateAssets="All" />
<PackageReference Include="Grpc.AspNetCore" Version="${GrpcAspNetCorePackageVersion}" />
</ItemGroup>
</Project>

4
src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
View File

@ -10,9 +10,7 @@
<PropertyGroup>
<!-- Lists the versions of dependencies not built in this repo. Packages produced from this repo should be listed as a PackageVersionVariableReference. -->
<GeneratedContentProperties>
GoogleProtobufPackageVersion=$(GoogleProtobufPackageVersion);
GrpcAspNetCoreServerPackageVersion=$(GrpcAspNetCoreServerPackageVersion);
GrpcToolsPackageVersion=$(GrpcToolsPackageVersion);
GrpcAspNetCorePackageVersion=$(GrpcAspNetCorePackageVersion);
MicrosoftAspNetCoreMvcRazorRuntimeCompilationPackageVersion=$(MicrosoftAspNetCoreMvcRazorRuntimeCompilationPackageVersion);
MicrosoftEntityFrameworkCoreSqlitePackageVersion=$(MicrosoftEntityFrameworkCoreSqlitePackageVersion);
MicrosoftEntityFrameworkCoreSqlServerPackageVersion=$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion);

2
src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/Properties/launchSettings.json
View File

@ -3,7 +3,7 @@
"GrpcService-CSharp": {
"commandName": "Project",
"launchBrowser": false,
"applicationUrl": "http://localhost:50051",
"applicationUrl": "https://localhost:50051",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}

8
src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/Startup.cs
View File

@ -4,6 +4,7 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
@ -30,9 +31,12 @@ namespace GrpcService_CSharp
app.UseEndpoints(endpoints =>
{
// Communication with gRPC endpoints must be made through a gRPC client.
// To learn how to create a client, visit: https://go.microsoft.com/fwlink/?linkid=2086909
endpoints.MapGrpcService<GreeterService>();
endpoints.MapGet("/", async context =>
{
await context.Response.WriteAsync("Communication with gRPC endpoints must be made through a gRPC client. To learn how to create a client, visit: https://go.microsoft.com/fwlink/?linkid=2086909");
});
});
}
}

7
src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/appsettings.json
View File

@ -5,10 +5,5 @@
"Microsoft.Hosting.Lifetime": "Information"
}
},
"AllowedHosts": "*",
"Kestrel": {
"EndpointDefaults": {
"Protocols": "Http2"
}
}
"AllowedHosts": "*"
}