Skip to content
This repository was archived by the owner on Jun 20, 2025. It is now read-only.

Upgrade server to .NET with Amazon Q for Developers #30

Open
mjrousos wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Upgrade server to .NET with Amazon Q for Developers #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d19264
Server upgraded to .NET 8 by Q for Developers
mjrousos Dec 6, 2024
4ebecfc
Add missing config file Q forgot to add
mjrousos Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 5 additions & 23 deletions Samples/BeanTrader/NetFx/BeanTraderInterfaces/BeanTraderCommon.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand All @@ -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>
6 changes: 3 additions & 3 deletions Samples/BeanTrader/NetFx/BeanTraderInterfaces/IBeanTrader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using BeanTrader.Models;
using BeanTrader.Models;
using System;
using System.Collections.Generic;
using System.ServiceModel;
using CoreWCF;

namespace BeanTrader
{
Expand Down Expand Up @@ -35,4 +35,4 @@ public interface IBeanTrader
[OperationContract(IsOneWay = true)]
void StopListening();
}
}
}
4 changes: 2 additions & 2 deletions Samples/BeanTrader/NetFx/BeanTraderInterfaces/IBeanTraderCallback.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using BeanTrader.Models;
using BeanTrader.Models;
using System;
using System.ServiceModel;
using CoreWCF;

namespace BeanTrader
{
Expand Down
0 ...aderInterfaces/Properties/AssemblyInfo.cs → ...Interfaces/Properties/AssemblyInfo.cs.bak
View file
Open in desktop
File renamed without changes.
0 ...nTrader/NetFx/BeanTraderServer/App.config → ...der/NetFx/BeanTraderServer/App.config.bak
View file
Open in desktop
File renamed without changes.
5 changes: 3 additions & 2 deletions Samples/BeanTrader/NetFx/BeanTraderServer/BeanTrader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
using BeanTrader;
using BeanTrader;
using BeanTrader.Models;
using Serilog;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.ServiceModel;
using System.Text;
using System.Threading;
using CoreWCF;


namespace BeanTraderServer
{
Expand Down
44 changes: 17 additions & 27 deletions Samples/BeanTrader/NetFx/BeanTraderServer/BeanTraderServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<?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>
<ProjectGuid>{C7FE70DF-EF5A-4FED-91BE-9F6488C17135}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>BeanTraderServer</RootNamespace>
<AssemblyName>BeanTraderServer</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
Expand All @@ -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>
Expand All @@ -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>
67 changes: 28 additions & 39 deletions Samples/BeanTrader/NetFx/BeanTraderServer/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>();
}
}
0 ...anTraderServer/Properties/AssemblyInfo.cs → ...aderServer/Properties/AssemblyInfo.cs.bak
View file
Open in desktop
File renamed without changes.
24 changes: 24 additions & 0 deletions Samples/BeanTrader/NetFx/BeanTraderServer/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
}
}
}
Binary file added Samples/BeanTrader/NetFx/BeanTraderServer/corewcf_ported.config
View file
Open in desktop
Binary file not shown.
0 ...er/NetFx/BeanTraderServer/packages.config → ...etFx/BeanTraderServer/packages.config.bak
View file
Open in desktop
File renamed without changes.