From 7208f4dc8010e0ed27e881ac2757ed296082b5dc Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 23 May 2019 14:06:43 -0600 Subject: [PATCH] Updated Assembly version to 1.0.20. --- .../Pepperdash Core/Properties/AssemblyInfo.cs | 2 +- Readme.md | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Readme.md diff --git a/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs b/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs index 973cc52..f1b567a 100644 --- a/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs +++ b/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs @@ -4,4 +4,4 @@ [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Pepperdash_Core")] [assembly: AssemblyCopyright("Copyright © PepperDash 2019")] -[assembly: AssemblyVersion("1.0.17.*")] +[assembly: AssemblyVersion("1.0.20.*")] diff --git a/Readme.md b/Readme.md new file mode 100644 index 0000000..af824bf --- /dev/null +++ b/Readme.md @@ -0,0 +1,17 @@ +# Pepperdash Core + +#### Workflow process + +- Create a Jira issue for the feature/bugfix. If you know you're targeting this update to coincide with a new release of Core, specify that release (or create a new one) as the Fix Version for the Jira issue +- Branch from development using the syntax [feature/bugfix]/[pdc-x] (where x is the Jira issue number) +- Modify code to suit and test. Make commits to the branch as you work. +- Log a Pull Request on www.bitbucket.org and tag Heath and Neil as reviewers + +#### Pull Request process + +- Check out the branch for the PR and review. +- If necessary, merge the latest Development branch into the PR branch. Resolve any conflicts. +- Increment the appropriate Assembly version number to match the next release in Jira +- Build the project +- Copy PepperDash_Core.cpz and PepperDash_Core.dll from the bin folder to the CLZ Builds folder in the repo root. Commit. +- Merge the PR in Bitbucket