mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Finish Refactoring Test Scripts

Browse source 
remove publish todo

small fixes

small fixes

fix packaging test bug

Fix script bug

script changes

fix packaging test

NuGet task cancelled workaround

script fixes further

more script fixes, + workaround tweak

use build rather than compile in package command test
This commit is contained in:
Bryan Thornbury 2016-01-29 19:13:07 +00:00
parent 51eca0bcba
commit afacc2c0a6
15 changed files with 33 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

25
scripts/compile/compile-stage.ps1
View file

@ -7,12 +7,11 @@ param(
[Parameter(Mandatory=$true)][string]$Tfm,
[Parameter(Mandatory=$true)][string]$Rid,
[Parameter(Mandatory=$true)][string]$Configuration,
[Parameter(Mandatory=$true)][string]$OutputDir,
[Parameter(Mandatory=$true)][string]$StageOutputDir,
[Parameter(Mandatory=$true)][string]$RepoRoot,
[Parameter(Mandatory=$true)][string]$HostDir,
[Parameter(Mandatory=$true)][string]$CompilationOutputDir)
. $PSScriptRoot\..\common\_common.ps1
. $REPOROOT\scripts\package\projectsToPack.ps1
$Projects = loadBuildProjectList
@ -31,13 +30,13 @@ $FilesToClean = @(
"Microsoft.DotNet.Runtime.pdb"
)
$RuntimeOutputDir = "$OutputDir\runtime\coreclr"
$RuntimeOutputDir = "$StageOutputDir\runtime\coreclr"
# Publish each project
$Projects | ForEach-Object {
dotnet publish --native-subdirectory --framework "$Tfm" --runtime "$Rid" --output "$CompilationOutputDir\bin" --configuration "$Configuration" "$RepoRoot\src\$($_.ProjectName)"
dotnet publish --native-subdirectory --framework "$Tfm" --runtime "$Rid" --output "$StageOutputDir\bin" --configuration "$Configuration" "$RepoRoot\src\$($_.ProjectName)"
if (!$?) {
Write-Host Command failed: dotnet publish --native-subdirectory --framework "$Tfm" --runtime "$Rid" --output "$CompilationOutputDir\bin" --configuration "$Configuration" "$RepoRoot\src\$($_.ProjectName)"
Write-Host Command failed: dotnet publish --native-subdirectory --framework "$Tfm" --runtime "$Rid" --output "$StageOutputDir\bin" --configuration "$Configuration" "$RepoRoot\src\$($_.ProjectName)"
exit 1
}
}
@ -67,7 +66,7 @@ $FilesToClean | ForEach-Object {
}
# Copy the runtime app-local for the tools
cp -rec "$RuntimeOutputDir\*" "$OutputDir\bin" -ErrorVariable capturedErrors -ErrorAction SilentlyContinue
cp -rec "$RuntimeOutputDir\*" "$StageOutputDir\bin" -ErrorVariable capturedErrors -ErrorAction SilentlyContinue
$capturedErrors | foreach-object {
if ($_ -notmatch "already exists") {
write-error $_
@ -76,22 +75,22 @@ $capturedErrors | foreach-object {
}
# Deploy the CLR host to the output
cp "$HostDir\corehost.exe" "$OutputDir\bin"
cp "$HostDir\hostpolicy.dll" "$OutputDir\bin"
cp "$HostDir\corehost.exe" "$StageOutputDir\bin"
cp "$HostDir\hostpolicy.dll" "$StageOutputDir\bin"
# corehostify externally-provided binaries (csc, vbc, etc.)
$BinariesForCoreHost | ForEach-Object {
mv $OutputDir\bin\$_.exe $OutputDir\bin\$_.dll -Force
cp $OutputDir\bin\corehost.exe $OutputDir\bin\$_.exe -Force
mv $StageOutputDir\bin\$_.exe $StageOutputDir\bin\$_.dll -Force
cp $StageOutputDir\bin\corehost.exe $StageOutputDir\bin\$_.exe -Force
}
# Crossgen Roslyn
#if (-not (Test-Path "$OutputDir\bin\csc.ni.exe")) {
#if (-not (Test-Path "$StageOutputDir\bin\csc.ni.exe")) {
#header "Crossgening Roslyn compiler ..."
#_cmd "$RepoRoot\scripts\crossgen\crossgen_roslyn.cmd ""$OutputDir"""
#_cmd "$RepoRoot\scripts\crossgen\crossgen_roslyn.cmd ""$StageOutputDir"""
#}
# Copy in AppDeps
header "Acquiring Native App Dependencies"
_ "$RepoRoot\scripts\build\build_appdeps.ps1" @("$RepoRoot", "$OutputDir")
_ "$RepoRoot\scripts\build\build_appdeps.ps1" @("$RepoRoot", "$StageOutputDir")