version bumped BuildTools to 0.0.6

justin-p · justin-p · commit dca36c8ccb72 · 2020-04-24T00:05:33.000+02:00
diff --git a/ModuleBuild.build.ps1 b/ModuleBuild.build.ps1
@@ -713,8 +713,11 @@ task PublishPSGallery LoadRequiredModules, InstallModule, {
     $ReleasePath = Join-Path $BuildRoot $Script:BuildEnv.BaseReleaseFolder
     $CurrentReleasePath = Join-Path $ReleasePath $Script:BuildEnv.ModuleToBuild
     if (Get-Module $Script:BuildEnv.ModuleToBuild) {
-        # If the module is already loaded then unload it.
-        Remove-Module $Script:BuildEnv.ModuleToBuild
+        Write-Description White "This module is already installed $($Script:BuildEnv.ModuleToBuild). Removing it" -Level 2
+        Write-Verbose "$($(Get-Module $Script:BuildEnv.ModuleToBuild).Path)"
+        Get-Module $Script:BuildEnv.ModuleToBuild | ForEach-Object {
+            Remove-Module $_.Name
+        }
     }
 
     # Try to import the current module
@@ -723,7 +726,7 @@ task PublishPSGallery LoadRequiredModules, InstallModule, {
         Import-Module -Name $CurrentModule
 
         Write-Description White "Uploading project to PSGallery: $($Script:BuildEnv.ModuleToBuild)"
-        Publish-MBTProjectToPSGallery -Name $Script:BuildEnv.ModuleToBuild -NuGetApiKey $Script:BuildEnv.NuGetApiKey
+        Publish-MBTProjectToPSGallery -Name $Script:BuildEnv.ModuleToBuild -NuGetApiKey $Script:BuildEnv.NuGetApiKey -RequiredVersion $Script:BuildEnv.ModuleVersion
     }
 
     else {
diff --git a/build/dependencies/PSDepend/build.depend.psd1 b/build/dependencies/PSDepend/build.depend.psd1
@@ -20,7 +20,7 @@
         source = 'PSGalleryModule'
     }
     ModuleBuildToolsTemp = @{
-        version = '0.0.5'
+        version = '0.0.6'
         source = 'PSGalleryModule'
     }
 }
diff --git a/build/reports/0.3.0/CodeHealthReport-Private.html b/build/reports/0.3.0/CodeHealthReport-Private.html
@@ -189,7 +189,7 @@ <h1>
                 <div class="col-sm-4 col-md-5 col-lg-4 right-header">
                     <h5>
                         Analyzed path :<span class="right-header-data"> src\private</span><br>
-                        Analysis date :<span class="right-header-data"> 2020-04-23 22:40:27Z</span>
+                        Analysis date :<span class="right-header-data"> 2020-04-24 00:04:28Z</span>
                     </h5>
                 </div>
             </div>
diff --git a/build/reports/0.3.0/CodeHealthReport-Public.html b/build/reports/0.3.0/CodeHealthReport-Public.html
@@ -189,7 +189,7 @@ <h1>
                 <div class="col-sm-4 col-md-5 col-lg-4 right-header">
                     <h5>
                         Analyzed path :<span class="right-header-data"> src\public</span><br>
-                        Analysis date :<span class="right-header-data"> 2020-04-23 22:38:22Z</span>
+                        Analysis date :<span class="right-header-data"> 2020-04-24 00:02:34Z</span>
                     </h5>
                 </div>
             </div>
diff --git a/plugins/plaster/template/plasterManifest.xml b/plugins/plaster/template/plasterManifest.xml
@@ -4,7 +4,7 @@
   templateType="Project" xmlns="http://www.microsoft.com/schemas/PowerShell/Plaster/v1">
   <metadata>
     <name>ModuleBuild</name>
-    <id>4ca85bfc-56af-4286-b37a-093a17f94041</id>
+    <id>8de8e22d-9408-4119-af99-fd1b056044a2</id>
     <version>0.0.1</version>
     <title>New ModuleBuild Project</title>
     <description>Create a new PowerShell Module with a ModuleBuild wrapper</description>
