Introducing a separate script that initializes the projects that are going to be packaged, so that it can be shared between build and pack.
This commit is contained in:
parent
e3a8dacc8e
commit
91fcb62611
3 changed files with 15 additions and 20 deletions
|
@ -14,22 +14,14 @@ if ($versionSuffix -ne "") {
|
|||
}
|
||||
|
||||
. "$PSScriptRoot\..\..\scripts\common\_common.ps1"
|
||||
. "$REPOROOT\scripts\package\projectsToPack.ps1"
|
||||
|
||||
$IntermediatePackagesDir = "$RepoRoot\artifacts\packages\intermediate"
|
||||
$PackagesDir = "$RepoRoot\artifacts\packages"
|
||||
|
||||
New-Item -ItemType Directory -Force -Path $IntermediatePackagesDir
|
||||
|
||||
$Projects = @(
|
||||
"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) {
|
||||
foreach ($ProjectName in $ProjectsToPack) {
|
||||
$ProjectFile = "$RepoRoot\src\$ProjectName\project.json"
|
||||
|
||||
& $toolsDir\dotnet pack "$ProjectFile" --basepath "$Stage2CompilationDir\bin" --output "$IntermediatePackagesDir" --configuration "$Configuration" $versionArg
|
||||
|
|
|
@ -12,6 +12,8 @@ param(
|
|||
[Parameter(Mandatory=$true)][string]$HostDir,
|
||||
[Parameter(Mandatory=$true)][string]$CompilationOutputDir)
|
||||
|
||||
. $REPOROOT\scripts\package\projectsToPack.ps1
|
||||
|
||||
$Projects = @(
|
||||
"Microsoft.DotNet.Cli",
|
||||
"Microsoft.DotNet.Cli.Utils",
|
||||
|
@ -35,16 +37,6 @@ $Projects = @(
|
|||
"Microsoft.Extensions.Testing.Abstractions"
|
||||
)
|
||||
|
||||
# We need to keep the building of these projects in a separate step so that they can be signed.
|
||||
$ProjectsToPack = @(
|
||||
"Microsoft.DotNet.Cli.Utils",
|
||||
"Microsoft.DotNet.ProjectModel",
|
||||
"Microsoft.DotNet.ProjectModel.Loader",
|
||||
"Microsoft.DotNet.ProjectModel.Workspaces",
|
||||
"Microsoft.Extensions.DependencyModel",
|
||||
"Microsoft.Extensions.Testing.Abstractions"
|
||||
)
|
||||
|
||||
$BinariesForCoreHost = @(
|
||||
"csi"
|
||||
"csc"
|
||||
|
|
11
scripts/package/projectsToPack.ps1
Normal file
11
scripts/package/projectsToPack.ps1
Normal 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"
|
||||
)
|
Loading…
Add table
Reference in a new issue