Package only from the powershell folder at the root directory (#4569)

TravisEz13 · daxian-dbw · commit 0ca44f147d65 · 2017-08-15T16:17:45.000-07:00
diff --git a/build.psm1 b/build.psm1
@@ -723,7 +723,23 @@ function New-PSOptions {
         $Top = [IO.Path]::Combine($PSScriptRoot, "src", "System.Management.Automation")
     }
 
-    return @{ Top = $Top;
+    $RootInfo = @{RepoPath = $PSScriptRoot}
+
+    # the valid root is the root of the filesystem and the folder PowerShell
+    $RootInfo['ValidPath'] = Join-Path -Path ([system.io.path]::GetPathRoot($RootInfo.RepoPath)) -ChildPath 'PowerShell'
+    
+    if($RepoInfo.RepoPath -ne $RootInfo.ValidPath)
+    {
+        $RootInfo['Warning'] = "Please ensure you repo is at the root of the file system and named 'PowerShell' (example: '$($RootInfo.ValidPath)'), when building and packaging for release!"
+        $RootInfo['IsValid'] = $false
+    }
+    else 
+    {
+        $RootInfo['IsValid'] = $true
+    }
+
+    return @{ RootInfo = [PSCustomObject]$RootInfo
+              Top = $Top;
               Configuration = $Configuration;
               Framework = $Framework;
               Runtime = $Runtime;
diff --git a/tools/appveyor.psm1 b/tools/appveyor.psm1
@@ -448,7 +448,7 @@ function Invoke-AppveyorFinish
         }
 
         # Build packages
-        $packages = Start-PSPackage @packageParams
+        $packages = Start-PSPackage @packageParams -SkipReleaseChecks
 
         $name = Get-PackageName
 
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
@@ -29,7 +29,9 @@ function Start-PSPackage {
 
         [Switch] $Force,
 
-        [Switch] $IncludeSymbols
+        [Switch] $IncludeSymbols,
+        
+        [Switch] $SkipReleaseChecks
     )
 
     # Runtime and Configuration settings required by the package
@@ -81,6 +83,13 @@ function Start-PSPackage {
         throw "Please ensure you have run 'Start-PSBuild $params'!"
     }
 
+    if($SkipReleaseChecks.IsPresent) {
+        Write-Warning "Skipping release checks."
+    }
+    elseif(!$Script:Options.RootInfo.IsValid){
+        throw $Script:Options.RootInfo.Warning
+    }
+
     # If ReleaseTag is specified, use the given tag to calculate Vesrion
     if ($PSCmdlet.ParameterSetName -eq "ReleaseTag") {
         $Version = $ReleaseTag -Replace '^v'
diff --git a/tools/travis.ps1 b/tools/travis.ps1
@@ -179,8 +179,9 @@ else
             $packageParams += @{Version=$version}
         }
         # Only build packages for branches, not pull requests
-        $packages = @(Start-PSPackage @packageParams)
-        $packages += Start-PSPackage  @packageParams -Type AppImage
+        $packages = @(Start-PSPackage @packageParams -SkipReleaseChecks)
+        # Packaging AppImage depends on the deb package
+        $packages += Start-PSPackage  @packageParams -Type AppImage -SkipReleaseChecks
         foreach($package in $packages)
         {
             # Publish the packages to the nuget feed if:

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ function Invoke-AppveyorFinish`
`448`	`448`	`}`
`449`	`449`
`450`	`450`	`# Build packages`
`451`		`- $packages = Start-PSPackage @packageParams`
	`451`	`+ $packages = Start-PSPackage @packageParams -SkipReleaseChecks`
`452`	`452`
`453`	`453`	`$name = Get-PackageName`
`454`	`454`
Original file line number	Diff line number	Diff line change
`@@ -179,8 +179,9 @@ else`
`179`	`179`	`$packageParams += @{Version=$version}`
`180`	`180`	`}`
`181`	`181`	`# Only build packages for branches, not pull requests`
`182`		`- $packages = @(Start-PSPackage @packageParams)`
`183`		`- $packages += Start-PSPackage @packageParams -Type AppImage`
	`182`	`+ $packages = @(Start-PSPackage @packageParams -SkipReleaseChecks)`
	`183`	`+ # Packaging AppImage depends on the deb package`
	`184`	`+ $packages += Start-PSPackage @packageParams -Type AppImage -SkipReleaseChecks`
`184`	`185`	`foreach($package in $packages)`
`185`	`186`	`{`
`186`	`187`	`# Publish the packages to the nuget feed if:`