Merge pull request #989 from livarcocc/pack

Building the projects that are going to be packaged separately

packaging/nuget/package.ps1

@@ -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

scripts/compile/compile-stage.ps1

@@ -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",
@@ -91,6 +93,15 @@ if (! (Test-Path $runtimeBinariesOutputDir)) {
 
 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
 $FilesToClean | ForEach-Object {
     $path = Join-Path $RuntimeOutputDir $_

scripts/package/projectsToPack.ps1

@@ -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"
+)