Updated build scripts

justin-p · justin-p · commit 96b4ce10f448 · 2020-04-22T10:45:35.000+02:00
diff --git a/Build.ps1 b/Build.ps1
@@ -12,7 +12,9 @@ param (
     [parameter(Position = 5, ParameterSetName = 'Build')]
     [string]$ReleaseNotes,
     [parameter(Position = 6, ParameterSetName = 'CBH')]
-    [switch]$AddMissingCBH
+    [switch]$AddMissingCBH,
+    [parameter(Position = 7, ParameterSetName = 'Tests')]
+    [switch]$Test
 )
 
 function PrerequisitesLoaded {
@@ -69,6 +71,16 @@ switch ($psCmdlet.ParameterSetName) {
             }
         }
     }
+    'Tests' {
+        if ($test) {
+            try {
+                Invoke-Build -Task tests
+            }
+            catch {
+                throw
+            }
+        }
+    }
     'Build' {
         if ($NewVersion -ne $null) {
             try {
@@ -110,4 +122,4 @@ switch ($psCmdlet.ParameterSetName) {
             }
         }
     }
-}
+}
diff --git a/ModuleBuild.build.ps1 b/ModuleBuild.build.ps1
@@ -872,7 +872,7 @@ task BuildSessionCleanup CleanScratchDirectory, {
 
 #region Main tasks
 # Synopsis: Run all tests
-task Tests RunMetaTests, RunUnitTests, RunIntergrationTests {
+task Tests RunMetaTests, RunUnitTests, RunIntergrationTests, {
 
 }
 # Synopsis: Build the module
@@ -897,4 +897,4 @@ task AddMissingCBH Configure, CleanScratchDirectory, InsertCBHInPublicFunctions,
 
 # Synopsis: Default task when running Invoke-Build
 task . Tests, Build
-#endregion
+#endregion
diff --git a/plugins/plaster/template/scaffold/Build.template b/plugins/plaster/template/scaffold/Build.template
@@ -12,7 +12,9 @@ param (
     [parameter(Position = 5, ParameterSetName = 'Build')]
     [string]$ReleaseNotes,
     [parameter(Position = 6, ParameterSetName = 'CBH')]
-    [switch]$AddMissingCBH
+    [switch]$AddMissingCBH,
+    [parameter(Position = 7, ParameterSetName = 'Tests')]
+    [switch]$Test
 )
 
 function PrerequisitesLoaded {
@@ -69,6 +71,16 @@ switch ($psCmdlet.ParameterSetName) {
             }
         }
     }
+    'Tests' {
+        if ($test) {
+            try {
+                Invoke-Build -Task tests
+            }
+            catch {
+                throw
+            }
+        }
+    }
     'Build' {
         if ($NewVersion -ne $null) {
             try {
@@ -110,4 +122,4 @@ switch ($psCmdlet.ParameterSetName) {
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,9 @@ param (`
`12`	`12`	`[parameter(Position = 5, ParameterSetName = 'Build')]`
`13`	`13`	`[string]$ReleaseNotes,`
`14`	`14`	`[parameter(Position = 6, ParameterSetName = 'CBH')]`
`15`		`- [switch]$AddMissingCBH`
	`15`	`+ [switch]$AddMissingCBH,`
	`16`	`+ [parameter(Position = 7, ParameterSetName = 'Tests')]`
	`17`	`+ [switch]$Test`
`16`	`18`	`)`
`17`	`19`
`18`	`20`	`function PrerequisitesLoaded {`
`@@ -69,6 +71,16 @@ switch ($psCmdlet.ParameterSetName) {`
`69`	`71`	`}`
`70`	`72`	`}`
`71`	`73`	`}`
	`74`	`+ 'Tests' {`
	`75`	`+ if ($test) {`
	`76`	`+ try {`
	`77`	`+ Invoke-Build -Task tests`
	`78`	`+ }`
	`79`	`+ catch {`
	`80`	`+ throw`
	`81`	`+ }`
	`82`	`+ }`
	`83`	`+ }`
`72`	`84`	`'Build' {`
`73`	`85`	`if ($NewVersion -ne $null) {`
`74`	`86`	`try {`
`@@ -110,4 +122,4 @@ switch ($psCmdlet.ParameterSetName) {`
`110`	`122`	`}`
`111`	`123`	`}`
`112`	`124`	`}`
`113`		`-}`
	`125`	`+}`