diff --git a/plugins/plaster/template/scaffold/build/dependencies/PSDepend/build.depend.psd1 b/plugins/plaster/template/scaffold/build/dependencies/PSDepend/build.depend.psd1
@@ -20,7 +20,7 @@
         source = 'PSGalleryModule'
     }
     ModuleBuildToolsTemp = @{
-        version = '0.0.5'
+        version = '0.0.6'
         source = 'PSGalleryModule'
     }
 }
diff --git a/plugins/plaster/template/scaffold/modulename.build.template b/plugins/plaster/template/scaffold/modulename.build.template
@@ -713,8 +713,11 @@ task PublishPSGallery LoadRequiredModules, InstallModule, {
     $ReleasePath = Join-Path $BuildRoot $Script:BuildEnv.BaseReleaseFolder
     $CurrentReleasePath = Join-Path $ReleasePath $Script:BuildEnv.ModuleToBuild
     if (Get-Module $Script:BuildEnv.ModuleToBuild) {
-        # If the module is already loaded then unload it.
-        Remove-Module $Script:BuildEnv.ModuleToBuild
+        Write-Description White "This module is already installed $($Script:BuildEnv.ModuleToBuild). Removing it" -Level 2
+        Write-Verbose "$($(Get-Module $Script:BuildEnv.ModuleToBuild).Path)"
+        Get-Module $Script:BuildEnv.ModuleToBuild | ForEach-Object {
+            Remove-Module $_.Name
+        }
     }
 
     # Try to import the current module
@@ -723,7 +726,7 @@ task PublishPSGallery LoadRequiredModules, InstallModule, {
         Import-Module -Name $CurrentModule
 
         Write-Description White "Uploading project to PSGallery: $($Script:BuildEnv.ModuleToBuild)"
-        Publish-MBTProjectToPSGallery -Name $Script:BuildEnv.ModuleToBuild -NuGetApiKey $Script:BuildEnv.NuGetApiKey
+        Publish-MBTProjectToPSGallery -Name $Script:BuildEnv.ModuleToBuild -NuGetApiKey $Script:BuildEnv.NuGetApiKey -RequiredVersion $Script:BuildEnv.ModuleVersion
     }
 
     else {
@@ -901,3 +904,4 @@ task AddMissingCBH Configure, CleanScratchDirectory, InsertCBHInPublicFunctions,
 task . Build
 #endregion
 
+
diff --git a/release/0.3.0/ModuleBuild.psd1 b/release/0.3.0/ModuleBuild.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Zachary Loeber
 #
-# Generated on: 4/23/2020
+# Generated on: 24/04/2020
 #
 
 @{
diff --git a/release/0.3.0/en-US/ModuleBuild_2b53a392-3b0f-4a7c-b934-7c995252070e_en-US_HelpContent.cab b/release/0.3.0/en-US/ModuleBuild_2b53a392-3b0f-4a7c-b934-7c995252070e_en-US_HelpContent.cab
diff --git a/release/0.3.0/en-US/ModuleBuild_2b53a392-3b0f-4a7c-b934-7c995252070e_en-US_HelpContent.zip b/release/0.3.0/en-US/ModuleBuild_2b53a392-3b0f-4a7c-b934-7c995252070e_en-US_HelpContent.zip
diff --git a/release/0.3.0/plugins/plaster/template/plasterManifest.xml b/release/0.3.0/plugins/plaster/template/plasterManifest.xml
@@ -4,7 +4,7 @@
   templateType="Project" xmlns="http://www.microsoft.com/schemas/PowerShell/Plaster/v1">
   <metadata>
     <name>ModuleBuild</name>
-    <id>4ca85bfc-56af-4286-b37a-093a17f94041</id>
+    <id>8de8e22d-9408-4119-af99-fd1b056044a2</id>
     <version>0.0.1</version>
     <title>New ModuleBuild Project</title>
     <description>Create a new PowerShell Module with a ModuleBuild wrapper</description>
diff --git a/release/0.3.0/plugins/plaster/template/scaffold/Build.template b/release/0.3.0/plugins/plaster/template/scaffold/Build.template
@@ -103,7 +103,7 @@ switch ($psCmdlet.ParameterSetName) {
         }
     }
      'UpdateRelease' {
-        if ($UpdateRelease -ne $null) {
+        if ($UpdateRelease) {
             try {
                 Invoke-Build -Task UpdateRelease -NewVersion $NewVersion -ReleaseNotes $ReleaseNotes
             }
@@ -156,4 +156,3 @@ switch ($psCmdlet.ParameterSetName) {
         }
     }
 }
-
diff --git a/release/0.3.0/plugins/plaster/template/scaffold/build/dependencies/PSDepend/build.depend.psd1 b/release/0.3.0/plugins/plaster/template/scaffold/build/dependencies/PSDepend/build.depend.psd1
@@ -20,7 +20,7 @@
         source = 'PSGalleryModule'
     }
     ModuleBuildToolsTemp = @{
-        version = '0.0.5'
+        version = '0.0.6'
         source = 'PSGalleryModule'
     }
 }
diff --git a/release/0.3.0/plugins/plaster/template/scaffold/modulename.build.template b/release/0.3.0/plugins/plaster/template/scaffold/modulename.build.template
@@ -713,8 +713,11 @@ task PublishPSGallery LoadRequiredModules, InstallModule, {
     $ReleasePath = Join-Path $BuildRoot $Script:BuildEnv.BaseReleaseFolder
     $CurrentReleasePath = Join-Path $ReleasePath $Script:BuildEnv.ModuleToBuild
     if (Get-Module $Script:BuildEnv.ModuleToBuild) {
-        # If the module is already loaded then unload it.
-        Remove-Module $Script:BuildEnv.ModuleToBuild
+        Write-Description White "This module is already installed $($Script:BuildEnv.ModuleToBuild). Removing it" -Level 2
+        Write-Verbose "$($(Get-Module $Script:BuildEnv.ModuleToBuild).Path)"
+        Get-Module $Script:BuildEnv.ModuleToBuild | ForEach-Object {
+            Remove-Module $_.Name
+        }
     }
 
     # Try to import the current module
@@ -723,7 +726,7 @@ task PublishPSGallery LoadRequiredModules, InstallModule, {
         Import-Module -Name $CurrentModule
 
         Write-Description White "Uploading project to PSGallery: $($Script:BuildEnv.ModuleToBuild)"
-        Publish-MBTProjectToPSGallery -Name $Script:BuildEnv.ModuleToBuild -NuGetApiKey $Script:BuildEnv.NuGetApiKey
+        Publish-MBTProjectToPSGallery -Name $Script:BuildEnv.ModuleToBuild -NuGetApiKey $Script:BuildEnv.NuGetApiKey -RequiredVersion $Script:BuildEnv.ModuleVersion
     }
 
     else {
@@ -901,3 +904,4 @@ task AddMissingCBH Configure, CleanScratchDirectory, InsertCBHInPublicFunctions,
 task . Build
 #endregion
 
+
diff --git a/release/ModuleBuild-current.zip b/release/ModuleBuild-current.zip
diff --git a/release/ModuleBuild/ModuleBuild.psd1 b/release/ModuleBuild/ModuleBuild.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Zachary Loeber
 #
-# Generated on: 4/23/2020
+# Generated on: 24/04/2020
 #
 
 @{
diff --git a/release/ModuleBuild/en-US/ModuleBuild_2b53a392-3b0f-4a7c-b934-7c995252070e_en-US_HelpContent.cab b/release/ModuleBuild/en-US/ModuleBuild_2b53a392-3b0f-4a7c-b934-7c995252070e_en-US_HelpContent.cab
diff --git a/release/ModuleBuild/en-US/ModuleBuild_2b53a392-3b0f-4a7c-b934-7c995252070e_en-US_HelpContent.zip b/release/ModuleBuild/en-US/ModuleBuild_2b53a392-3b0f-4a7c-b934-7c995252070e_en-US_HelpContent.zip
diff --git a/release/ModuleBuild/plugins/plaster/template/plasterManifest.xml b/release/ModuleBuild/plugins/plaster/template/plasterManifest.xml
@@ -4,7 +4,7 @@
   templateType="Project" xmlns="http://www.microsoft.com/schemas/PowerShell/Plaster/v1">
   <metadata>
     <name>ModuleBuild</name>
-    <id>4ca85bfc-56af-4286-b37a-093a17f94041</id>
+    <id>8de8e22d-9408-4119-af99-fd1b056044a2</id>
     <version>0.0.1</version>
     <title>New ModuleBuild Project</title>
     <description>Create a new PowerShell Module with a ModuleBuild wrapper</description>
diff --git a/release/ModuleBuild/plugins/plaster/template/scaffold/Build.template b/release/ModuleBuild/plugins/plaster/template/scaffold/Build.template
@@ -103,7 +103,7 @@ switch ($psCmdlet.ParameterSetName) {
         }
     }
      'UpdateRelease' {
-        if ($UpdateRelease -ne $null) {
+        if ($UpdateRelease) {
             try {
                 Invoke-Build -Task UpdateRelease -NewVersion $NewVersion -ReleaseNotes $ReleaseNotes
             }
@@ -156,4 +156,3 @@ switch ($psCmdlet.ParameterSetName) {
         }
     }
 }
-
diff --git a/release/ModuleBuild/plugins/plaster/template/scaffold/build/dependencies/PSDepend/build.depend.psd1 b/release/ModuleBuild/plugins/plaster/template/scaffold/build/dependencies/PSDepend/build.depend.psd1
@@ -20,7 +20,7 @@
         source = 'PSGalleryModule'
     }
     ModuleBuildToolsTemp = @{
-        version = '0.0.5'
+        version = '0.0.6'
         source = 'PSGalleryModule'
     }
 }
diff --git a/release/ModuleBuild/plugins/plaster/template/scaffold/modulename.build.template b/release/ModuleBuild/plugins/plaster/template/scaffold/modulename.build.template
@@ -713,8 +713,11 @@ task PublishPSGallery LoadRequiredModules, InstallModule, {
     $ReleasePath = Join-Path $BuildRoot $Script:BuildEnv.BaseReleaseFolder
     $CurrentReleasePath = Join-Path $ReleasePath $Script:BuildEnv.ModuleToBuild
     if (Get-Module $Script:BuildEnv.ModuleToBuild) {
-        # If the module is already loaded then unload it.
-        Remove-Module $Script:BuildEnv.ModuleToBuild
+        Write-Description White "This module is already installed $($Script:BuildEnv.ModuleToBuild). Removing it" -Level 2
+        Write-Verbose "$($(Get-Module $Script:BuildEnv.ModuleToBuild).Path)"
+        Get-Module $Script:BuildEnv.ModuleToBuild | ForEach-Object {
+            Remove-Module $_.Name
+        }
     }
 
     # Try to import the current module
@@ -723,7 +726,7 @@ task PublishPSGallery LoadRequiredModules, InstallModule, {
         Import-Module -Name $CurrentModule
 
         Write-Description White "Uploading project to PSGallery: $($Script:BuildEnv.ModuleToBuild)"
-        Publish-MBTProjectToPSGallery -Name $Script:BuildEnv.ModuleToBuild -NuGetApiKey $Script:BuildEnv.NuGetApiKey
+        Publish-MBTProjectToPSGallery -Name $Script:BuildEnv.ModuleToBuild -NuGetApiKey $Script:BuildEnv.NuGetApiKey -RequiredVersion $Script:BuildEnv.ModuleVersion
     }
 
     else {
@@ -901,3 +904,4 @@ task AddMissingCBH Configure, CleanScratchDirectory, InsertCBHInPublicFunctions,
 task . Build
 #endregion
 
+

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`source = 'PSGalleryModule'`
`21`	`21`	`}`
`22`	`22`	`ModuleBuildToolsTemp = @{`
`23`		`- version = '0.0.5'`
	`23`	`+ version = '0.0.6'`
`24`	`24`	`source = 'PSGalleryModule'`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`# Generated by: Zachary Loeber`
`5`	`5`	`#`
`6`		`-# Generated on: 4/23/2020`
	`6`	`+# Generated on: 24/04/2020`
`7`	`7`	`#`
`8`	`8`
`9`	`9`	`@{`