Merge pull request #57 from nils-a/release/2.0.0

Release/2.0.0

Source/Cake.Discord/Cake.Discord.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard2.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>

Source/Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <CakeVersion>1.0.0</CakeVersion>
+        <CakeVersion>2.0.0</CakeVersion>
     </PropertyGroup>
 </Project>

demo/dsl/.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "cake.tool": {
+      "version": "2.0.0",
+      "commands": [
+        "dotnet-cake"
+      ],
+      "rollForward": false
+    }
+  }
+}

demo/dsl/discord.cake

@@ -1,8 +1,11 @@
-#r "../../Source/Cake.Discord/bin/Debug/netstandard2.0/Cake.Discord.dll"
+#r "../../Source/Cake.Discord/bin/Debug/net6.0/Cake.Discord.dll"
 //#addin "nuget:https://www.nuget.org/api/v2?package=Cake.Discord"
 
 var url = Argument<string>("url", null);
 
+var cakeAssembly = typeof(ICakeContext).Assembly.GetName();
+var cakeName = $"{cakeAssembly.Name ?? "UNKNOWN"} v{cakeAssembly.Version?.ToString() ?? "??.??.??"}";
+
 if (string.IsNullOrEmpty(url))
 {
     Error("you need to pass a webhook url via `--url=...`");
@@ -15,7 +18,7 @@ try
 
     var postMessageResult = Discord.Chat.PostMessage(
         webHookUrl:url,
-        content:"This is a normal message."
+        content:$"This is a normal message from {cakeName}."
         );
 
     if (postMessageResult.Ok)
@@ -38,7 +41,7 @@ try
 
     var postMessageResult = Discord.Chat.PostMessage(
         webHookUrl:url,
-        content:"This is a TTS message.",
+        content:$"This is a TTS message from {cakeName}.",
         messageSettings:new DiscordChatMessageSettings { Tts = true }
         );
 
@@ -62,9 +65,9 @@ try
 
     var postMessageResult = Discord.Chat.PostMessage(
         webHookUrl:url,
-        content:"This is a custom avatar and name message.",
+        content:$"This is a custom avatar and name message from {cakeName}.",
         messageSettings:new DiscordChatMessageSettings {
-            UserName = "gep13",
+            UserName = cakeName,
             AvatarUrl = new Uri("https://avatars0.githubusercontent.com/u/1271146?s=400&v=4")
             }
         );
@@ -89,7 +92,7 @@ try
 
     var postMessageResult = Discord.Chat.PostMessage(
         webHookUrl:url,
-        content:"This _is_ a `message` with custom formatting from *CakeBuild* using incoming web hook:thumbsup:\r\n```Here is some code```"
+        content:$"This _is_ a `message` with custom formatting from *CakeBuild* using incoming web hook:thumbsup:\r\n```Here is some code``` from {cakeName}"
         );
 
     if (postMessageResult.Ok)
@@ -106,4 +109,5 @@ catch(Exception ex)
     Error("{0}", ex);
 }
 
+Information("Any key to continue.");
 Console.ReadLine();

demo/dsl/test.ps1

@@ -0,0 +1,11 @@
+Set-Location -LiteralPath $PSScriptRoot
+
+$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = '1'
+$env:DOTNET_CLI_TELEMETRY_OPTOUT = '1'
+$env:DOTNET_NOLOGO = '1'
+
+dotnet tool restore
+if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
+dotnet cake discord.cake @args
+if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }

demo/dsl/test.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -euox pipefail
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+export DOTNET_NOLOGO=1
+
+dotnet tool restore
+
+dotnet cake discord.cake "$@"