From 4bb4c8c80b1db6f023f312d7b0a11314b9fb8b2e Mon Sep 17 00:00:00 2001
From: Adrian Stevens <adrian.stevens@gmail.com>
Date: Tue, 30 Apr 2024 13:11:58 -0700
Subject: [PATCH] Release 1.11.0

---
 .github/workflows/develop-ci.yml              |  9 ++++---
 .../Maple.Server_UDP_Listener_Sample.csproj   | 26 +++++++++----------
 .../Web.Maple.Client/Web.Maple.Client.csproj  |  4 +--
 .../Web.Maple.Client_Sample.csproj            |  2 +-
 Source/Web.Maple.Server/MapleServer.cs        | 10 ++++---
 .../Web.Maple.Server/Web.Maple.Server.csproj  |  4 +--
 .../Web.Maple.Server_Sample.csproj            |  2 +-
 7 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/develop-ci.yml b/.github/workflows/develop-ci.yml
index 8264e1c..cb464ad 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:
@@ -41,12 +42,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
@@ -71,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
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 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Company>Wilderness Labs, Inc</Company>
-    <Authors>Wilderness Labs, Inc</Authors>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <LangVersion>10.0</LangVersion>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-</Project>
+    <PropertyGroup>
+        <Company>Wilderness Labs, Inc</Company>
+        <Authors>Wilderness Labs, Inc</Authors>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+        <LangVersion>10.0</LangVersion>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Web.Maple.Client/Web.Maple.Client.csproj b/Source/Web.Maple.Client/Web.Maple.Client.csproj
index 457b76c..697753b 100644
--- a/Source/Web.Maple.Client/Web.Maple.Client.csproj
+++ b/Source/Web.Maple.Client/Web.Maple.Client.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>1.8.0</Version>
+    <Version>1.11.0</Version>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Authors>Wilderness Labs, Inc</Authors>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Maple.Client</AssemblyName>
     <Company>Wilderness Labs, Inc</Company>
     <PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.Foundation/</PackageProjectUrl>
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 @@
     <Authors>Wilderness Labs, Inc</Authors>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Web.Maple.Client\Web.Maple.Client.csproj" />
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}");
         }
 
         /// <summary>
@@ -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
             {
diff --git a/Source/Web.Maple.Server/Web.Maple.Server.csproj b/Source/Web.Maple.Server/Web.Maple.Server.csproj
index 82b3855..1675f0e 100644
--- a/Source/Web.Maple.Server/Web.Maple.Server.csproj
+++ b/Source/Web.Maple.Server/Web.Maple.Server.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Meadow.Sdk/1.1.0">
   <PropertyGroup>
-    <Version>1.8.0</Version>
+    <Version>1.11.0</Version>
     <Authors>Wilderness Labs, Inc</Authors>
     <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Library</OutputType>
@@ -24,6 +24,6 @@
     <None Include="..\icon.png" Pack="true" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.Logging" Version="1.9.0" />
+    <PackageReference Include="Meadow.Logging" Version="1.11.0" />
   </ItemGroup>
 </Project>
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 @@
     <Authors>Wilderness Labs, Inc</Authors>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Web.Maple.Server\Web.Maple.Server.csproj" />