From 62b3f9c2986e089d053f92f930f402ea88480c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selman=20G=C3=BClmez?= <selman.gulmez@guralporselen.com.tr>
Date: Fri, 28 Apr 2023 12:08:43 +0300
Subject: [PATCH] Cake.Core upgraded to 3.0.0.

---
 .gitignore                                 |  1 +
 Source/Cake.Discord/Cake.Discord.csproj    |  5 +-
 Source/Cake.Discord/Chat/DiscordChatApi.cs | 76 +++++++++++-----------
 3 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/.gitignore b/.gitignore
index a5a612a..17613c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -346,3 +346,4 @@ Source/Cake.Discord/tools/**
 BuildArtifacts/*
 
 .DS_Store
+/Source/.cr/personal/FavoritesList
diff --git a/Source/Cake.Discord/Cake.Discord.csproj b/Source/Cake.Discord/Cake.Discord.csproj
index de9c9cb..b01756a 100644
--- a/Source/Cake.Discord/Cake.Discord.csproj
+++ b/Source/Cake.Discord/Cake.Discord.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
@@ -15,8 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.33.0" PrivateAssets="All" />
-    <PackageReference Include="Cake.Common" Version="0.33.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
diff --git a/Source/Cake.Discord/Chat/DiscordChatApi.cs b/Source/Cake.Discord/Chat/DiscordChatApi.cs
index dc8fe93..d931026 100644
--- a/Source/Cake.Discord/Chat/DiscordChatApi.cs
+++ b/Source/Cake.Discord/Chat/DiscordChatApi.cs
@@ -51,47 +51,45 @@ internal static async Task<DiscordChatMessageResult> PostMessage(
 
       context.Debug("Parameter: {0}", json);
 
-      using (var client = new HttpClient())
-      {
-        var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
-
-        var httpResponse = await client.PostAsync(webHookUrl, stringContent);
-        context.Debug($"Status Code: {httpResponse.StatusCode}");
-
-        DiscordChatMessageResult parsedResult = null;
-        if(httpResponse.StatusCode != System.Net.HttpStatusCode.NoContent)
-        {
-          var response = await httpResponse.Content.ReadAsStringAsync();
-          context.Debug($"Response: {response}");
-
-          var result = JsonMapper.ToObject(response);
-
-          parsedResult = new DiscordChatMessageResult(
-            false,
-            DateTime.UtcNow.ToString(),
-            result.GetInteger("code").Value,
-            result.GetString("message"));
-        }
-        else
-        {
-          parsedResult = new DiscordChatMessageResult(
-            true,
-            DateTime.UtcNow.ToString(),
-            0,
-            string.Empty);
+            using var client = new HttpClient();
+            var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
+
+            var httpResponse = await client.PostAsync(webHookUrl, stringContent);
+            context.Debug($"Status Code: {httpResponse.StatusCode}");
+
+            DiscordChatMessageResult parsedResult = null;
+            if (httpResponse.StatusCode != System.Net.HttpStatusCode.NoContent)
+            {
+                var response = await httpResponse.Content.ReadAsStringAsync();
+                context.Debug($"Response: {response}");
+
+                var result = JsonMapper.ToObject(response);
+
+                parsedResult = new DiscordChatMessageResult(
+                  false,
+                  DateTime.UtcNow.ToString(),
+                  result.GetInteger("code").Value,
+                  result.GetString("message"));
+            }
+            else
+            {
+                parsedResult = new DiscordChatMessageResult(
+                  true,
+                  DateTime.UtcNow.ToString(),
+                  0,
+                  string.Empty);
+            }
+
+            context.Debug("Result parsed: {0}", parsedResult);
+
+            if (!parsedResult.Ok && messageSettings.ThrowOnFail == true)
+            {
+                throw new CakeException(parsedResult.Error ?? "Failed to send message, unknown error");
+            }
+
+            return parsedResult;
         }
 
-        context.Debug("Result parsed: {0}", parsedResult);
-
-        if (!parsedResult.Ok && messageSettings.ThrowOnFail == true)
-        {
-          throw new CakeException(parsedResult.Error ?? "Failed to send message, unknown error");
-        }
-
-        return parsedResult;
-      }
-    }
-
     private static int? GetInteger(this JsonData data, string key)
     {
       return (data != null && data.Keys.Contains(key))