From 4cc0a9a55d283e44205bf842a68657280bdabcd5 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 20 Dec 2018 14:43:35 +0000
Subject: Update dependency files (#21580)

* Update dependencies from https://github.com/dotnet/arcade build 844

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.18617.7
- Microsoft.DotNet.Helix.Sdk - 1.0.0-beta.18617.7

* Update dependencies from https://github.com/dotnet/arcade build 885

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.18618.7
- Microsoft.DotNet.Helix.Sdk - 1.0.0-beta.18618.7

* Update dependencies from https://github.com/dotnet/arcade build 908

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.18619.4
- Microsoft.DotNet.Helix.Sdk - 1.0.0-beta.18619.4
---
 eng/common/PublishToPackageFeed.proj | 37 ++++++++++++++++++++++++++++++++++++
 eng/common/build.ps1                 | 15 +++++++++------
 eng/common/build.sh                  |  5 ++---
 3 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 eng/common/PublishToPackageFeed.proj

(limited to 'eng/common')

diff --git a/eng/common/PublishToPackageFeed.proj b/eng/common/PublishToPackageFeed.proj
new file mode 100644
index 0000000000..7dc478d981
--- /dev/null
+++ b/eng/common/PublishToPackageFeed.proj
@@ -0,0 +1,37 @@
+<!--
+  This MSBuild file is intended to be used as the body of the default 
+  publishing release pipeline. The release pipeline will use this file
+  to invoke the PushToStaticFeed task that will read the build asset
+  manifest and publish the assets described in the manifest to
+  informed target feeds.
+-->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)MicrosoftDotNetBuildTasksFeedVersion.props" />
+  <Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets" />
+
+  <Target Name="PublishToFeed">
+    <Error Condition="'$(TargetStaticFeed)' == ''" Text="TargetStaticFeed: Target feed for publishing assets wasn't provided." />
+    <Error Condition="'$(AccountKeyToStaticFeed)' == ''" Text="AccountKeyToStaticFeed: Account key for target feed wasn't provided." />
+    <Error Condition="'$(FullPathAssetManifest)' == ''" Text="Full path to asset manifest wasn't provided." />
+    <Error Condition="'$(FullPathBlobBasePath)' == '' AND '$(FullPathPackageBasePath)' == ''" Text="A valid full path to BlobBasePath of PackageBasePath is required." />
+
+    <PushArtifactsInManifestToFeed
+      ExpectedFeedUrl="$(TargetStaticFeed)"
+      AccountKey="$(AccountKeyToStaticFeed)"
+      Overwrite="$(OverrideAssetsWithSameName)"
+      PassIfExistingItemIdentical="$(PassIfExistingItemIdentical)"
+      MaxClients="$(MaxParallelUploads)"
+      UploadTimeoutInMinutes="$(MaxUploadTimeoutInMinutes)"
+      AssetManifestPath="$(FullPathAssetManifest)"
+      BlobAssetsBasePath="$(FullPathBlobBasePath)"
+      PackageAssetsBasePath="$(FullPathPackageBasePath)" />
+  </Target>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 5241f42e35..2f5e6052a8 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -1,7 +1,7 @@
 [CmdletBinding(PositionalBinding=$false)]
 Param(
   [string][Alias('c')]$configuration = "Debug",
-  [string] $projects = "",
+  [string] $projects,
   [string][Alias('v')]$verbosity = "minimal",
   [string] $msbuildEngine = $null,
   [bool] $warnAsError = $true,
@@ -79,10 +79,17 @@ function Build {
   InitializeCustomToolset
   $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.binlog") } else { "" }
 
+  if ($projects) {
+    # Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
+    # Explicitly set the type as string[] because otherwise PowerShell would make this char[] if $properties is empty.
+    [string[]] $msbuildArgs = $properties
+    $msbuildArgs += "/p:Projects=$projects"
+    $properties = $msbuildArgs
+  }
+
   MSBuild $toolsetBuildProj `
     $bl `
     /p:Configuration=$configuration `
-    /p:Projects=$projects `
     /p:RepoRoot=$RepoRoot `
     /p:Restore=$restore `
     /p:DeployDeps=$deployDeps `
@@ -106,10 +113,6 @@ try {
     exit 0
   }
 
-  if ($projects -eq "") {
-    $projects = Join-Path $RepoRoot "*.sln"
-  }
-
   if ($ci) {
     $binaryLog = $true
     $nodeReuse = $false
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 03b4436e1b..47af926d4d 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -159,8 +159,8 @@ function Build {
   InitializeToolset
   InitializeCustomToolset
 
-  if [[ -z $projects ]]; then
-    projects="$repo_root/*.sln"
+  if [[ ! -z "$projects" ]]; then
+    properties="$properties /p:Projects=$projects"
   fi
 
   local bl=""
@@ -171,7 +171,6 @@ function Build {
   MSBuild $_InitializeToolset \
     $bl \
     /p:Configuration=$configuration \
-    /p:Projects="$projects" \
     /p:RepoRoot="$repo_root" \
     /p:Restore=$restore \
     /p:Build=$build \
-- 
cgit v1.2.3