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

Refactoring test scripts

Browse source 
_nuget needs some RepoRoots

get the cats in line (d)

spaces

Fix Linux build breaks

add execution permissions

Pick up #999 Finish refactoring test scripts

remove auth

Reorder publishing to work!

fix rebase errors

fix more rebase errors

small fixes
This commit is contained in:
piotrp 2016-01-23 12:55:03 -08:00 • committed by Bryan Thornbury
parent 4e365921f7
commit 51eca0bcba
40 changed files with 443 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,30 +12,10 @@ param(
[Parameter(Mandatory=$true)][string]$HostDir,
[Parameter(Mandatory=$true)][string]$CompilationOutputDir)
. $PSScriptRoot\..\common\_common.ps1
. $REPOROOT\scripts\package\projectsToPack.ps1
$Projects = @(
"dotnet",
"dotnet-build",
"dotnet-compile",
"dotnet-compile-csc",
"dotnet-compile-fsc",
"dotnet-compile-native",
"dotnet-new",
"dotnet-pack",
"dotnet-projectmodel-server",
"dotnet-publish",
"dotnet-restore",
"dotnet-repl",
"dotnet-repl-csi",
"dotnet-resgen",
"dotnet-run",
"dotnet-test",
"Microsoft.DotNet.Cli.Utils",
"Microsoft.DotNet.ProjectModel.Loader",
"Microsoft.DotNet.ProjectModel.Workspaces",
"Microsoft.Extensions.Testing.Abstractions"
)
$Projects = loadBuildProjectList
$BinariesForCoreHost = @(
"csi"
@ -55,9 +35,9 @@ $RuntimeOutputDir = "$OutputDir\runtime\coreclr"
# Publish each project
$Projects | ForEach-Object {
dotnet publish --native-subdirectory --framework "$Tfm" --runtime "$Rid" --output "$OutputDir\bin" --configuration "$Configuration" "$RepoRoot\src\$_"
dotnet publish --native-subdirectory --framework "$Tfm" --runtime "$Rid" --output "$CompilationOutputDir\bin" --configuration "$Configuration" "$RepoRoot\src\$($_.ProjectName)"
if (!$?) {
Write-Host Command failed: dotnet publish --native-subdirectory --framework "$Tfm" --runtime "$Rid" --output "$OutputDir\bin" --configuration "$Configuration" "$RepoRoot\src\$_"
Write-Host Command failed: dotnet publish --native-subdirectory --framework "$Tfm" --runtime "$Rid" --output "$CompilationOutputDir\bin" --configuration "$Configuration" "$RepoRoot\src\$($_.ProjectName)"
exit 1
}
}

21
scripts/compile/compile-stage.sh
View file

@ -22,24 +22,7 @@ source "$DIR/../common/_common.sh"
[ ! -z "$OUTPUT_DIR" ] || die "Missing required environment variable OUTPUT_DIR"
[ ! -z "$HOST_DIR" ] || die "Missing required environment variable HOST_DIR"
PROJECTS=( \
dotnet \
dotnet-build \
dotnet-compile \
dotnet-compile-csc \
dotnet-compile-fsc \
dotnet-compile-native \
dotnet-new \
dotnet-pack \
dotnet-projectmodel-server \
dotnet-publish \
dotnet-repl \
dotnet-repl-csi \
dotnet-restore \
dotnet-resgen \
dotnet-run \
dotnet-test \
)
PROJECTS=$(loadBuildProjectList)
BINARIES_FOR_COREHOST=( \
csi \
@ -57,7 +40,7 @@ FILES_TO_CLEAN=( \
RUNTIME_OUTPUT_DIR="$OUTPUT_DIR/runtime/coreclr"
for project in ${PROJECTS[@]}
for project in $PROJECTS
do
echo dotnet publish --native-subdirectory --framework "$TFM" --output "$OUTPUT_DIR/bin" --configuration "$CONFIGURATION" "$REPOROOT/src/$project"
dotnet publish --native-subdirectory --framework "$TFM" --output "$OUTPUT_DIR/bin" --configuration "$CONFIGURATION" "$REPOROOT/src/$project"