diff --git a/Samples/BeanTrader/NetFx/BeanTraderInterfaces/BeanTraderCommon.csproj b/Samples/BeanTrader/NetFx/BeanTraderInterfaces/BeanTraderCommon.csproj index e9694db..03ea809 100644 --- a/Samples/BeanTrader/NetFx/BeanTraderInterfaces/BeanTraderCommon.csproj +++ b/Samples/BeanTrader/NetFx/BeanTraderInterfaces/BeanTraderCommon.csproj @@ -1,6 +1,7 @@ - - - + + + net8.0 + Debug AnyCPU @@ -9,7 +10,6 @@ Properties BeanTraderInterfaces BeanTraderInterfaces - v4.7.2 512 true @@ -31,24 +31,6 @@ 4 - - - - - - - - - - - - - - - - - - + - \ No newline at end of file diff --git a/Samples/BeanTrader/NetFx/BeanTraderInterfaces/IBeanTrader.cs b/Samples/BeanTrader/NetFx/BeanTraderInterfaces/IBeanTrader.cs index dfc4dfd..3e0db97 100644 --- a/Samples/BeanTrader/NetFx/BeanTraderInterfaces/IBeanTrader.cs +++ b/Samples/BeanTrader/NetFx/BeanTraderInterfaces/IBeanTrader.cs @@ -1,7 +1,7 @@ -using BeanTrader.Models; +using BeanTrader.Models; using System; using System.Collections.Generic; -using System.ServiceModel; +using CoreWCF; namespace BeanTrader { @@ -35,4 +35,4 @@ public interface IBeanTrader [OperationContract(IsOneWay = true)] void StopListening(); } -} +} \ No newline at end of file diff --git a/Samples/BeanTrader/NetFx/BeanTraderInterfaces/IBeanTraderCallback.cs b/Samples/BeanTrader/NetFx/BeanTraderInterfaces/IBeanTraderCallback.cs index aba5039..8189937 100644 --- a/Samples/BeanTrader/NetFx/BeanTraderInterfaces/IBeanTraderCallback.cs +++ b/Samples/BeanTrader/NetFx/BeanTraderInterfaces/IBeanTraderCallback.cs @@ -1,6 +1,6 @@ -using BeanTrader.Models; +using BeanTrader.Models; using System; -using System.ServiceModel; +using CoreWCF; namespace BeanTrader { diff --git a/Samples/BeanTrader/NetFx/BeanTraderInterfaces/Properties/AssemblyInfo.cs b/Samples/BeanTrader/NetFx/BeanTraderInterfaces/Properties/AssemblyInfo.cs.bak similarity index 100% rename from Samples/BeanTrader/NetFx/BeanTraderInterfaces/Properties/AssemblyInfo.cs rename to Samples/BeanTrader/NetFx/BeanTraderInterfaces/Properties/AssemblyInfo.cs.bak diff --git a/Samples/BeanTrader/NetFx/BeanTraderServer/App.config b/Samples/BeanTrader/NetFx/BeanTraderServer/App.config.bak similarity index 100% rename from Samples/BeanTrader/NetFx/BeanTraderServer/App.config rename to Samples/BeanTrader/NetFx/BeanTraderServer/App.config.bak diff --git a/Samples/BeanTrader/NetFx/BeanTraderServer/BeanTrader.cs b/Samples/BeanTrader/NetFx/BeanTraderServer/BeanTrader.cs index b8ffe68..7057501 100644 --- a/Samples/BeanTrader/NetFx/BeanTraderServer/BeanTrader.cs +++ b/Samples/BeanTrader/NetFx/BeanTraderServer/BeanTrader.cs @@ -1,4 +1,4 @@ -using BeanTrader; +using BeanTrader; using BeanTrader.Models; using Serilog; using System; @@ -6,9 +6,10 @@ using System.Collections.Generic; using System.Linq; using System.Security.Cryptography; -using System.ServiceModel; using System.Text; using System.Threading; +using CoreWCF; + namespace BeanTraderServer { diff --git a/Samples/BeanTrader/NetFx/BeanTraderServer/BeanTraderServer.csproj b/Samples/BeanTrader/NetFx/BeanTraderServer/BeanTraderServer.csproj index c295414..4662b7e 100644 --- a/Samples/BeanTrader/NetFx/BeanTraderServer/BeanTraderServer.csproj +++ b/Samples/BeanTrader/NetFx/BeanTraderServer/BeanTraderServer.csproj @@ -1,6 +1,8 @@ - - - + + + net8.0 + Exe + Debug AnyCPU @@ -8,7 +10,6 @@ Exe BeanTraderServer BeanTraderServer - v4.7.2 512 true true @@ -33,30 +34,15 @@ 4 - - ..\packages\Serilog.2.8.0\lib\net46\Serilog.dll - - - ..\packages\Serilog.Sinks.Console.3.1.1\lib\net45\Serilog.Sinks.Console.dll - - - - - - - - - - - - - - - - + + + + + + + - PreserveNewest @@ -68,5 +54,9 @@ BeanTraderCommon - + + + Always + + \ No newline at end of file diff --git a/Samples/BeanTrader/NetFx/BeanTraderServer/Program.cs b/Samples/BeanTrader/NetFx/BeanTraderServer/Program.cs index fbd62fa..ec1ba0e 100644 --- a/Samples/BeanTrader/NetFx/BeanTraderServer/Program.cs +++ b/Samples/BeanTrader/NetFx/BeanTraderServer/Program.cs @@ -1,45 +1,34 @@ -using Serilog; -using System; -using System.IO; -using System.Security.Cryptography.X509Certificates; -using System.ServiceModel; -using System.ServiceModel.Security; -namespace BeanTraderServer -{ - class Program - { - static void Main() - { - ConfigureLogging(); +using CoreWCF.Configuration; +using System.Net; +using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; - using (var host = new ServiceHost(typeof(BeanTrader))) - { - // For demo purposes, just load the key from disk so that no one needs to install an untrustworthy self-signed cert - var certPath = Path.Combine(Path.GetDirectoryName(typeof(Program).Assembly.Location), "BeanTrader.pfx"); - host.Credentials.ServiceCertificate.Certificate = new X509Certificate2(certPath, "password"); - host.Credentials.ClientCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.None; - host.Open(); - Log.Information("Bean Trader Service listening"); - WaitForExitSignal(); - Log.Information("Shutting down..."); - host.Close(); - } - } - private static void WaitForExitSignal() - { - Console.WriteLine("Press enter to exit"); - Console.ReadLine(); - } +namespace BeanTraderServer +{ + public class Program + { + public static void Main(string[] args) + { + //All Ports set are default. + IWebHost host = CreateWebHostBuilder(args).Build(); + host.Run(); + } - private static void ConfigureLogging() + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseKestrel(options => { + options.Listen(address: IPAddress.Loopback, 8888, listenOptions => { - Log.Logger = new LoggerConfiguration() - .WriteTo.Console() - .CreateLogger(); - - Log.Information("Logging initialized"); - } - } + listenOptions.UseHttps(httpsOptions => + { +#if NET472 + httpsOptions.SslProtocols = SslProtocols.Tls12 | SslProtocols.Tls11 | SslProtocols.Tls; +#endif // NET472 + }); + });}) +.UseNetTcp(8000) .UseStartup(); + } } diff --git a/Samples/BeanTrader/NetFx/BeanTraderServer/Properties/AssemblyInfo.cs b/Samples/BeanTrader/NetFx/BeanTraderServer/Properties/AssemblyInfo.cs.bak similarity index 100% rename from Samples/BeanTrader/NetFx/BeanTraderServer/Properties/AssemblyInfo.cs rename to Samples/BeanTrader/NetFx/BeanTraderServer/Properties/AssemblyInfo.cs.bak diff --git a/Samples/BeanTrader/NetFx/BeanTraderServer/Startup.cs b/Samples/BeanTrader/NetFx/BeanTraderServer/Startup.cs new file mode 100644 index 0000000..251bdbe --- /dev/null +++ b/Samples/BeanTrader/NetFx/BeanTraderServer/Startup.cs @@ -0,0 +1,24 @@ + +using CoreWCF.Configuration; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; + +namespace BeanTraderServer +{ + public class Startup + { + public void ConfigureServices(IServiceCollection services) + { + string pathToXml = @"corewcf_ported.config"; + services.AddServiceModelServices(); + services.AddServiceModelConfigurationManagerFile(pathToXml); + } + + public void Configure(IApplicationBuilder app, IHostingEnvironment env) + { + app.UseServiceModel(); + } + } +} diff --git a/Samples/BeanTrader/NetFx/BeanTraderServer/corewcf_ported.config b/Samples/BeanTrader/NetFx/BeanTraderServer/corewcf_ported.config new file mode 100644 index 0000000..cfd3607 Binary files /dev/null and b/Samples/BeanTrader/NetFx/BeanTraderServer/corewcf_ported.config differ diff --git a/Samples/BeanTrader/NetFx/BeanTraderServer/packages.config b/Samples/BeanTrader/NetFx/BeanTraderServer/packages.config.bak similarity index 100% rename from Samples/BeanTrader/NetFx/BeanTraderServer/packages.config rename to Samples/BeanTrader/NetFx/BeanTraderServer/packages.config.bak