From 1f528b9c5c8629490d3cc213769dfdc6810f9726 Mon Sep 17 00:00:00 2001
From: Peter Jarrett <peterj@broadcastradio.com>
Date: Thu, 19 Dec 2019 09:21:52 +0000
Subject: [PATCH 1/2] Migrated to PackageReference

---
 .../PushoverClient/PushoverClient.csproj      | 67 ++++++++++++++++
 .../0f58b976/PushoverClient}/packages.config  |  0
 .../a18c6d13/SendPush/SendPush.csproj         | 76 +++++++++++++++++++
 .../a18c6d13/SendPush}/packages.config        |  1 +
 PushoverClient/PushoverClient.csproj          |  7 +-
 SendPush/SendPush.csproj                      | 12 ++-
 6 files changed, 155 insertions(+), 8 deletions(-)
 create mode 100644 MigrationBackup/0f58b976/PushoverClient/PushoverClient.csproj
 rename {PushoverClient => MigrationBackup/0f58b976/PushoverClient}/packages.config (100%)
 create mode 100644 MigrationBackup/a18c6d13/SendPush/SendPush.csproj
 rename {SendPush => MigrationBackup/a18c6d13/SendPush}/packages.config (59%)

diff --git a/MigrationBackup/0f58b976/PushoverClient/PushoverClient.csproj b/MigrationBackup/0f58b976/PushoverClient/PushoverClient.csproj
new file mode 100644
index 0000000..0dd5200
--- /dev/null
+++ b/MigrationBackup/0f58b976/PushoverClient/PushoverClient.csproj
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{16E7D1FF-237A-4E89-94C6-FDDA36FBDDB0}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PushoverClient</RootNamespace>
+    <AssemblyName>PushoverClient</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="NotificationSound.cs" />
+    <Compile Include="Priority.cs" />
+    <Compile Include="Pushover.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="PushOverRequestArguments.cs" />
+    <Compile Include="PushResponse.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/PushoverClient/packages.config b/MigrationBackup/0f58b976/PushoverClient/packages.config
similarity index 100%
rename from PushoverClient/packages.config
rename to MigrationBackup/0f58b976/PushoverClient/packages.config
diff --git a/MigrationBackup/a18c6d13/SendPush/SendPush.csproj b/MigrationBackup/a18c6d13/SendPush/SendPush.csproj
new file mode 100644
index 0000000..15183fa
--- /dev/null
+++ b/MigrationBackup/a18c6d13/SendPush/SendPush.csproj
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{6DB8F6AB-5003-4E57-80D8-D8A626D525DD}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>SendPush</RootNamespace>
+    <AssemblyName>SendPush</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Extensions.CommandLineUtils, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\Packages\Microsoft.Extensions.CommandLineUtils.1.1.1\lib\net451\Microsoft.Extensions.CommandLineUtils.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Options.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PushoverClient\PushoverClient.csproj">
+      <Project>{16e7d1ff-237a-4e89-94c6-fdda36fbddb0}</Project>
+      <Name>PushoverClient</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/SendPush/packages.config b/MigrationBackup/a18c6d13/SendPush/packages.config
similarity index 59%
rename from SendPush/packages.config
rename to MigrationBackup/a18c6d13/SendPush/packages.config
index 0d9f591..c89bae1 100644
--- a/SendPush/packages.config
+++ b/MigrationBackup/a18c6d13/SendPush/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
+  <package id="Microsoft.Extensions.CommandLineUtils" version="1.1.1" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/PushoverClient/PushoverClient.csproj b/PushoverClient/PushoverClient.csproj
index 9574c56..cb72cc8 100644
--- a/PushoverClient/PushoverClient.csproj
+++ b/PushoverClient/PushoverClient.csproj
@@ -35,9 +35,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ServiceStack.Text, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
-      <HintPath>..\packages\ServiceStack.Text.5.0.2\lib\net45\ServiceStack.Text.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Serialization" />
@@ -56,7 +53,9 @@
     <Compile Include="PushResponse.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="ServiceStack.Text">
+      <Version>5.0.2</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
diff --git a/SendPush/SendPush.csproj b/SendPush/SendPush.csproj
index 15a0e54..c24c9a6 100644
--- a/SendPush/SendPush.csproj
+++ b/SendPush/SendPush.csproj
@@ -35,9 +35,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommandLine">
-      <HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -56,7 +53,6 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PushoverClient\PushoverClient.csproj">
@@ -64,6 +60,14 @@
       <Name>PushoverClient</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CommandLineParser">
