Skip to content

Fix release packaging build #6459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityapatwardhan merged 2 commits into from
Mar 22, 2018
Merged

Fix release packaging build #6459

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef22599
[Package] Fix release packaging build
adityapatwardhan Mar 22, 2018
c6c5126
Address code review comments
adityapatwardhan Mar 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 39 additions & 15 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,21 +525,7 @@ Fix steps:
}

# handle Restore
if ($Restore -or -not (Test-Path "$($Options.Top)/obj/project.assets.json")) {
$srcProjectDirs = @($Options.Top, "$PSScriptRoot/src/TypeCatalogGen", "$PSScriptRoot/src/ResGen", "$PSScriptRoot/src/Modules")

$RestoreArguments = @("--runtime",$Options.Runtime,"--verbosity")
if ($PSCmdlet.MyInvocation.BoundParameters["Verbose"].IsPresent) {
$RestoreArguments += "detailed"
} else {
$RestoreArguments += "quiet"
}

$srcProjectDirs | ForEach-Object {
Write-Log "Run dotnet restore $_ $RestoreArguments"
Start-NativeExecution { dotnet restore $_ $RestoreArguments }
}
}
Restore-PSPackage -Options $Options -Force:$Restore

# handle ResGen
# Heuristic to run ResGen on the fresh machine
Expand Down Expand Up @@ -645,6 +631,41 @@ Fix steps:
}
}

function Restore-PSPackage
{
param(
[ValidateNotNullOrEmpty()]
[Parameter()]
[string[]] $ProjectDirs,

[ValidateNotNullOrEmpty()]
[Parameter()]
$Options = (Get-PSOptions -DefaultToNew),

[switch] $Force
)

if (-not $ProjectDirs)
{
$ProjectDirs = @($Options.Top, "$PSScriptRoot/src/TypeCatalogGen", "$PSScriptRoot/src/ResGen", "$PSScriptRoot/src/Modules")
}

if ($Force -or (-not (Test-Path "$($Options.Top)/obj/project.assets.json"))) {

$RestoreArguments = @("--runtime",$Options.Runtime,"--verbosity")
if ($PSCmdlet.MyInvocation.BoundParameters["Verbose"].IsPresent) {
$RestoreArguments += "detailed"
} else {
$RestoreArguments += "quiet"
}

$ProjectDirs | ForEach-Object {
Write-Log "Run dotnet restore $_ $RestoreArguments"
Start-NativeExecution { dotnet restore $_ $RestoreArguments }
}
}
}

function Restore-PSModuleToBuild
{
param(
Expand Down Expand Up @@ -2325,6 +2346,9 @@ function Copy-PSGalleryModules
throw "Installing to an unexpected location"
}

Find-DotNet
Restore-PSPackage

$cache = dotnet nuget locals global-packages -l
if ($cache -match "info : global-packages: (.*)") {
$nugetCache = $matches[1]
Expand Down