Browse Source

Merge branch 'develop' into 'master'

merge for 1.0 release.

See merge request craig.oates/Console.Waterworks.Core!1
master
Craig Oates 5 years ago
parent
commit
daeecb64c9
  1. 2
      CW_Core_Console/CW_Core_Console.csproj
  2. 24
      CW_Core_Console/ConsoleCommands.cs
  3. 1
      CW_Core_Console/Program.cs
  4. 2
      CW_Core_Tests/CW_Core_Tests.csproj
  5. 19
      Console.Waterworks.Core/Console.Waterworks.Core.csproj
  6. 2
      README.md

2
CW_Core_Console/CW_Core_Console.csproj

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
<StartupObject>CW_Core_Console.Program</StartupObject> <StartupObject>CW_Core_Console.Program</StartupObject>
<Authors>Craig Oates</Authors> <Authors>Craig Oates</Authors>
<Company /> <Company />

24
CW_Core_Console/ConsoleCommands.cs

@ -8,12 +8,12 @@ namespace CW_Core_Console
{ {
#region Demo-Methods #region Demo-Methods
// These command-methods are to show how a Console.Waterworks program typically looks. // These command-methods are to show how a Console.Waterworks.Core program typically looks.
[ListCommand()] [ListCommand()]
[Description("Displays the Help section at run-time")] [Description("Displays the Help section at run-time")]
[Parameters("None")] [Parameters("None")]
[Usage("CW_Console> Help")] [Usage("CW_Core_Console> Help")]
public static string Help() public static string Help()
{ {
CW_Liaison liaison = new CW_Liaison(); CW_Liaison liaison = new CW_Liaison();
@ -23,31 +23,31 @@ namespace CW_Core_Console
[ListCommand()] [ListCommand()]
[Description("Outputs a message indicating this program is running okay.")] [Description("Outputs a message indicating this program is running okay.")]
[Parameters("None")] [Parameters("None")]
[Usage("CW_Console> Test")] [Usage("CW_Core_Console> Test")]
public static string Test() => "Test complete."; public static string Test() => "Test complete.";
[ListCommand()] [ListCommand()]
[Description("Repeats back to the user the string they entered.")] [Description("Repeats back to the user the string they entered.")]
[Parameters("<string> input")] [Parameters("<string> input")]
[Usage("CW_Console> Say \"Hello, World.\"")] [Usage("CW_Core_Console> Say \"Hello, World.\"")]
public static string Say(string input) => $"{input}"; public static string Say(string input) => $"{input}";
[ListCommand()] [ListCommand()]
[Description("Displays the date and time at the moment the command is entered")] [Description("Displays the date and time at the moment the command is entered")]
[Parameters("None")] [Parameters("None")]
[Usage("CW_Console> GetDate")] [Usage("CW_Core_Console> GetDate")]
public static string GetDate() => $"{DateTime.Now}"; public static string GetDate() => $"{DateTime.Now}";
[ListCommand()] [ListCommand()]
[Description("Takes the two ints and adds them together.")] [Description("Takes the two ints and adds them together.")]
[Parameters("<int> int, <int> int2")] [Parameters("<int> int, <int> int2")]
[Usage("CW_Console> Add 31 10")] [Usage("CW_Core_Console> Add 31 10")]
public static string Add(int int1, int int2) => $"{int1} + {int2} = {int1 + int2}"; public static string Add(int int1, int int2) => $"{int1} + {int2} = {int1 + int2}";
[ListCommand()] [ListCommand()]
[Description("Terminates the program.")] [Description("Terminates the program.")]
[Parameters("None")] [Parameters("None")]
[Usage("CW_Console> Quit")] [Usage("CW_Core_Console> Quit")]
public static void Quit() => Environment.Exit(-1); public static void Quit() => Environment.Exit(-1);
#endregion #endregion
@ -68,31 +68,31 @@ namespace CW_Core_Console
[ListCommand(false)] // change to true or delete "false" for it to show at run-time. [ListCommand(false)] // change to true or delete "false" for it to show at run-time.
[Description("Alias for \"Test\". See \"Test\" for details.")] [Description("Alias for \"Test\". See \"Test\" for details.")]
[Parameters("None")] [Parameters("None")]
[Usage("CW_Console> test")] [Usage("CW_Core_Console> test")]
public static string test() => Test(); public static string test() => Test();
[ListCommand(false)] [ListCommand(false)]
[Description("Alias for \"Say\". See \"Say\" for details.")] [Description("Alias for \"Say\". See \"Say\" for details.")]
[Parameters("None")] [Parameters("None")]
[Usage("CW_Console> say \"Hello, World.\"")] [Usage("CW_Core_Console> say \"Hello, World.\"")]
public static string say(string input) => Say(input); public static string say(string input) => Say(input);
[ListCommand(false)] [ListCommand(false)]
[Description("Alias for \"GetDate\". See \"GetDate\" for details.")] [Description("Alias for \"GetDate\". See \"GetDate\" for details.")]
[Parameters("None")] [Parameters("None")]
[Usage("CW_Console> date")] [Usage("CW_Core_Console> date")]
public static string date() => GetDate(); public static string date() => GetDate();
[ListCommand(false)] [ListCommand(false)]
[Description("Alias for \"Add\". See \"Add\" for details.")] [Description("Alias for \"Add\". See \"Add\" for details.")]
[Parameters("None")] [Parameters("None")]
[Usage("CW_Console> add 24 67")] [Usage("CW_Core_Console> add 24 67")]
public static string add(int int1, int int2) => Add(int1, int2); public static string add(int int1, int int2) => Add(int1, int2);
[ListCommand(false)] [ListCommand(false)]
[Description("Alias for Quit. See Quit for details.")] [Description("Alias for Quit. See Quit for details.")]
[Parameters("None")] [Parameters("None")]
[Usage("CW_Console> quit")] [Usage("CW_Core_Console> quit")]
public static void quit() => Quit(); public static void quit() => Quit();
#endregion #endregion

1
CW_Core_Console/Program.cs

@ -9,7 +9,6 @@ namespace CW_Core_Console
{ {
var liaison = new CW_Liaison(); var liaison = new CW_Liaison();
liaison.Run("CW_Core_Console", true); liaison.Run("CW_Core_Console", true);
} }
} }
} }