+      <Version>1.9.71</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.CommandLineUtils">
+      <Version>1.1.1</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

From a3d5b79d437f08b0d4027ab1e258b91a5d97fbd0 Mon Sep 17 00:00:00 2001
From: Peter Jarrett <peterj@broadcastradio.com>
Date: Thu, 19 Dec 2019 10:04:56 +0000
Subject: [PATCH 2/2] Added MessageStyle Enum and optional Parameter to Push
 and PushAsync. Included 4 new UnitTests

---
 PushoverClient.Tests/ClientTests.cs        | 64 ++++++++++++++++++++++
 PushoverClient/MessageStyle.cs             | 13 +++++
 PushoverClient/PushOverRequestArguments.cs |  2 +
 PushoverClient/Pushover.cs                 | 23 ++++++--
 PushoverClient/PushoverClient.csproj       |  1 +
 5 files changed, 97 insertions(+), 6 deletions(-)
 create mode 100644 PushoverClient/MessageStyle.cs

diff --git a/PushoverClient.Tests/ClientTests.cs b/PushoverClient.Tests/ClientTests.cs
index 315fda2..779e769 100644
--- a/PushoverClient.Tests/ClientTests.cs
+++ b/PushoverClient.Tests/ClientTests.cs
@@ -106,5 +106,69 @@ public async Task PushWithSound_ReturnsSuccessful()
             Assert.IsNotNull(response);
             Assert.AreEqual(1, response.Status);
         }
+
+        [TestMethod]
+        public void PushHtmlWithValidParms_ReturnsSuccessful()
+        {
+            //  Arrange
+            var title = "Test title";
+            var message = "This is a <b>bold test</b> with <i>italic</i> push notification message";
+
+            //  Act
+            var pclient = new Pushover(TEST_APP_KEY);
+            var response = pclient.Push(title, message, TEST_USER_KEY, "", Priority.Normal, NotificationSound.Bike, MessageStyle.html);
+
+            //  Assert
+            Assert.IsNotNull(response);
+            Assert.AreEqual(1, response.Status);
+        }
+
+        [TestMethod]
+        public async Task PushHtmlAsyncWithValidParms_ReturnsSuccessful()
+        {
+            //  Arrange
+            var title = "Test title";
+            var message = "This is an async <b>bold test</b> with <i>italic</i> push notification message";
+
+            //  Act
+            var pclient = new Pushover(TEST_APP_KEY);
+            var response = await pclient.PushAsync(title, message, TEST_USER_KEY, "", Priority.Normal, NotificationSound.Bike, MessageStyle.html);
+
+            //  Assert
+            Assert.IsNotNull(response);
+            Assert.AreEqual(1, response.Status);
+        }
+
+        [TestMethod]
+        public void PushMonospaceWithValidParms_ReturnsSuccessful()
+        {
+            //  Arrange
+            var title = "Test title";
+            var message = "This is a monospace test push notification message";
+
+            //  Act
+            var pclient = new Pushover(TEST_APP_KEY);
+            var response = pclient.Push(title, message, TEST_USER_KEY, "", Priority.Normal, NotificationSound.Bike, MessageStyle.monospace);
+
+            //  Assert
+            Assert.IsNotNull(response);
+            Assert.AreEqual(1, response.Status);
+        }
+
+        [TestMethod]
+        public async Task PushMonospaceAsyncWithValidParms_ReturnsSuccessful()
+        {
+            //  Arrange
+            var title = "Test title";
+            var message = "This is an async monospace test push notification message";
+
+            //  Act
+            var pclient = new Pushover(TEST_APP_KEY);
+            var response = await pclient.PushAsync(title, message, TEST_USER_KEY, "", Priority.Normal, NotificationSound.Bike, MessageStyle.monospace);
+
+            //  Assert
+            Assert.IsNotNull(response);
+            Assert.AreEqual(1, response.Status);
+        }
     }
 }
diff --git a/PushoverClient/MessageStyle.cs b/PushoverClient/MessageStyle.cs
new file mode 100644
index 0000000..7611db5
--- /dev/null
+++ b/PushoverClient/MessageStyle.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+namespace PushoverClient
+{
+    //Detail at https://pushover.net/api#html
+    public enum MessageStyle
+    {
+        NotSet, //Default = will leave empty on sending
+        html,
+        monospace
+    }
+}
\ No newline at end of file
diff --git a/PushoverClient/PushOverRequestArguments.cs b/PushoverClient/PushOverRequestArguments.cs
index 25b6479..4a3b978 100644
--- a/PushoverClient/PushOverRequestArguments.cs
+++ b/PushoverClient/PushOverRequestArguments.cs
@@ -10,5 +10,7 @@ public class PushoverRequestArguments
         public string message { get; set; }
         public int priority { get; set; }
         public string sound { get; set; }
