From 74a82046123df5a01d22f1e1b7bf22e71b123049 Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Mon, 22 Apr 2024 21:02:09 -0700 Subject: [PATCH 1/7] Cleaned up some outputs --- Source/Web.Maple.Server/MapleServer.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/Web.Maple.Server/MapleServer.cs b/Source/Web.Maple.Server/MapleServer.cs index f41c8d0..f2da05a 100644 --- a/Source/Web.Maple.Server/MapleServer.cs +++ b/Source/Web.Maple.Server/MapleServer.cs @@ -127,7 +127,7 @@ private void Create(IPAddress ipAddress, if (ni.Address.AddressFamily == AddressFamily.InterNetwork) { // for now, just use IPv4 - Console.WriteLine($"Listening on http://{ni.Address}:{port}/"); + Logger?.Trace($"Listening on http://{ni.Address}:{port}/"); // _httpListener.Prefixes.Add($"http://{ni.Address}:{port}/"); } @@ -137,7 +137,7 @@ private void Create(IPAddress ipAddress, } else { - Console.WriteLine($"Listening on http://{IPAddress}:{port}/"); + Logger?.Trace($"Listening on http://{IPAddress}:{port}/"); _httpListener.Prefixes.Add($"http://{IPAddress}:{port}/"); } @@ -180,6 +180,8 @@ public void Start() StartUdpAdvertisement(); } StartListeningToIncomingRequests(); + + Logger?.Info($"Maple started on IP Address: {IPAddress}"); } /// @@ -214,7 +216,7 @@ protected void StartUdpAdvertisement() while (Running && _shouldAdvertise) { - Logger?.Info("UDP Broadcast: " + broadcastData + ", port: " + MAPLE_SERVER_BROADCASTPORT); + Logger?.Trace("UDP Broadcast: " + broadcastData + ", port: " + MAPLE_SERVER_BROADCASTPORT); socket.SendTo(UTF8Encoding.UTF8.GetBytes(broadcastData), remoteEndPoint); Thread.Sleep(AdvertiseIntervalMs); @@ -262,7 +264,7 @@ protected void LoadRequestHandlers() if (typesAdded == 0) { - Console.WriteLine("Warning: No Maple Server `IRequestHandler`s found. Server will not operate."); + Logger?.Warn("Warning: No Maple Server `IRequestHandler`s found. Server will not operate."); } else { From d93d1b96c0dd8bad46eb550d96531c27edf56139 Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Thu, 25 Apr 2024 11:24:08 -0700 Subject: [PATCH 2/7] Bump .NET version so no need to install older versions --- .../Maple.Server_UDP_Listener_Sample.csproj | 26 +++++++++---------- .../Web.Maple.Client_Sample.csproj | 2 +- .../Web.Maple.Server_Sample.csproj | 2 +- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Source/Utilities/Maple.Server_UDP_Listener_Sample.csproj b/Source/Utilities/Maple.Server_UDP_Listener_Sample.csproj index 98f59bc..97002b0 100644 --- a/Source/Utilities/Maple.Server_UDP_Listener_Sample.csproj +++ b/Source/Utilities/Maple.Server_UDP_Listener_Sample.csproj @@ -1,15 +1,13 @@ - - - Wilderness Labs, Inc - Wilderness Labs, Inc - true - Apache-2.0 - 10.0 - Exe - net7.0 - enable - enable - - - + + Wilderness Labs, Inc + Wilderness Labs, Inc + true + Apache-2.0 + 10.0 + Exe + net8.0 + enable + enable + + \ No newline at end of file diff --git a/Source/Web.Maple.Client_Sample/Web.Maple.Client_Sample.csproj b/Source/Web.Maple.Client_Sample/Web.Maple.Client_Sample.csproj index 017ed1f..73fb4a7 100644 --- a/Source/Web.Maple.Client_Sample/Web.Maple.Client_Sample.csproj +++ b/Source/Web.Maple.Client_Sample/Web.Maple.Client_Sample.csproj @@ -5,7 +5,7 @@ Wilderness Labs, Inc true Exe - netcoreapp3.1 + net8.0 diff --git a/Source/Web.Maple.Server_Sample/Web.Maple.Server_Sample.csproj b/Source/Web.Maple.Server_Sample/Web.Maple.Server_Sample.csproj index 98897a9..477f1f5 100644 --- a/Source/Web.Maple.Server_Sample/Web.Maple.Server_Sample.csproj +++ b/Source/Web.Maple.Server_Sample/Web.Maple.Server_Sample.csproj @@ -5,7 +5,7 @@ Wilderness Labs, Inc true Exe - netcoreapp3.1 + net8.0 From c42346fd0773bf2441347f4c2d73f7d54c79fd4a Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Thu, 25 Apr 2024 11:29:39 -0700 Subject: [PATCH 3/7] Fix build script --- .github/workflows/develop-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/develop-ci.yml b/.github/workflows/develop-ci.yml index 8264e1c..e2b797b 100644 --- a/.github/workflows/develop-ci.yml +++ b/.github/workflows/develop-ci.yml @@ -41,12 +41,12 @@ jobs: path: Meadow.Modbus ref: develop - - name: Checkout MQTTnet fork + - name: Checkout MQTTnet uses: actions/checkout@v3 with: repository: WildernessLabs/MQTTnet path: MQTTnet - ref: meadow + ref: develop - name: Checkout Meadow.Core uses: actions/checkout@v3 From 606668027dd2452b660a00e63e476d2e07331d45 Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Thu, 25 Apr 2024 11:31:10 -0700 Subject: [PATCH 4/7] Bump .NET version so no need to install older versions --- Source/Web.Maple.Client/Web.Maple.Client.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Web.Maple.Client/Web.Maple.Client.csproj b/Source/Web.Maple.Client/Web.Maple.Client.csproj index 60c9a0e..19cbeb3 100644 --- a/Source/Web.Maple.Client/Web.Maple.Client.csproj +++ b/Source/Web.Maple.Client/Web.Maple.Client.csproj @@ -6,7 +6,7 @@ enable true Wilderness Labs, Inc - netstandard2.0 + net8.0 Maple.Client Wilderness Labs, Inc http://developer.wildernesslabs.co/Meadow/Meadow.Foundation/ From 15f6b7f07bdd7fc68a8903d213de26f7a165800a Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Thu, 25 Apr 2024 11:37:00 -0700 Subject: [PATCH 5/7] Fix build script --- .github/workflows/develop-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/develop-ci.yml b/.github/workflows/develop-ci.yml index e2b797b..49bdfd9 100644 --- a/.github/workflows/develop-ci.yml +++ b/.github/workflows/develop-ci.yml @@ -3,8 +3,9 @@ name: Develop Build on: workflow_dispatch: pull_request: + branches: [ develop ] push: - branches: [ develop ] + branches: [ develop ] jobs: build: From 6779fccbbd3826ad3bd29b037f022c7eba8b7272 Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Thu, 25 Apr 2024 11:58:58 -0700 Subject: [PATCH 6/7] Fix build script --- .github/workflows/develop-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/develop-ci.yml b/.github/workflows/develop-ci.yml index 49bdfd9..cb464ad 100644 --- a/.github/workflows/develop-ci.yml +++ b/.github/workflows/develop-ci.yml @@ -72,7 +72,7 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: - 7.0.x + 8.0.x - name: Build Maple run: dotnet build -c Release Maple/Source/Maple.sln From ed199f13f8e41d6a7974f7fc09cd40c8d78a98b5 Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Thu, 25 Apr 2024 12:41:40 -0700 Subject: [PATCH 7/7] Maple.Client => netstandard2.1 --- Source/Web.Maple.Client/Web.Maple.Client.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Web.Maple.Client/Web.Maple.Client.csproj b/Source/Web.Maple.Client/Web.Maple.Client.csproj index 19cbeb3..4810521 100644 --- a/Source/Web.Maple.Client/Web.Maple.Client.csproj +++ b/Source/Web.Maple.Client/Web.Maple.Client.csproj @@ -6,7 +6,7 @@ enable true Wilderness Labs, Inc - net8.0 + netstandard2.1 Maple.Client Wilderness Labs, Inc http://developer.wildernesslabs.co/Meadow/Meadow.Foundation/