Skip to content

Commit

Permalink
Merge pull request #29 from WildernessLabs/v1.7.0
Browse files Browse the repository at this point in the history
Release 1.7.0
  • Loading branch information
jorgedevs authored Jan 10, 2024
2 parents a0ad5a5 + 87880f6 commit d155e56
Show file tree
Hide file tree
Showing 60 changed files with 91 additions and 89 deletions.
81 changes: 41 additions & 40 deletions Source/Maple.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,65 +3,66 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.4.33103.184
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web.Maple.MapleClient", "Web.Maple.MapleClient", "{67A01185-F6CC-496A-813C-E1E7C73AA7E2}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web.Maple.Client", "Web.Maple.Client", "{67A01185-F6CC-496A-813C-E1E7C73AA7E2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web.Maple.MapleServer", "Web.Maple.MapleServer", "{F836AD65-6FA9-487B-9DFA-F88E58C09A87}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web.Maple.Server", "Web.Maple.Server", "{F836AD65-6FA9-487B-9DFA-F88E58C09A87}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{FF9309D7-BA3D-4BC0-A487-3D20AA566838}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{27484BCD-7E08-4554-BDC5-8FF1331346C9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{A9F48762-387E-4D1D-A610-A147FEE8F709}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{6409E93C-888B-40D9-BFC3-A2AA8E9330B5}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{6409E93C-888B-40D9-BFC3-A2AA8E9330B5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D15389D9-AD11-4877-B130-9EDD0C5D2790}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{07308F3E-7D78-4E19-A98B-CC1EDB6E8644}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Maple.MapleClient", "Web.Maple.MapleClient\Driver\Web.Maple.MapleClient.csproj", "{D8D1DD36-685D-4B55-9D91-0B65D07FA04E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Maple.Client", "Web.Maple.Client\Web.Maple.Client.csproj", "{FFFBEE6E-D98E-479D-BFC6-7E94EB741BE8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapleClient_Sample", "Web.Maple.MapleClient\Sample\MapleClient_Sample\MapleClient_Sample.csproj", "{4BCEE20A-9B50-4071-878D-B964CD8523DB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Maple.Client_Sample", "Web.Maple.Client_Sample\Web.Maple.Client_Sample.csproj", "{445E8D2D-6CB5-4CAF-8E7A-6AA49227C4A0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Maple.MapleServer", "Web.Maple.MapleServer\Driver\Web.Maple.MapleServer.csproj", "{C9E324F7-9757-4F96-8079-52072A322805}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Maple.Server", "Web.Maple.Server\Web.Maple.Server.csproj", "{0F05393E-8C90-42A9-9EA5-7BBC88F17368}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerConsole_Sample", "Web.Maple.MapleServer\Samples\ServerConsole_Sample\ServerConsole_Sample.csproj", "{4D68707E-6AB5-4716-86B8-3A1AF3893562}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Maple.Server_Sample", "Web.Maple.Server_Sample\Web.Maple.Server_Sample.csproj", "{4FA6FFE8-AF53-4E01-B32E-0CB659A89775}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maple.Unit.Tests", "Web.Maple.MapleServer\Tests\Maple.Unit.Tests\Maple.Unit.Tests.csproj", "{3DB04B8A-7FF4-42A1-8140-29E6BAB70A44}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maple.Unit.Tests", "Tests\Maple.Unit.Tests.csproj", "{3C38E17C-EF69-4AD1-87CB-0B1001D660B1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maple.Server_UDP_Listener_Sample", "Web.Maple.MapleServer\Utilities\Maple.Server_UDP_Listener_Sample\Maple.Server_UDP_Listener_Sample.csproj", "{4212371D-B79B-4961-A868-BD8A95351449}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maple.Server_UDP_Listener_Sample", "Utilities\Maple.Server_UDP_Listener_Sample.csproj", "{24F4E20B-9625-48E9-8C8D-EEA5D8AB1C3B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D8D1DD36-685D-4B55-9D91-0B65D07FA04E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D8D1DD36-685D-4B55-9D91-0B65D07FA04E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D8D1DD36-685D-4B55-9D91-0B65D07FA04E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D8D1DD36-685D-4B55-9D91-0B65D07FA04E}.Release|Any CPU.Build.0 = Release|Any CPU
{4BCEE20A-9B50-4071-878D-B964CD8523DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4BCEE20A-9B50-4071-878D-B964CD8523DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4BCEE20A-9B50-4071-878D-B964CD8523DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4BCEE20A-9B50-4071-878D-B964CD8523DB}.Release|Any CPU.Build.0 = Release|Any CPU
{C9E324F7-9757-4F96-8079-52072A322805}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C9E324F7-9757-4F96-8079-52072A322805}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C9E324F7-9757-4F96-8079-52072A322805}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C9E324F7-9757-4F96-8079-52072A322805}.Release|Any CPU.Build.0 = Release|Any CPU
{C9E324F7-9757-4F96-8079-52072A322805}.Release|Any CPU.Deploy.0 = Release|Any CPU
{4D68707E-6AB5-4716-86B8-3A1AF3893562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4D68707E-6AB5-4716-86B8-3A1AF3893562}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4D68707E-6AB5-4716-86B8-3A1AF3893562}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4D68707E-6AB5-4716-86B8-3A1AF3893562}.Release|Any CPU.Build.0 = Release|Any CPU
{3DB04B8A-7FF4-42A1-8140-29E6BAB70A44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3DB04B8A-7FF4-42A1-8140-29E6BAB70A44}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3DB04B8A-7FF4-42A1-8140-29E6BAB70A44}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3DB04B8A-7FF4-42A1-8140-29E6BAB70A44}.Release|Any CPU.Build.0 = Release|Any CPU
{4212371D-B79B-4961-A868-BD8A95351449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4212371D-B79B-4961-A868-BD8A95351449}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4212371D-B79B-4961-A868-BD8A95351449}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4212371D-B79B-4961-A868-BD8A95351449}.Release|Any CPU.Build.0 = Release|Any CPU
{FFFBEE6E-D98E-479D-BFC6-7E94EB741BE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FFFBEE6E-D98E-479D-BFC6-7E94EB741BE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FFFBEE6E-D98E-479D-BFC6-7E94EB741BE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FFFBEE6E-D98E-479D-BFC6-7E94EB741BE8}.Release|Any CPU.Build.0 = Release|Any CPU
{445E8D2D-6CB5-4CAF-8E7A-6AA49227C4A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{445E8D2D-6CB5-4CAF-8E7A-6AA49227C4A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{445E8D2D-6CB5-4CAF-8E7A-6AA49227C4A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{445E8D2D-6CB5-4CAF-8E7A-6AA49227C4A0}.Release|Any CPU.Build.0 = Release|Any CPU
{0F05393E-8C90-42A9-9EA5-7BBC88F17368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0F05393E-8C90-42A9-9EA5-7BBC88F17368}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0F05393E-8C90-42A9-9EA5-7BBC88F17368}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{0F05393E-8C90-42A9-9EA5-7BBC88F17368}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0F05393E-8C90-42A9-9EA5-7BBC88F17368}.Release|Any CPU.Build.0 = Release|Any CPU
{0F05393E-8C90-42A9-9EA5-7BBC88F17368}.Release|Any CPU.Deploy.0 = Release|Any CPU
{4FA6FFE8-AF53-4E01-B32E-0CB659A89775}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4FA6FFE8-AF53-4E01-B32E-0CB659A89775}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4FA6FFE8-AF53-4E01-B32E-0CB659A89775}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4FA6FFE8-AF53-4E01-B32E-0CB659A89775}.Release|Any CPU.Build.0 = Release|Any CPU
{3C38E17C-EF69-4AD1-87CB-0B1001D660B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3C38E17C-EF69-4AD1-87CB-0B1001D660B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3C38E17C-EF69-4AD1-87CB-0B1001D660B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3C38E17C-EF69-4AD1-87CB-0B1001D660B1}.Release|Any CPU.Build.0 = Release|Any CPU
{24F4E20B-9625-48E9-8C8D-EEA5D8AB1C3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{24F4E20B-9625-48E9-8C8D-EEA5D8AB1C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{24F4E20B-9625-48E9-8C8D-EEA5D8AB1C3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{24F4E20B-9625-48E9-8C8D-EEA5D8AB1C3B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -73,12 +74,12 @@ Global
{6409E93C-888B-40D9-BFC3-A2AA8E9330B5} = {F836AD65-6FA9-487B-9DFA-F88E58C09A87}
{D15389D9-AD11-4877-B130-9EDD0C5D2790} = {F836AD65-6FA9-487B-9DFA-F88E58C09A87}
{07308F3E-7D78-4E19-A98B-CC1EDB6E8644} = {F836AD65-6FA9-487B-9DFA-F88E58C09A87}
{D8D1DD36-685D-4B55-9D91-0B65D07FA04E} = {FF9309D7-BA3D-4BC0-A487-3D20AA566838}
{4BCEE20A-9B50-4071-878D-B964CD8523DB} = {27484BCD-7E08-4554-BDC5-8FF1331346C9}
{C9E324F7-9757-4F96-8079-52072A322805} = {A9F48762-387E-4D1D-A610-A147FEE8F709}
{4D68707E-6AB5-4716-86B8-3A1AF3893562} = {6409E93C-888B-40D9-BFC3-A2AA8E9330B5}
{3DB04B8A-7FF4-42A1-8140-29E6BAB70A44} = {D15389D9-AD11-4877-B130-9EDD0C5D2790}
{4212371D-B79B-4961-A868-BD8A95351449} = {07308F3E-7D78-4E19-A98B-CC1EDB6E8644}
{FFFBEE6E-D98E-479D-BFC6-7E94EB741BE8} = {FF9309D7-BA3D-4BC0-A487-3D20AA566838}
{445E8D2D-6CB5-4CAF-8E7A-6AA49227C4A0} = {27484BCD-7E08-4554-BDC5-8FF1331346C9}
{0F05393E-8C90-42A9-9EA5-7BBC88F17368} = {A9F48762-387E-4D1D-A610-A147FEE8F709}
{4FA6FFE8-AF53-4E01-B32E-0CB659A89775} = {6409E93C-888B-40D9-BFC3-A2AA8E9330B5}
{3C38E17C-EF69-4AD1-87CB-0B1001D660B1} = {D15389D9-AD11-4877-B130-9EDD0C5D2790}
{24F4E20B-9625-48E9-8C8D-EEA5D8AB1C3B} = {07308F3E-7D78-4E19-A98B-CC1EDB6E8644}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9C2393A8-C0F2-499C-B803-F63A421A359F}
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Driver\Web.Maple.MapleServer.csproj" />
<ProjectReference Include="..\Web.Maple.Server\Web.Maple.Server.csproj" />
</ItemGroup>

</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<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>
<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>
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
using System.Net;
using System.Net.Sockets;
using System.Text;

namespace Maple.Server_UDP_Listener_Sample
{
class MainClass
{
const int MAPLE_SERVER_BROADCASTPORT = 17756;

static void Main(string[] args)
{
UdpClient udpClient = new UdpClient(MAPLE_SERVER_BROADCASTPORT);
IPEndPoint RemoteIpEndPoint = new IPEndPoint(IPAddress.Any, 0);

while (true)
{
Byte[] receiveBytes = udpClient.Receive(ref RemoteIpEndPoint);
string returnData = Encoding.ASCII.GetString(receiveBytes);
Console.WriteLine(returnData);
}

}
}
using System.Net;
using System.Net.Sockets;
using System.Text;

namespace Maple.Server_UDP_Listener_Sample
{
class MainClass
{
const int MAPLE_SERVER_BROADCASTPORT = 17756;

static void Main(string[] args)
{
UdpClient udpClient = new UdpClient(MAPLE_SERVER_BROADCASTPORT);
IPEndPoint RemoteIpEndPoint = new IPEndPoint(IPAddress.Any, 0);

while (true)
{
Byte[] receiveBytes = udpClient.Receive(ref RemoteIpEndPoint);
string returnData = Encoding.ASCII.GetString(receiveBytes);
Console.WriteLine(returnData);
}

}
}
}
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<PackageIcon>icon.png</PackageIcon>
<RepositoryUrl>https://github.com/WildernessLabs/Meadow.Foundation</RepositoryUrl>
<PackageTags>Meadow, Meadow.Foundation, Web, Maple</PackageTags>
<Version>0.3.0</Version>
<Version>1.7.0</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Description>Maple is an ultra-lightweight RESTful web API Server, built specifically for Meadow. It provides an easy to extend architecture, and has integrated JSON support via System.Text.Json.</Description>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\icon.png" Pack="true" PackagePath="" />
<None Include="..\icon.png" Pack="true" PackagePath="" />
</ItemGroup>
</Project>
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Driver\Web.Maple.MapleServer.csproj" />
<ProjectReference Include="..\Web.Maple.Client\Web.Maple.Client.csproj" />
</ItemGroup>
</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
<PackageIcon>icon.png</PackageIcon>
<RepositoryUrl>https://github.com/WildernessLabs/Meadow.Foundation</RepositoryUrl>
<PackageTags>Meadow, Meadow.Foundation, Web, Maple, MapleServer</PackageTags>
<Version>1.0.0</Version>
<Version>1.7.0</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Description>Maple is an ultra-lightweight RESTful web API Server, built specifically for embedded applications. It provides an easy-to-extend architecture based on ASP.NET Core and has integrated JSON support.</Description>
<Nullable>enable</Nullable>
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<LangVersion>10.0</LangVersion>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\icon.png" Pack="true" PackagePath="" />
<None Include="..\icon.png" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.Logging" Version="1.6.0" />
<PackageReference Include="Meadow.Logging" Version="1.7.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public static void Main(string[] args)
static IPAddress GetLocalIP()
{
IPAddress localIP;
using (Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, 0)) {
using (Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, 0))
{
socket.Connect("8.8.8.8", 65530);
IPEndPoint endPoint = socket.LocalEndPoint as IPEndPoint;
localIP = endPoint.Address;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Driver\Web.Maple.MapleClient.csproj" />
<ProjectReference Include="..\Web.Maple.Server\Web.Maple.Server.csproj" />
</ItemGroup>
</Project>

0 comments on commit d155e56

Please sign in to comment.