2
CW_Core_Tests/CW_Core_Tests.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>

19
Console.Waterworks.Core/Console.Waterworks.Core.csproj

@ -1,22 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
<NeutralLanguage>English (United Kingdom)</NeutralLanguage> <NeutralLanguage>English (United Kingdom)</NeutralLanguage>
<Copyright>Copyright © 2017 Craig Oates</Copyright> <Copyright>Copyright © 2017 Craig Oates</Copyright>
<PackageLicenseUrl>https://github.com/CraigOates/Console.Waterworks.Core/blob/master/LICENSE</PackageLicenseUrl> <PackageLicenseUrl></PackageLicenseUrl>
<PackageProjectUrl>http://craigsappshed.azurewebsites.net/Waterworks</PackageProjectUrl> <PackageProjectUrl>https://gitlab.com/craig.oates/Console.Waterworks.Core/raw/master/Documentation/GitHub_Assets/Sidebar-Logo.png</PackageProjectUrl>
<RepositoryUrl>https://github.com/CraigOates/Console.Waterworks.Core</RepositoryUrl> <RepositoryUrl>https://gitlab.com/craig.oates/Console.Waterworks.Core/raw/master/Documentation/GitHub_Assets/Sidebar-Logo.png</RepositoryUrl>
<PackageTags>Console, .Net Core, Craig Oates, Waterworks</PackageTags> <PackageTags>Console .Net Core Craig Oates Waterworks</PackageTags>
<Description>Console.Waterworks.Core is the .Net Core version of Console.Waterworks. Both projects are Nuget packages. And, their main purpose is to help you write extendable command-based console programs. If you want to write a console program using the full .Net Framework, use Console.Waterworks.</Description> <Description>Console.Waterworks.Core is the .Net Core version of Console.Waterworks. Both projects are Nuget packages. And, their main purpose is to help you write extendable command-based console programs. If you want to write a console program using the full .Net Framework, use Console.Waterworks.</Description>
<PackageIconUrl>https://github.com/CraigOates/Console.Waterworks.Core/raw/master/Documentation/GitHub_Assets/Sidebar-Logo.png</PackageIconUrl> <PackageIconUrl>https://gitlab.com/craig.oates/Console.Waterworks.Core/raw/master/Documentation/GitHub_Assets/Sidebar-Logo.png</PackageIconUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<AssemblyVersion>1.0.0.0</AssemblyVersion> <AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion> <FileVersion>1.0.0.0</FileVersion>
<Version>1.0.0-alpha</Version> <Version>1.0.0</Version>
<PackageReleaseNotes>This is the initial alpha release of Console.Waterworks.</PackageReleaseNotes> <PackageReleaseNotes>The 1.0 release of Console.Waterwork.Core.</PackageReleaseNotes>
<ApplicationIcon>Console.Waterworks.Core-Logo.ico</ApplicationIcon> <ApplicationIcon>Console.Waterworks.Core-Logo.ico</ApplicationIcon>
<Authors>Craig Oates</Authors>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
README.md

@ -1,7 +1,5 @@
# ![Logo](Documentation/GitHub_Assets/Page-Header.png "Header") # ![Logo](Documentation/GitHub_Assets/Page-Header.png "Header")
## Console.Waterworks.Core is not live on Nuget just yet. Please check back here for more details
## About Console.Waterworks.Core ## About Console.Waterworks.Core
Console.Waterworks.Core is the .Net Core version of Console.Waterworks. Both projects are Nuget packages. And, their main purpose is to help you write extendable command-based console programs. If you want to write a console program using the full .Net Framework, use Console.Waterworks. Console.Waterworks.Core is the .Net Core version of Console.Waterworks. Both projects are Nuget packages. And, their main purpose is to help you write extendable command-based console programs. If you want to write a console program using the full .Net Framework, use Console.Waterworks.

Loading…
Cancel
Save