From 877e2dd4fc56deeca625300f1a0f89aef244c580 Mon Sep 17 00:00:00 2001
From: Jon Cederqvist <jon.cederqvist@effektor.se>
Date: Wed, 27 Nov 2024 21:58:42 +0100
Subject: [PATCH] NET and Standard support Renamed Framework project file from
 Net to NetF to be in line with current .NET naming conventions. Bumped
 Framework version from 4.5 to 4.8 Added project file for building against
 NET9 Added project file for netstandard2.1

Signed-off-by: Jon Cederqvist <jon.cederqvist@gmail.com>
---
 M2Mqtt.nuspec                                 |  4 +++-
 M2Mqtt.sln                                    | 14 ++++++++++-
 M2Mqtt/M2Mqtt.NET.csproj                      | 24 +++++++++++++++++++
 .../{M2Mqtt.Net.csproj => M2Mqtt.NetF.csproj} |  6 ++---
 M2Mqtt/M2Mqtt.netstd.csproj                   | 23 ++++++++++++++++++
 5 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 M2Mqtt/M2Mqtt.NET.csproj
 rename M2Mqtt/{M2Mqtt.Net.csproj => M2Mqtt.NetF.csproj} (96%)
 create mode 100644 M2Mqtt/M2Mqtt.netstd.csproj

diff --git a/M2Mqtt.nuspec b/M2Mqtt.nuspec
index 8a3a522e..1869cae1 100644
--- a/M2Mqtt.nuspec
+++ b/M2Mqtt.nuspec
@@ -17,7 +17,9 @@
         <tags>m2m mqtt queue messaging internetofthings iot cloud netmf embedded micro netduino micro-framework hardware winrt windows8 windows8.1 windowsphone windowsphone8.1 gadgeteer</tags>
     </metadata>
     <files>
-		<file src="bin\Release\M2Mqtt.Net\*.*" target="lib\net45" />
+        <file src="bin\Release\M2Mqtt.NetStd\*.*" target="lib\netstd21" />
+        <file src="bin\Release\M2Mqtt.NET\*.*" target="lib\net9" />
+		<file src="bin\Release\M2Mqtt.NetF\*.*" target="lib\net48" />
 		<file src="bin\Release\M2Mqtt.NetCf39\*.*" target="lib\net39-cf" />
 		<file src="bin\Release\M2Mqtt.NetMf42\*.*" target="lib\netmf42" />
 		<file src="bin\Release\M2Mqtt.NetMf42\le\*.p*" target="lib\netmf42\le" />
diff --git a/M2Mqtt.sln b/M2Mqtt.sln
index fc3baeaf..90e26edb 100644
--- a/M2Mqtt.sln
+++ b/M2Mqtt.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt.Net", "M2Mqtt\M2Mqtt.Net.csproj", "{A11AEF5A-B246-4FE8-8330-06DB73CC8074}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt.NetF", "M2Mqtt\M2Mqtt.NetF.csproj", "{A11AEF5A-B246-4FE8-8330-06DB73CC8074}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt.NetCf39", "M2Mqtt\M2Mqtt.NetCf39.csproj", "{BB9B7FF4-6502-41AF-8851-5060B67645E8}"
 EndProject
@@ -13,6 +13,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt.NetMf43", "M2Mqtt\M2
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt.WinRT", "M2Mqtt\M2Mqtt.WinRT.csproj", "{0238F0E3-A02B-428D-8A3F-410D8F15BB50}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt.netstd", "M2Mqtt\M2Mqtt.netstd.csproj", "{5D91050E-B8CD-4BC3-BC71-0903184D3DC8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt.NET", "M2Mqtt\M2Mqtt.NET.csproj", "{0AB95267-C0E4-4794-8A72-2A678078C28E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,6 +45,14 @@ Global
 		{0238F0E3-A02B-428D-8A3F-410D8F15BB50}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0238F0E3-A02B-428D-8A3F-410D8F15BB50}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0238F0E3-A02B-428D-8A3F-410D8F15BB50}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D91050E-B8CD-4BC3-BC71-0903184D3DC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D91050E-B8CD-4BC3-BC71-0903184D3DC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D91050E-B8CD-4BC3-BC71-0903184D3DC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D91050E-B8CD-4BC3-BC71-0903184D3DC8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0AB95267-C0E4-4794-8A72-2A678078C28E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AB95267-C0E4-4794-8A72-2A678078C28E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AB95267-C0E4-4794-8A72-2A678078C28E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0AB95267-C0E4-4794-8A72-2A678078C28E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/M2Mqtt/M2Mqtt.NET.csproj b/M2Mqtt/M2Mqtt.NET.csproj
new file mode 100644
index 00000000..09a2a940
--- /dev/null
+++ b/M2Mqtt/M2Mqtt.NET.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <defineConstants>TRACE;NET9;SSL</defineConstants>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>    
+  </PropertyGroup>
+
+  <ItemGroup>
+    
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="WinRT\**\*.cs" />
+  </ItemGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <OutputPath>..\bin\Debug\M2Mqtt.NET</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <OutputPath>..\bin\Release\M2Mqtt.NET</OutputPath>
+  </PropertyGroup>
+  
+</Project>
diff --git a/M2Mqtt/M2Mqtt.Net.csproj b/M2Mqtt/M2Mqtt.NetF.csproj
similarity index 96%
rename from M2Mqtt/M2Mqtt.Net.csproj
rename to M2Mqtt/M2Mqtt.NetF.csproj
index 58256a5e..6ffb8960 100644
--- a/M2Mqtt/M2Mqtt.Net.csproj
+++ b/M2Mqtt/M2Mqtt.NetF.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>uPLibrary.Networking.M2Mqtt</RootNamespace>
     <AssemblyName>M2Mqtt.Net</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -18,7 +18,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\M2Mqtt.Net</OutputPath>
+    <OutputPath>..\bin\Debug\M2Mqtt.NetF</OutputPath>
     <DefineConstants>TRACE;DEBUG;SSL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\M2Mqtt.Net</OutputPath>
+    <OutputPath>..\bin\Release\M2Mqtt.NetF</OutputPath>
     <DefineConstants>TRACE;SSL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/M2Mqtt/M2Mqtt.netstd.csproj b/M2Mqtt/M2Mqtt.netstd.csproj
new file mode 100644
index 00000000..da8d3dd5
--- /dev/null
+++ b/M2Mqtt/M2Mqtt.netstd.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <defineConstants>TRACE;STD21;SSL</defineConstants>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>    
+  </PropertyGroup>
+
+  <ItemGroup>
+    
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="WinRT\**\*.cs" />
+  </ItemGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <OutputPath>..\bin\Debug\M2Mqtt.NetStd</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <OutputPath>..\bin\Release\M2Mqtt.NetStd</OutputPath>
+  </PropertyGroup>
+</Project>