Merge pull request #21 from FrApp42/dev/main

XML deserialization support & CI fixes

Author: sikelio

.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v4

Docs/docs/Awake.md

@@ -62,18 +62,9 @@ Awake.CompleteExit(0, false, "AppName");
 Updated version of Power Awake
 
 ```C#
-using FrApps42.System.Computer.Awake.v1;
+using FrApps42.System.Computer.Awake.v2;
 ...
 
-private static void LogUnexpectedOrCancelledKeepAwakeThreadCompletion(){
-    Console.WriteLine("The keep-awake thread was terminated early.");
-}
-
-private static void LogCompletedKeepAwakeThread(bool result)
-{
-    Console.WriteLine($"Exited keep-awake thread successfully: {result}");
-}
-
 // Keep Screen on
 Awake..SetIndefiniteKeepAwake(true);
 // Keep Screen off

README.md

@@ -13,7 +13,7 @@ This repos contains tool classes in C# for multiple types of usage.
   * WakeOnLan: Power on a device with it mac address.
 
 * `FrApp42.Web` - [Link](https://www.nuget.org/packages/FrApp42.Web)
-  * Request: Make API request for any of your C# projects. ⚠️ *SOAP requests are not supported.* ⚠️
+  * Request: Make API request for any of your C# projects.
 
 ## Authors
 * [AnthoDingo](https://github.com)

System/System.csproj

@@ -9,7 +9,7 @@
     <Title>FrApp42 System</Title>
     <Authors>FrenchyApps42, Sikelio, AnthoDingo</Authors>
     <Copyright>GPLv3</Copyright>
-    <PackageProjectUrl>https://github.com/FrApp42/Tools</PackageProjectUrl>
+    <PackageProjectUrl>https://frapp42.github.io/Tools/api.System/FrApp42.System.Computer.Awake.v1.html</PackageProjectUrl>
     <RepositoryUrl>https://github.com/FrApp42/Tools.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -22,7 +22,7 @@
     <PackageIcon>logo.png</PackageIcon>
     <Version>1.1.0</Version>
     <AssemblyVersion>1.1.0</AssemblyVersion>
-    <PackageReleaseNotes>Implement Awake from Microsoft Powertoys</PackageReleaseNotes>
+    <PackageReleaseNotes>Fix Awake v1 &amp; v2</PackageReleaseNotes>
     <FileVersion>1.1.0</FileVersion>
   </PropertyGroup>
 

Web/API/Request.cs

@@ -2,6 +2,7 @@
 using Newtonsoft.Json;
 using System.Net.Http.Headers;
 using System.Text;
+using System.Xml.Serialization;
 
 namespace FrApp42.Web.API
 {
@@ -392,8 +393,24 @@ private async Task<Result<T>> Process<T>(HttpRequestMessage request)
 
                 if (response.IsSuccessStatusCode)
                 {
-                    Stream ContentResponse = await response.Content?.ReadAsStreamAsync();
-                    result.Value = await System.Text.Json.JsonSerializer.DeserializeAsync<T>(ContentResponse);
+                    string MediaType = response.Content?.Headers?.ContentType?.MediaType.ToLower();
+                    string ContentResponse = await response.Content?.ReadAsStringAsync();
+
+                    switch (true)
+                    {
+                        case bool b when (MediaType.Contains("application/xml")):
+                            XmlSerializer xmlSerializer = new(typeof(T));
+                            StringReader reader = new(ContentResponse);
+
+                            result.Value = (T)xmlSerializer.Deserialize(reader);
+                            break;
+                        case bool b when (MediaType.Contains("application/json")):
+                            result.Value = JsonConvert.DeserializeObject<T>(ContentResponse);
+                            break;
+                        default:
+                            result.Value = default;
+                            break;
+                    }
                 }
                 else
                 {

Web/Web.csproj

@@ -9,7 +9,7 @@
     <Title>FrApp42 Web</Title>
     <Authors>FrenchyApps42, Sikelio, AnthoDingo</Authors>
     <Copyright>GPLv3</Copyright>
-    <PackageProjectUrl>https://github.com/FrApp42/Tools</PackageProjectUrl>
+    <PackageProjectUrl>https://frapp42.github.io/Tools/api.Web/FrApp42.Web.API.html</PackageProjectUrl>
     <RepositoryUrl>https://github.com/FrApp42/Tools.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
 	<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -20,7 +20,7 @@
 	<PackageReadmeFile>README.md</PackageReadmeFile>
 	<Company>FrenchyApps42</Company>
 	<PackageIcon>logo.png</PackageIcon>
-	<Version>1.1.0</Version>
+	<Version>1.2.0</Version>
   </PropertyGroup>
 
   <ItemGroup>