Merge branch 'master' of https://github.com/powershell/PSResourceGet into updateFindErrMsgs

Author: alerickson

doBuild.ps1

@@ -17,10 +17,14 @@ function DoBuild
     $BuildSrcPath = "bin/${BuildConfiguration}/${BuildFramework}/publish"
     Write-Verbose -Verbose -Message "Module build source path: '$BuildSrcPath'"
 
-    # Copy module script files
+    # Copy module .psd1 file
     Write-Verbose -Verbose "Copy-Item ${SrcPath}/${ModuleName}.psd1 to $BuildOutPath"
     Copy-Item -Path "${SrcPath}/${ModuleName}.psd1" -Dest "$BuildOutPath" -Force
 
+    # Copy module .psm1 file
+    Write-Verbose -Verbose "Copy-Item ${SrcPath}/${ModuleName}.psm1 to $BuildOutPath"
+    Copy-Item -Path "${SrcPath}/${ModuleName}.psm1" -Dest "$BuildOutPath" -Force
+
     #Copy module format ps1xml file
     Write-Verbose -Verbose -Message "Copy-Item ${SrcPath}/${FormatFileName}.ps1xml to $BuildOutPath"
     Copy-Item -Path "${SrcPath}/${FormatFileName}.ps1xml" -Dest "$BuildOutPath" -Force

src/code/PublishPSResource.cs

@@ -167,8 +167,8 @@ protected override void BeginProcessing()
                 ThrowTerminatingError(
                     new ErrorRecord(
                         new ArgumentException(
-                            "The path to the resource to publish is not in the correct format, point to a path or file of the module or script to publish."),
-                            "InvalidSourcePath",
+                            "The path to the resource to publish is not in the correct format or does not exist. Please provide the path of the root module (i.e. './<ModuleToPublish>/') or the path to the .psd1 (i.e. './<ModuleToPublish>/<ModuleToPublish>.psd1')."),
+                            "InvalidPublishPath",
                             ErrorCategory.InvalidArgument,
                             this));
             }
@@ -187,6 +187,15 @@ protected override void BeginProcessing()
                 pathToScriptFileToPublish = resolvedPath;
                 resourceType = ResourceType.Script;
             }
+            else {
+                ThrowTerminatingError(
+                    new ErrorRecord(
+                        new ArgumentException(
+                            $"The publish path provided, '{resolvedPath}', is not a valid. Please provide a path to the root module (i.e. './<ModuleToPublish>/') or path to the .psd1 (i.e. './<ModuleToPublish>/<ModuleToPublish>.psd1')."),
+                            "InvalidPublishPath",
+                            ErrorCategory.InvalidArgument,
+                            this));
+            }
 
             if (!String.IsNullOrEmpty(DestinationPath))
             {
@@ -578,7 +587,9 @@ private string CreateNuspec(
                         }
 
                         // defaults to false
-                        string requireLicenseAcceptance = psData.ContainsKey("requirelicenseacceptance") ? psData["requirelicenseacceptance"].ToString() : "false";
+                        // Value for requireAcceptLicense key needs to be a lowercase string representation of the boolean for it to be correctly parsed from psData file.
+
+                        string requireLicenseAcceptance = psData.ContainsKey("requirelicenseacceptance") ? psData["requirelicenseacceptance"].ToString().ToLower() : "false";
 
                         metadataElementsDictionary.Add("requireLicenseAcceptance", requireLicenseAcceptance);
 

test/PublishPSResourceTests/PublishPSResource.Tests.ps1

@@ -546,4 +546,12 @@ Describe "Test Publish-PSResource" -tags 'CI' {
 
         {Publish-PSResource -Path $incorrectdepmoduleversion -ErrorAction Stop} | Should -Throw -ErrorId "InvalidModuleManifest,Microsoft.PowerShell.PSResourceGet.Cmdlets.PublishPSResource"
     }
-}
+
+    It "Publish a module with using an invalid file path (path to .psm1), should throw" {
+        $fileName = "$script:PublishModuleName.psm1"
+        $psm1Path = Join-Path -Path $script:PublishModuleBase -ChildPath $fileName
+        $null = New-Item -Path $psm1Path -ItemType File -Force
+
+        {Publish-PSResource -Path $psm1Path -Repository $testRepository2 -ErrorAction Stop} | Should -Throw -ErrorId "InvalidPublishPath,Microsoft.PowerShell.PSResourceGet.Cmdlets.PublishPSResource"
+    }
+}