+        public string html { get; set; }
+        public string monospace { get; set; }
     }
 }
\ No newline at end of file
diff --git a/PushoverClient/Pushover.cs b/PushoverClient/Pushover.cs
index 29b6003..413ed69 100644
--- a/PushoverClient/Pushover.cs
+++ b/PushoverClient/Pushover.cs
@@ -1,5 +1,6 @@
 using ServiceStack;
 using System;
+using System.Globalization;
 using System.Net;
 using System.Threading.Tasks;
 
@@ -63,10 +64,11 @@ public Pushover(string appKey, string defaultSendKey) : this(appKey)
         /// <param name="device">Send to a specific device</param>
         /// <param name="priority">Priority of the message (optional) default value set to Normal</param>
         /// <param name="notificationSound">If set sends the notification sound</param>
+        /// <param name="messageStyle">Sets the message text style</param>
         /// <returns></returns>
-        public PushResponse Push(string title, string message, string userKey = "", string device = "", Priority priority = Priority.Normal, NotificationSound notificationSound = NotificationSound.NotSet)
+        public PushResponse Push(string title, string message, string userKey = "", string device = "", Priority priority = Priority.Normal, NotificationSound notificationSound = NotificationSound.NotSet, MessageStyle messageStyle = MessageStyle.NotSet)
         {
-            var args = CreateArgs(title, message, userKey, device, priority, notificationSound);
+            var args = CreateArgs(title, message, userKey, device, priority, notificationSound, messageStyle);
             try
             {
                 return BASE_API_URL.PostToUrl(args).FromJson<PushResponse>();
@@ -86,10 +88,11 @@ public PushResponse Push(string title, string message, string userKey = "", stri
         /// <param name="device">Send to a specific device</param>
         /// <param name="priority">Priority of the message (optional) default value set to Normal</param>
         /// <param name="notificationSound">If set sends the notification sound</param>
+        /// <param name="messageStyle">Sets the message text style</param>
         /// <returns></returns>
-        public async Task<PushResponse> PushAsync(string title, string message, string userKey = "", string device = "", Priority priority = Priority.Normal, NotificationSound notificationSound = NotificationSound.NotSet)
+        public async Task<PushResponse> PushAsync(string title, string message, string userKey = "", string device = "", Priority priority = Priority.Normal, NotificationSound notificationSound = NotificationSound.NotSet, MessageStyle messageStyle = MessageStyle.NotSet)
         {
-            var args = CreateArgs(title, message, userKey, device, priority, notificationSound);
+            var args = CreateArgs(title, message, userKey, device, priority, notificationSound, messageStyle);
             try
             {
                 return (await BASE_API_URL.PostToUrlAsync(args)).FromJson<PushResponse>();
@@ -101,8 +104,7 @@ public async Task<PushResponse> PushAsync(string title, string message, string u
         }
 
 
-
-        private object CreateArgs(string title, string message, string userKey, string device, Priority priority, NotificationSound notificationSound)
+        private object CreateArgs(string title, string message, string userKey, string device, Priority priority, NotificationSound notificationSound, MessageStyle messageStyle)
         {
             // Try the passed user key or fall back to default
             var userGroupKey = string.IsNullOrEmpty(userKey) ? DefaultUserGroupSendKey : userKey;
@@ -127,6 +129,15 @@ private object CreateArgs(string title, string message, string userKey, string d
                 args.sound = notificationSound.ToString().ToLower();
             }
 
+            if (messageStyle == MessageStyle.html)
+            {
+                args.html = "1";
+            }
+            if (messageStyle == MessageStyle.monospace)
+            {
+                args.monospace = "1";
+            }
+
             return args;
         }
 
diff --git a/PushoverClient/PushoverClient.csproj b/PushoverClient/PushoverClient.csproj
index cb72cc8..5869a3e 100644
--- a/PushoverClient/PushoverClient.csproj
+++ b/PushoverClient/PushoverClient.csproj
@@ -45,6 +45,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="MessageStyle.cs" />
     <Compile Include="NotificationSound.cs" />
     <Compile Include="Priority.cs" />
     <Compile Include="Pushover.cs" />