From 0abf337186a6f9f66f73aa67cb1c8db4578f89ba Mon Sep 17 00:00:00 2001 From: Daniel Valadas Date: Fri, 4 Oct 2019 02:48:14 -0400 Subject: [PATCH 1/4] Made the BuildAll task default + docs --- .github/BUILD.md | 17 ++++++++++++----- build.cake | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/BUILD.md b/.github/BUILD.md index 67b749babfc..f2697407ad9 100644 --- a/.github/BUILD.md +++ b/.github/BUILD.md @@ -12,20 +12,27 @@ Also, we currently maintain two branches, the development branch is the next maj To prevent issues with long paths in some build scripts, fork this repository in a short named folder on the root of any drive such as `c:\dnnsrc\` if you fork to a long path such as `c:\users\username\documents\dnn\source\` you may encounter long path issues. -If you need to build the next major release you simply need to open PowerShell and run the following command: +To build the whole project and create the install/upgrade packages simply open powershell and run: ``` -.\build.ps1 -Target BuildAll +.\build.ps1 ``` -But if you need to build from one of the release branches, then you also need to reference each branch you want to pull from those repositories as such (example for the 9.4.0 release, replace the branch names as needed): +The version you are building is the current version on the branch you are. However there are 2 external repositories that get bundled into Dnn build: +[Dnn.Connect CKEditor provider](https://github.com/DNN-Connect/CKEditorProvider) is the default html editor provider and it's default branch is development. +[Dnn.ClientDependency](https://github.com/dnnsoftware/ClientDependency), the default branch is dnn +Under normal situations they are the branches used for the next release, however if you have a need to specify a different branch to pull during the build you can specify them as such: ``` -.\build.ps1 -Target BuildAll -ScriptArgs '--CkBranch="development"','--CdfBranch="dnn"','--CpBranch="release/3.0.x"' +.\build.ps1-ScriptArgs '--CkBranch="branch-name"','--CdfBranch="branch-name"' ``` If you encounter any build issues, please re-run the build with more verbosity as such: ``` -.\build.ps1 -Target BuildAll -Verbosity diagnostic +.\build.ps1 -Verbosity diagnostic ``` This will log much more information about the problem and allow you to open an issue with those more detailed logs. +Also, the build scripts should leave you with 0 tracked modified files in git. If a build fails midway and you have tracked artificats, you can simply run: +`git reset --hard` and/or `git clean -dxf` in order to come back to a clean state. + + If you encounter PowerShell security issues, please read [Cake - PowerShell Security](https://cakebuild.net/docs/tutorials/powershell-security) \ No newline at end of file diff --git a/build.cake b/build.cake index 4379db0d9c2..fb61e3cb8fa 100644 --- a/build.cake +++ b/build.cake @@ -312,7 +312,7 @@ Task("Run-Unit-Tests") ////////////////////////////////////////////////////////////////////// Task("Default") - .IsDependentOn("Build"); + .IsDependentOn("BuildAll"); ////////////////////////////////////////////////////////////////////// // EXECUTION From 9dccef6e905e1b52f358518f26f614a9867c0c87 Mon Sep 17 00:00:00 2001 From: Daniel Valadas Date: Fri, 4 Oct 2019 02:54:10 -0400 Subject: [PATCH 2/4] Fixed a typo --- .github/BUILD.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/BUILD.md b/.github/BUILD.md index f2697407ad9..04fc6644aa1 100644 --- a/.github/BUILD.md +++ b/.github/BUILD.md @@ -31,7 +31,7 @@ If you encounter any build issues, please re-run the build with more verbosity a ``` This will log much more information about the problem and allow you to open an issue with those more detailed logs. -Also, the build scripts should leave you with 0 tracked modified files in git. If a build fails midway and you have tracked artificats, you can simply run: +Also, the build scripts should leave you with 0 tracked modified files in git. If a build fails midway and you have tracked artifacts, you can simply run: `git reset --hard` and/or `git clean -dxf` in order to come back to a clean state. From a3db9cd878b8cedd19053a794eccaf75c8b24d46 Mon Sep 17 00:00:00 2001 From: Daniel Valadas Date: Sat, 5 Oct 2019 02:36:51 -0400 Subject: [PATCH 3/4] Update .github/BUILD.md Co-Authored-By: Brian Dukes --- .github/BUILD.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/BUILD.md b/.github/BUILD.md index 04fc6644aa1..916f86fe4ec 100644 --- a/.github/BUILD.md +++ b/.github/BUILD.md @@ -18,7 +18,7 @@ To build the whole project and create the install/upgrade packages simply open p ``` The version you are building is the current version on the branch you are. However there are 2 external repositories that get bundled into Dnn build: -[Dnn.Connect CKEditor provider](https://github.com/DNN-Connect/CKEditorProvider) is the default html editor provider and it's default branch is development. +[Dnn.Connect CKEditor provider](https://github.com/DNN-Connect/CKEditorProvider) is the default HTML editor provider and its default branch is development. [Dnn.ClientDependency](https://github.com/dnnsoftware/ClientDependency), the default branch is dnn Under normal situations they are the branches used for the next release, however if you have a need to specify a different branch to pull during the build you can specify them as such: ``` @@ -35,4 +35,4 @@ Also, the build scripts should leave you with 0 tracked modified files in git. I `git reset --hard` and/or `git clean -dxf` in order to come back to a clean state. -If you encounter PowerShell security issues, please read [Cake - PowerShell Security](https://cakebuild.net/docs/tutorials/powershell-security) \ No newline at end of file +If you encounter PowerShell security issues, please read [Cake - PowerShell Security](https://cakebuild.net/docs/tutorials/powershell-security) From b848cad26b4f658a96cd0a128c0bcf5ef96a78de Mon Sep 17 00:00:00 2001 From: Daniel Valadas Date: Sat, 5 Oct 2019 02:37:02 -0400 Subject: [PATCH 4/4] Update .github/BUILD.md Co-Authored-By: Brian Dukes --- .github/BUILD.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/BUILD.md b/.github/BUILD.md index 916f86fe4ec..e093e3ae189 100644 --- a/.github/BUILD.md +++ b/.github/BUILD.md @@ -22,7 +22,7 @@ The version you are building is the current version on the branch you are. Howev [Dnn.ClientDependency](https://github.com/dnnsoftware/ClientDependency), the default branch is dnn Under normal situations they are the branches used for the next release, however if you have a need to specify a different branch to pull during the build you can specify them as such: ``` -.\build.ps1-ScriptArgs '--CkBranch="branch-name"','--CdfBranch="branch-name"' +.\build.ps1 -ScriptArgs '--CkBranch="branch-name"','--CdfBranch="branch-name"' ``` If you encounter any build issues, please re-run the build with more verbosity as such: