diff --git a/PushoverClient.Tests/App.config b/PushoverClient.Tests/App.config deleted file mode 100644 index 5c22b42..0000000 --- a/PushoverClient.Tests/App.config +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/PushoverClient.Tests/Properties/AssemblyInfo.cs b/PushoverClient.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index fb34eb5..0000000 --- a/PushoverClient.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PushoverClient.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Toshiba")] -[assembly: AssemblyProduct("PushoverClient.Tests")] -[assembly: AssemblyCopyright("Copyright © Toshiba 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("99b964bb-62eb-436e-9860-91df8148b2d0")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/PushoverClient.Tests/PushoverClient.Tests.csproj b/PushoverClient.Tests/PushoverClient.Tests.csproj index fa8a567..45837ab 100644 --- a/PushoverClient.Tests/PushoverClient.Tests.csproj +++ b/PushoverClient.Tests/PushoverClient.Tests.csproj @@ -1,95 +1,20 @@ - - + + - Debug - AnyCPU - {00C259B2-584F-4171-985C-A86498EACAAF} - Library - Properties - PushoverClient.Tests - PushoverClient.Tests - v4.7.2 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - + netcoreapp3.1 + + false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - - - - - - + - - {16e7d1ff-237a-4e89-94c6-fdda36fbddb0} - PushoverClient - + + + + + - + - - - - - False - - - False - - - False - - - False - - - - - - - - \ No newline at end of file + + diff --git a/PushoverClient/Properties/AssemblyInfo.cs b/PushoverClient/Properties/AssemblyInfo.cs deleted file mode 100644 index 65dc916..0000000 --- a/PushoverClient/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PushoverClient")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Toshiba")] -[assembly: AssemblyProduct("PushoverClient")] -[assembly: AssemblyCopyright("Copyright © Toshiba 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("cb658f72-4869-48cb-9ff2-fdccb3635b27")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.*")] diff --git a/PushoverClient/PushoverClient.csproj b/PushoverClient/PushoverClient.csproj index 9574c56..07eb792 100644 --- a/PushoverClient/PushoverClient.csproj +++ b/PushoverClient/PushoverClient.csproj @@ -1,70 +1,11 @@ - - - + + - Debug - AnyCPU - {16E7D1FF-237A-4E89-94C6-FDDA36FBDDB0} - Library - Properties - PushoverClient - PushoverClient - v4.7.2 - 512 - ..\ - true - + netstandard2.0 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\packages\ServiceStack.Text.5.0.2\lib\net45\ServiceStack.Text.dll - - - - - - - - - - - - - - - - - - + - + - - - - \ No newline at end of file + + diff --git a/PushoverClient/PushoverClient.nuspec b/PushoverClient/PushoverClient.nuspec deleted file mode 100644 index 27c0967..0000000 --- a/PushoverClient/PushoverClient.nuspec +++ /dev/null @@ -1,26 +0,0 @@ - - - - PushoverNET - $version$ - Pushover .NET - Dan Esparza - danesparza - https://github.com/danesparza/Pushover.NET - http://a4.mzstatic.com/us/r1000/049/Purple4/v4/cf/63/75/cf6375e7-7825-365a-ba8c-3587823d9c58/mzl.flrsoalq.175x175-75.jpg - false - .NET Wrapper for the Pushover API. - - See project site for latest release notes - Copyright 2013 - en-US - push notifications notification ios android pushover - - - - - - - - - \ No newline at end of file diff --git a/PushoverClient/packages.config b/PushoverClient/packages.config deleted file mode 100644 index 2254640..0000000 --- a/PushoverClient/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/PushoverNET.sln b/PushoverNET.sln index f2c8a40..c91a916 100644 --- a/PushoverNET.sln +++ b/PushoverNET.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushoverClient", "PushoverClient\PushoverClient.csproj", "{16E7D1FF-237A-4E89-94C6-FDDA36FBDDB0}" -EndProject +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30804.86 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{A5A31361-3EC5-4504-97BD-FD86E6792D90}" ProjectSection(SolutionItems) = preProject .nuget\NuGet.Config = .nuget\NuGet.Config @@ -10,9 +10,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{A5A313 .nuget\NuGet.targets = .nuget\NuGet.targets EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushoverClient.Tests", "PushoverClient.Tests\PushoverClient.Tests.csproj", "{00C259B2-584F-4171-985C-A86498EACAAF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushoverClient", "PushoverClient\PushoverClient.csproj", "{24D75C50-C440-46C6-8664-03874FDFB2C9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PushoverClient.Tests", "PushoverClient.Tests\PushoverClient.Tests.csproj", "{E316FFF5-0BC1-463B-8581-9784C1F61B6E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SendPush", "SendPush\SendPush.csproj", "{6DB8F6AB-5003-4E57-80D8-D8A626D525DD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SendPush", "SendPush\SendPush.csproj", "{D43F90E4-5CEB-42AF-A1C5-689261082DA4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -20,20 +22,23 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {16E7D1FF-237A-4E89-94C6-FDDA36FBDDB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16E7D1FF-237A-4E89-94C6-FDDA36FBDDB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16E7D1FF-237A-4E89-94C6-FDDA36FBDDB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16E7D1FF-237A-4E89-94C6-FDDA36FBDDB0}.Release|Any CPU.Build.0 = Release|Any CPU - {00C259B2-584F-4171-985C-A86498EACAAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00C259B2-584F-4171-985C-A86498EACAAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00C259B2-584F-4171-985C-A86498EACAAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00C259B2-584F-4171-985C-A86498EACAAF}.Release|Any CPU.Build.0 = Release|Any CPU - {6DB8F6AB-5003-4E57-80D8-D8A626D525DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6DB8F6AB-5003-4E57-80D8-D8A626D525DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DB8F6AB-5003-4E57-80D8-D8A626D525DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6DB8F6AB-5003-4E57-80D8-D8A626D525DD}.Release|Any CPU.Build.0 = Release|Any CPU + {24D75C50-C440-46C6-8664-03874FDFB2C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {24D75C50-C440-46C6-8664-03874FDFB2C9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {24D75C50-C440-46C6-8664-03874FDFB2C9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {24D75C50-C440-46C6-8664-03874FDFB2C9}.Release|Any CPU.Build.0 = Release|Any CPU + {E316FFF5-0BC1-463B-8581-9784C1F61B6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E316FFF5-0BC1-463B-8581-9784C1F61B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E316FFF5-0BC1-463B-8581-9784C1F61B6E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E316FFF5-0BC1-463B-8581-9784C1F61B6E}.Release|Any CPU.Build.0 = Release|Any CPU + {D43F90E4-5CEB-42AF-A1C5-689261082DA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D43F90E4-5CEB-42AF-A1C5-689261082DA4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D43F90E4-5CEB-42AF-A1C5-689261082DA4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D43F90E4-5CEB-42AF-A1C5-689261082DA4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {AC9C8E3D-9014-49B0-93AD-D4D5DAD948A5} + EndGlobalSection EndGlobal diff --git a/SendPush/App.config b/SendPush/App.config deleted file mode 100644 index 4308154..0000000 --- a/SendPush/App.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/SendPush/Program.cs b/SendPush/Program.cs index 2f7a64e..9767b1f 100644 --- a/SendPush/Program.cs +++ b/SendPush/Program.cs @@ -1,5 +1,5 @@ using System; -using System.Configuration; +using Afarazit.Settings; using PushoverClient; namespace SendPush @@ -9,27 +9,27 @@ class Program static void Main(string[] args) { // Get the settings defaults - string appKey = ConfigurationManager.AppSettings["appKey"]; - string userGroupKey = ConfigurationManager.AppSettings["userGroupKey"]; + string appKey = AppSettings.GetKey("appKey"); + string userGroupKey = AppSettings.GetKey("userGroupKey"); // Get the command line options Options options = new Options(); - if(CommandLine.Parser.Default.ParseArguments(args, options)) + if (CommandLine.Parser.Default.ParseArguments(args, options)) { // If we didn't get the app key passed in, use the default: - if(string.IsNullOrEmpty(options.From)) + if (string.IsNullOrEmpty(options.From)) { options.From = appKey; } // If we didn't get the user key passed in, use the default: - if(string.IsNullOrEmpty(options.User)) + if (string.IsNullOrEmpty(options.User)) { options.User = userGroupKey; } // Make sure we have our required items: - if(OptionsValid(options)) + if (OptionsValid(options)) { // Send the message Pushover pclient = new Pushover(options.From); @@ -45,7 +45,7 @@ static bool OptionsValid(Options options) { bool retval = false; - if(!string.IsNullOrEmpty(options.From) && + if (!string.IsNullOrEmpty(options.From) && !string.IsNullOrEmpty(options.User) && !string.IsNullOrEmpty(options.Title) && !string.IsNullOrEmpty(options.Message)) @@ -56,4 +56,4 @@ static bool OptionsValid(Options options) return retval; } } -} +} \ No newline at end of file diff --git a/SendPush/Properties/AssemblyInfo.cs b/SendPush/Properties/AssemblyInfo.cs deleted file mode 100644 index a4bc662..0000000 --- a/SendPush/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("SendPush")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("SendPush")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("63a135e1-a173-40f1-acfb-e1e92738ee66")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/SendPush/SendPush.csproj b/SendPush/SendPush.csproj index 15a0e54..091992b 100644 --- a/SendPush/SendPush.csproj +++ b/SendPush/SendPush.csproj @@ -1,76 +1,28 @@ - - - + + - Debug - AnyCPU - {6DB8F6AB-5003-4E57-80D8-D8A626D525DD} Exe - Properties - SendPush - SendPush - v4.7.2 - 512 - ..\ - true - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + netcoreapp3.1 + - - ..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll - - - - - - - - - + + - - - + + PreserveNewest + + - - Designer - - + + + + - - {16e7d1ff-237a-4e89-94c6-fdda36fbddb0} - PushoverClient - + - - - - \ No newline at end of file + + diff --git a/SendPush/appsettings.json b/SendPush/appsettings.json new file mode 100644 index 0000000..cfcb371 --- /dev/null +++ b/SendPush/appsettings.json @@ -0,0 +1,4 @@ +{ + "appKey": "", + "userGroupKey": "" +} \ No newline at end of file diff --git a/SendPush/packages.config b/SendPush/packages.config deleted file mode 100644 index 0d9f591..0000000 --- a/SendPush/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file