Don't force unversioned output

Jaykul · Jaykul · commit 1075484e20cb · 2023-10-24T00:10:43.000-04:00
diff --git a/PSModuleBuild.Task.ps1 b/PSModuleBuild.Task.ps1
@@ -3,6 +3,6 @@ Add-BuildTask PSModuleBuild @{
     Inputs  = { Get-ChildItem -Path $PSModuleSourceRoot -Recurse -Filter *.ps* }
     Outputs = { Join-Path $OutputRoot $PSModuleName "$PSModuleName.psm1" } # don't take off the script block, need to resolve AFTER init
     Jobs    = "PSModuleRestore", {
-        Build-Module -SourcePath $PSModuleSourcePath -Destination $PSModuleOutputPath -UnversionedOutputDirectory -SemVer $script:GitVersion['NuGetVersionV2']
+        Build-Module -SourcePath $PSModuleSourcePath -Destination $PSModuleOutputPath -SemVer $script:GitVersion['NuGetVersionV2']
     }
 }
diff --git a/PSModulePublish.Task.ps1 b/PSModulePublish.Task.ps1
@@ -37,7 +37,6 @@ Add-BuildTask PSModulePublish {
         Write-Warning ("Skipping deployment: To deploy, ensure that...`n" +
         "`t* You are in a known build system (Current: $BuildSystem)`n" +
         "`t* You are committing to the main branch (Current: $BranchName) `n" +
-        "`t* The repository APIKey is defined in `$PSModulePublishKey (Current: $(![string]::IsNullOrWhiteSpace($PSModulePublishKey))) `n" +
-        "`t* This is not a pull request")
+        "`t* The repository APIKey is defined in `$PSModulePublishKey (Current: $(![string]::IsNullOrWhiteSpace($PSModulePublishKey)))")
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ Add-BuildTask PSModuleBuild @{`
`3`	`3`	`Inputs = { Get-ChildItem -Path $PSModuleSourceRoot -Recurse -Filter .ps }`
`4`	`4`	`Outputs = { Join-Path $OutputRoot $PSModuleName "$PSModuleName.psm1" } # don't take off the script block, need to resolve AFTER init`
`5`	`5`	`Jobs = "PSModuleRestore", {`
`6`		`- Build-Module -SourcePath $PSModuleSourcePath -Destination $PSModuleOutputPath -UnversionedOutputDirectory -SemVer $script:GitVersion['NuGetVersionV2']`
	`6`	`+ Build-Module -SourcePath $PSModuleSourcePath -Destination $PSModuleOutputPath -SemVer $script:GitVersion['NuGetVersionV2']`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ Add-BuildTask PSModulePublish {`
`37`	`37`	Write-Warning ("Skipping deployment: To deploy, ensure that...`n" +
`38`	`38`	"`t* You are in a known build system (Current: $BuildSystem)`n" +
`39`	`39`	"`t* You are committing to the main branch (Current: $BranchName) `n" +
`40`		- "`t* The repository APIKey is defined in `$PSModulePublishKey (Current: $(![string]::IsNullOrWhiteSpace($PSModulePublishKey))) `n" +
`41`		- "`t* This is not a pull request")
	`40`	+ "`t* The repository APIKey is defined in `$PSModulePublishKey (Current: $(![string]::IsNullOrWhiteSpace($PSModulePublishKey)))")
`42`	`41`	`}`
`43`	`42`	`}`