From 0d19264582639359bf89f876787065be51672acd Mon Sep 17 00:00:00 2001
From: Mike Rousos <mikerou@microsoft.com>
Date: Fri, 6 Dec 2024 16:41:02 -0500
Subject: [PATCH 1/2] Server upgraded to .NET 8 by Q for Developers

---
 .../BeanTraderCommon.csproj                   | 28 ++------
 .../NetFx/BeanTraderInterfaces/IBeanTrader.cs |  6 +-
 .../IBeanTraderCallback.cs                    |  4 +-
 .../{AssemblyInfo.cs => AssemblyInfo.cs.bak}  |  0
 .../{App.config => App.config.bak}            |  0
 .../NetFx/BeanTraderServer/BeanTrader.cs      |  5 +-
 .../BeanTraderServer/BeanTraderServer.csproj  | 44 +++++-------
 .../NetFx/BeanTraderServer/Program.cs         | 67 ++++++++-----------
 .../{AssemblyInfo.cs => AssemblyInfo.cs.bak}  |  0
 .../NetFx/BeanTraderServer/Startup.cs         | 24 +++++++
 .../{packages.config => packages.config.bak}  |  0
 11 files changed, 82 insertions(+), 96 deletions(-)
 rename Samples/BeanTrader/NetFx/BeanTraderInterfaces/Properties/{AssemblyInfo.cs => AssemblyInfo.cs.bak} (100%)
 rename Samples/BeanTrader/NetFx/BeanTraderServer/{App.config => App.config.bak} (100%)
 rename Samples/BeanTrader/NetFx/BeanTraderServer/Properties/{AssemblyInfo.cs => AssemblyInfo.cs.bak} (100%)
 create mode 100644 Samples/BeanTrader/NetFx/BeanTraderServer/Startup.cs
 rename Samples/BeanTrader/NetFx/BeanTraderServer/{packages.config => packages.config.bak} (100%)

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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,7 +10,6 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BeanTraderInterfaces</RootNamespace>
     <AssemblyName>BeanTraderInterfaces</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
@@ -31,24 +31,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="IBeanTrader.cs" />
-    <Compile Include="IBeanTraderCallback.cs" />
-    <Compile Include="Models\Beans.cs" />
-    <Compile Include="Models\TradeOffer.cs" />
-    <Compile Include="Models\Trader.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <PackageReference Include="CoreWCF.Primitives" Version="1.5.1" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +10,6 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>BeanTraderServer</RootNamespace>
     <AssemblyName>BeanTraderServer</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
@@ -33,30 +34,15 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.2.8.0\lib\net46\Serilog.dll</HintPath>
-    </Reference>
-    <Reference Include="Serilog.Sinks.Console, Version=3.1.1.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Sinks.Console.3.1.1\lib\net45\Serilog.Sinks.Console.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.IdentityModel" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BeanTrader.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <PackageReference Include="CoreWCF.Primitives" Version="*" />
+    <PackageReference Include="CoreWCF.Http" Version="*" />
+    <PackageReference Include="CoreWCF.NetTcp" Version="*" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="*" />
+    <PackageReference Include="CoreWCF.ConfigurationManager" Version="*" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageReference Include="Serilog" Version="4.0.1" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
     <None Include="BeanTrader.pfx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -68,5 +54,9 @@
       <Name>BeanTraderCommon</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <None Update="corewcf_ported.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
\ 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<Startup>();
+	}
 }
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/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

From 4ebecfcec7bf934559a9c6dbac931b23d8408840 Mon Sep 17 00:00:00 2001
From: Mike Rousos <mikerou@microsoft.com>
Date: Fri, 6 Dec 2024 16:41:14 -0500
Subject: [PATCH 2/2] Add missing config file Q forgot to add

---
 .../NetFx/BeanTraderServer/corewcf_ported.config | Bin 0 -> 2266 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Samples/BeanTrader/NetFx/BeanTraderServer/corewcf_ported.config

diff --git a/Samples/BeanTrader/NetFx/BeanTraderServer/corewcf_ported.config b/Samples/BeanTrader/NetFx/BeanTraderServer/corewcf_ported.config
new file mode 100644
index 0000000000000000000000000000000000000000..cfd36072f26f92db3f4457a4099c264037b243e5
GIT binary patch
literal 2266
zcma)-PjAye5XI-rr!YNJ8!iYTx0M<S;!rL`>N#;tu+%zHY!~w7f#2JW$*$w1k(KP)
zGxO%(+u6T=a=WqL_GFKi*t3<kvBoM}S#4K#Vec%px2y@0+6ulekk+<z(#~4@VV7vV
zcRCI4Go%atA00;N^tM<xXx!Mfy|Ucl)L2&Fba<R$=Y2|^@Z{)k`L$R+5kuo5dq%5Z
zckkjT@zLvhn>n(dph<7#G7059u5#>=ZeO$*M^4CcMr1xe`BmOim&<~;jm5~y@*;{>
zxc#GS!>I0gQzcbLtqEDRJZt;nBzMmHocv34)Tb8wjyH8GJKN7EEauoPu~JtH5IYb{
zyMq&|^crN}8R;sP3Z1X$erDgXZ;Ac92y!ADcIdD_*`OA29mUSjW(;$v5!W`B`tHUW
zac|{+*xT=X6NmJlx=s%@)Q4fN6L%uUSg-m?dx#R}ew;%&wmNldJgAQ?-o>5;@#*CG
z4xP%xpDQ1=5W-VlgVDn60{mNt-%AhmPv`isvtHRRVw%97%0=Ef-fFricFlu=RaF^_
zIfZ{?-*vvkhhZ&3zW9C*ITmUNA?8EOn4C_96^f-E|9HhhPy5p!BgXtYRkJZPAHi#;
z@+B;Ipq35ma>opv^p<_X*;SUwZf4cIi9H*n^4KzQG=;>S8P+A;5|=a^)T4^8x-o=N
zfVFWpTYJMdO%yTEPx3y?!&N>s-!yv^V~u~k>9)|?fV2J|m3${?)cmLRjR`enC%!4J
zlzl%V8~aEPGoto+bVQUA<%)Tofg&%yLm50QxQ8+qf&3}s%szmo`W>(DFz*Cx-HrY}
z@b^Gi)8n(>_sg?Bv`C0-e?G>lKc!OZoyQ5QdRMtywQzNP`8M!O5BoQkv7fOa=Z9L-
ZIFIv(So`ziPu{t=zO?<s7@Mfq_7C2jYy$uQ

literal 0
HcmV?d00001