Fixes issue #797
Builds all to-be-packaged assemblies, fixes packaging script.
This commit is contained in:
parent
e114bbf367
commit
ce34927dfb
2 changed files with 10 additions and 11 deletions
|
@ -23,21 +23,16 @@ New-Item -ItemType Directory -Force -Path $IntermediatePackagesDir
|
||||||
$Projects = @(
|
$Projects = @(
|
||||||
"Microsoft.DotNet.Cli.Utils",
|
"Microsoft.DotNet.Cli.Utils",
|
||||||
"Microsoft.DotNet.ProjectModel",
|
"Microsoft.DotNet.ProjectModel",
|
||||||
"Microsoft.DotNet.ProjectModel.Workspaces",
|
|
||||||
"Microsoft.DotNet.Runtime",
|
|
||||||
"Microsoft.Extensions.Testing.Abstractions",
|
|
||||||
"Microsoft.DotNet.ProjectModel.Loader",
|
"Microsoft.DotNet.ProjectModel.Loader",
|
||||||
"Microsoft.Extensions.DependencyModel"
|
"Microsoft.DotNet.ProjectModel.Workspaces",
|
||||||
|
"Microsoft.Extensions.DependencyModel",
|
||||||
|
"Microsoft.Extensions.Testing.Abstractions"
|
||||||
)
|
)
|
||||||
|
|
||||||
foreach ($ProjectName in $Projects) {
|
foreach ($ProjectName in $Projects) {
|
||||||
$ProjectFile = "$RepoRoot\src\$ProjectName\project.json"
|
$ProjectFile = "$RepoRoot\src\$ProjectName\project.json"
|
||||||
& $toolsDir\dotnet restore "$ProjectFile"
|
|
||||||
if (!$?) {
|
& $toolsDir\dotnet pack "$ProjectFile" --basepath "$Stage2Dir\bin" --output "$IntermediatePackagesDir" $versionArg
|
||||||
Write-Host "$toolsDir\dotnet restore failed for: $ProjectFile"
|
|
||||||
Exit 1
|
|
||||||
}
|
|
||||||
& $toolsDir\dotnet pack "$ProjectFile" --basepath "Stage2Dir\bin" --output "$IntermediatePackagesDir" $versionArg
|
|
||||||
if (!$?) {
|
if (!$?) {
|
||||||
Write-Host "$toolsDir\dotnet pack failed for: $ProjectFile"
|
Write-Host "$toolsDir\dotnet pack failed for: $ProjectFile"
|
||||||
Exit 1
|
Exit 1
|
||||||
|
|
|
@ -13,6 +13,8 @@ param(
|
||||||
|
|
||||||
$Projects = @(
|
$Projects = @(
|
||||||
"Microsoft.DotNet.Cli",
|
"Microsoft.DotNet.Cli",
|
||||||
|
"Microsoft.DotNet.Cli.Utils",
|
||||||
|
"Microsoft.DotNet.ProjectModel.Loader",
|
||||||
"Microsoft.DotNet.ProjectModel.Server",
|
"Microsoft.DotNet.ProjectModel.Server",
|
||||||
"Microsoft.DotNet.Tools.Builder",
|
"Microsoft.DotNet.Tools.Builder",
|
||||||
"Microsoft.DotNet.Tools.Compiler",
|
"Microsoft.DotNet.Tools.Compiler",
|
||||||
|
@ -27,7 +29,9 @@ $Projects = @(
|
||||||
"Microsoft.DotNet.Tools.Repl.Csi",
|
"Microsoft.DotNet.Tools.Repl.Csi",
|
||||||
"Microsoft.DotNet.Tools.Resgen",
|
"Microsoft.DotNet.Tools.Resgen",
|
||||||
"Microsoft.DotNet.Tools.Run",
|
"Microsoft.DotNet.Tools.Run",
|
||||||
"Microsoft.DotNet.Tools.Test"
|
"Microsoft.DotNet.Tools.Test",
|
||||||
|
"Microsoft.Extensions.DependencyModel",
|
||||||
|
"Microsoft.Extensions.Testing.Abstractions"
|
||||||
)
|
)
|
||||||
|
|
||||||
$BinariesForCoreHost = @(
|
$BinariesForCoreHost = @(
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue