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

Merge pull request #989 from livarcocc/pack

Browse source 
Building the projects that are going to be packaged separately
This commit is contained in:
Livar 2016-01-22 23:59:15 -08:00
commit 90cc24f95e
3 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packaging/nuget/package.ps1
View file

@ -14,22 +14,14 @@ if ($versionSuffix -ne "") {
} }
. "$PSScriptRoot\..\..\scripts\common\_common.ps1" . "$PSScriptRoot\..\..\scripts\common\_common.ps1"
. "$REPOROOT\scripts\package\projectsToPack.ps1"
$IntermediatePackagesDir = "$RepoRoot\artifacts\packages\intermediate" $IntermediatePackagesDir = "$RepoRoot\artifacts\packages\intermediate"
$PackagesDir = "$RepoRoot\artifacts\packages" $PackagesDir = "$RepoRoot\artifacts\packages"
New-Item -ItemType Directory -Force -Path $IntermediatePackagesDir New-Item -ItemType Directory -Force -Path $IntermediatePackagesDir
$Projects = @( foreach ($ProjectName in $ProjectsToPack) {
"Microsoft.DotNet.Cli.Utils",
"Microsoft.DotNet.ProjectModel",
"Microsoft.DotNet.ProjectModel.Loader",
"Microsoft.DotNet.ProjectModel.Workspaces",
"Microsoft.Extensions.DependencyModel",
"Microsoft.Extensions.Testing.Abstractions"
)
foreach ($ProjectName in $Projects) {
$ProjectFile = "$RepoRoot\src\$ProjectName\project.json" $ProjectFile = "$RepoRoot\src\$ProjectName\project.json"
& $toolsDir\dotnet pack "$ProjectFile" --basepath "$Stage2CompilationDir\bin" --output "$IntermediatePackagesDir" --configuration "$Configuration" $versionArg & $toolsDir\dotnet pack "$ProjectFile" --basepath "$Stage2CompilationDir\bin" --output "$IntermediatePackagesDir" --configuration "$Configuration" $versionArg

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

@ -12,6 +12,8 @@ param(
[Parameter(Mandatory=$true)][string]$HostDir, [Parameter(Mandatory=$true)][string]$HostDir,
[Parameter(Mandatory=$true)][string]$CompilationOutputDir) [Parameter(Mandatory=$true)][string]$CompilationOutputDir)
. $REPOROOT\scripts\package\projectsToPack.ps1
$Projects = @( $Projects = @(
"Microsoft.DotNet.Cli", "Microsoft.DotNet.Cli",
"Microsoft.DotNet.Cli.Utils", "Microsoft.DotNet.Cli.Utils",
@ -91,6 +93,15 @@ if (! (Test-Path $runtimeBinariesOutputDir)) {
cp $runtimeBinariesOutputDir\* $RuntimeOutputDir -force -recurse cp $runtimeBinariesOutputDir\* $RuntimeOutputDir -force -recurse
# Build the projects that we are going to ship as nuget packages
$ProjectsToPack | ForEach-Object {
dotnet build --output "$CompilationOutputDir\bin" --configuration "$Configuration" "$RepoRoot\src\$_"
if (!$?) {
Write-Host Command failed: dotnet build --native-subdirectory --output "$CompilationOutputDir\bin" --configuration "$Configuration" "$RepoRoot\src\$_"
exit 1
}
}
# Clean up bogus additional files # Clean up bogus additional files
$FilesToClean | ForEach-Object { $FilesToClean | ForEach-Object {
$path = Join-Path $RuntimeOutputDir $_ $path = Join-Path $RuntimeOutputDir $_

11
scripts/package/projectsToPack.ps1 Normal file
View file

@ -0,0 +1,11 @@
# Copyright (c) .NET Foundation and contributors. All rights reserved.
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
$ProjectsToPack = @(
"Microsoft.DotNet.Cli.Utils",
"Microsoft.DotNet.ProjectModel",
"Microsoft.DotNet.ProjectModel.Loader",
"Microsoft.DotNet.ProjectModel.Workspaces",
"Microsoft.Extensions.DependencyModel",
"Microsoft.Extensions.Testing.Abstractions"
)