diff --git a/examples/Transporter/Client/Client.csproj b/examples/Transporter/Client/Client.csproj deleted file mode 100644 index 2c022b354..000000000 --- a/examples/Transporter/Client/Client.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - Exe - net5.0 - - - - - - - - - - - diff --git a/examples/Transporter/Client/Program.cs b/examples/Transporter/Client/Program.cs deleted file mode 100644 index b6d02c6b4..000000000 --- a/examples/Transporter/Client/Program.cs +++ /dev/null @@ -1,63 +0,0 @@ -#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 System; -using System.IO; -using System.Net.Http; -using System.Net.Sockets; -using System.Threading; -using System.Threading.Tasks; -using Greet; -using Grpc.Core; -using Grpc.Net.Client; - -namespace Client -{ - public partial class Program - { - public static readonly string SocketPath = Path.Combine(Path.GetTempPath(), "grpc-transporter.tmp"); - - static async Task Main(string[] args) - { - using var channel = GrpcChannel.ForAddress("http://localhost", new GrpcChannelOptions - { - HttpHandler = CreateHttpHandler(SocketPath) - }); - var client = new Greeter.GreeterClient(channel); - - var reply = await client.SayHelloAsync(new HelloRequest { Name = "GreeterClient" }); - Console.WriteLine("Greeting: " + reply.Message); - - Console.WriteLine("Shutting down"); - Console.WriteLine("Press any key to exit..."); - Console.ReadKey(); - } - - private static SocketsHttpHandler CreateHttpHandler(string socketPath) - { - var udsEndPoint = new UnixDomainSocketEndPoint(socketPath); - var connectionFactory = new UnixDomainSocketConnectionFactory(udsEndPoint); - var socketsHttpHandler = new SocketsHttpHandler - { - ConnectionFactory = connectionFactory - }; - - return socketsHttpHandler; - } - } -} diff --git a/examples/Transporter/Client/UnixDomainSocketConnectionFactory.cs b/examples/Transporter/Client/UnixDomainSocketConnectionFactory.cs deleted file mode 100644 index 6c94bc58b..000000000 --- a/examples/Transporter/Client/UnixDomainSocketConnectionFactory.cs +++ /dev/null @@ -1,41 +0,0 @@ -#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 System.Net; -using System.Net.Connections; -using System.Net.Sockets; -using System.Threading; -using System.Threading.Tasks; - -namespace Client -{ - public class UnixDomainSocketConnectionFactory : SocketsConnectionFactory - { - private readonly EndPoint _endPoint; - - public UnixDomainSocketConnectionFactory(EndPoint endPoint) : base(AddressFamily.Unix, SocketType.Stream, ProtocolType.Unspecified) - { - _endPoint = endPoint; - } - - public override ValueTask ConnectAsync(EndPoint? endPoint, IConnectionProperties? options = null, CancellationToken cancellationToken = default) - { - return base.ConnectAsync(_endPoint, options, cancellationToken); - } - } -} diff --git a/examples/Transporter/Proto/greet.proto b/examples/Transporter/Proto/greet.proto deleted file mode 100644 index 26d0c794d..000000000 --- a/examples/Transporter/Proto/greet.proto +++ /dev/null @@ -1,33 +0,0 @@ -// 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 greet; - -// The greeting service definition. -service Greeter { - // Sends a greeting - rpc SayHello (HelloRequest) returns (HelloReply); -} - -// The request message containing the user's name. -message HelloRequest { - string name = 1; -} - -// The response message containing the greetings -message HelloReply { - string message = 1; -} diff --git a/examples/Transporter/Server/Program.cs b/examples/Transporter/Server/Program.cs deleted file mode 100644 index cf725ca67..000000000 --- a/examples/Transporter/Server/Program.cs +++ /dev/null @@ -1,50 +0,0 @@ -#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 System.IO; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Hosting; - -namespace Server -{ - public class Program - { - public static readonly string SocketPath = Path.Combine(Path.GetTempPath(), "grpc-transporter.tmp"); - - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } - - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - webBuilder.ConfigureKestrel(options => - { - if (File.Exists(SocketPath)) - { - File.Delete(SocketPath); - } - - options.ListenUnixSocket(SocketPath); - }); - }); - } -} diff --git a/examples/Transporter/Server/Properties/launchSettings.json b/examples/Transporter/Server/Properties/launchSettings.json deleted file mode 100644 index 5e6a6188f..000000000 --- a/examples/Transporter/Server/Properties/launchSettings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "profiles": { - "Server": { - "commandName": "Project", - "launchBrowser": false, - "applicationUrl": "https://localhost:5001", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} diff --git a/examples/Transporter/Server/Server.csproj b/examples/Transporter/Server/Server.csproj deleted file mode 100644 index bd1351909..000000000 --- a/examples/Transporter/Server/Server.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - net5.0 - - - - - - - - - diff --git a/examples/Transporter/Server/Services/GreeterService.cs b/examples/Transporter/Server/Services/GreeterService.cs deleted file mode 100644 index 1ca09856d..000000000 --- a/examples/Transporter/Server/Services/GreeterService.cs +++ /dev/null @@ -1,41 +0,0 @@ -#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 System.Threading.Tasks; -using Greet; -using Grpc.Core; -using Microsoft.Extensions.Logging; - -namespace Server -{ - public class GreeterService : Greeter.GreeterBase - { - private readonly ILogger _logger; - - public GreeterService(ILoggerFactory loggerFactory) - { - _logger = loggerFactory.CreateLogger(); - } - - public override Task SayHello(HelloRequest request, ServerCallContext context) - { - _logger.LogInformation($"Sending hello to {request.Name}"); - return Task.FromResult(new HelloReply { Message = "Hello " + request.Name }); - } - } -} diff --git a/examples/Transporter/Server/Startup.cs b/examples/Transporter/Server/Startup.cs deleted file mode 100644 index a9ac4f1fc..000000000 --- a/examples/Transporter/Server/Startup.cs +++ /dev/null @@ -1,48 +0,0 @@ -#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 Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; - -namespace Server -{ - public class Startup - { - public void ConfigureServices(IServiceCollection services) - { - services.AddGrpc(); - } - - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - - app.UseRouting(); - - app.UseEndpoints(endpoints => - { - endpoints.MapGrpcService(); - }); - } - } -} diff --git a/examples/Transporter/Server/appsettings.Development.json b/examples/Transporter/Server/appsettings.Development.json deleted file mode 100644 index fe20c40cc..000000000 --- a/examples/Transporter/Server/appsettings.Development.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Grpc": "Information", - "Microsoft": "Information" - } - } -} diff --git a/examples/Transporter/Server/appsettings.json b/examples/Transporter/Server/appsettings.json deleted file mode 100644 index f5f63744b..000000000 --- a/examples/Transporter/Server/appsettings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information" - } - }, - "AllowedHosts": "*", - "Kestrel": { - "EndpointDefaults": { - "Protocols": "Http2" - } - } -} diff --git a/examples/Transporter/Transporter.sln b/examples/Transporter/Transporter.sln deleted file mode 100644 index 37e6a3d07..000000000 --- a/examples/Transporter/Transporter.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29230.61 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "Server\Server.csproj", "{534AC5F8-2DF2-40BD-87A5-B3D8310118C4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csproj", "{48A1D3BC-A14B-436A-8822-6DE2BEF8B747}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {534AC5F8-2DF2-40BD-87A5-B3D8310118C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {534AC5F8-2DF2-40BD-87A5-B3D8310118C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {534AC5F8-2DF2-40BD-87A5-B3D8310118C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {534AC5F8-2DF2-40BD-87A5-B3D8310118C4}.Release|Any CPU.Build.0 = Release|Any CPU - {48A1D3BC-A14B-436A-8822-6DE2BEF8B747}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48A1D3BC-A14B-436A-8822-6DE2BEF8B747}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48A1D3BC-A14B-436A-8822-6DE2BEF8B747}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48A1D3BC-A14B-436A-8822-6DE2BEF8B747}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D22B3129-3BFB-41FA-9FCE-E45EBEF8C2DD} - EndGlobalSection -EndGlobal diff --git a/perf/benchmarkapps/GrpcClient/Program.cs b/perf/benchmarkapps/GrpcClient/Program.cs index 9bfab1f46..aca34e103 100644 --- a/perf/benchmarkapps/GrpcClient/Program.cs +++ b/perf/benchmarkapps/GrpcClient/Program.cs @@ -408,7 +408,8 @@ private static ChannelBase CreateChannel(string target) } if (!string.IsNullOrEmpty(_options.UdsFileName)) { - httpClientHandler.ConnectionFactory = new UnixDomainSocketConnectionFactory(new UnixDomainSocketEndPoint(ResolveUdsPath(_options.UdsFileName))); + // Removed in .NET 5. Re-enable when support is added back in .NET 6 + // httpClientHandler.ConnectionFactory = new UnixDomainSocketConnectionFactory(new UnixDomainSocketEndPoint(ResolveUdsPath(_options.UdsFileName))); } // TODO(JamesNK): Check whether the disable can be removed once .NET 5 is finalized diff --git a/perf/benchmarkapps/GrpcClient/UnixDomainSocketConnectionFactory.cs b/perf/benchmarkapps/GrpcClient/UnixDomainSocketConnectionFactory.cs index 37b237821..70f4fc589 100644 --- a/perf/benchmarkapps/GrpcClient/UnixDomainSocketConnectionFactory.cs +++ b/perf/benchmarkapps/GrpcClient/UnixDomainSocketConnectionFactory.cs @@ -24,6 +24,8 @@ namespace GrpcClient { + // Removed in .NET 5. Re-enable when support is added back in .NET 6 + /* public class UnixDomainSocketConnectionFactory : SocketsConnectionFactory { private readonly EndPoint _endPoint; @@ -38,4 +40,5 @@ public override ValueTask ConnectAsync(EndPoint? endPoint, IConnecti return base.ConnectAsync(_endPoint, options, cancellationToken); } } + */ }