From e2cd979d87055b57a0d091e71ef465b7e5e1a982 Mon Sep 17 00:00:00 2001
From: dotnet-maestro <@dotnet-maestro>
Date: Sun, 24 Feb 2019 13:24:24 +0000
Subject: Update dependencies from https://github.com/dotnet/arcade build
 20190223.1

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19123.1
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19123.1
---
 eng/common/build.ps1             |  1 -
 eng/common/build.sh              |  3 +--
 eng/common/darc-init.ps1         |  2 +-
 eng/common/darc-init.sh          | 23 ++++++++++++++++++++---
 eng/common/templates/job/job.yml |  4 ++++
 eng/common/tools.ps1             |  2 +-
 eng/common/tools.sh              |  2 +-
 7 files changed, 28 insertions(+), 9 deletions(-)

(limited to 'eng/common')

diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 8279dc7133..316061382b 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -99,7 +99,6 @@ function Build {
     /p:PerformanceTest=$performanceTest `
     /p:Sign=$sign `
     /p:Publish=$publish `
-    /p:ContinuousIntegrationBuild=$ci `
     @properties
 }
 
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 4fe8b41ed7..43b7ccb5c5 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -10,7 +10,7 @@ set -e
 usage()
 {
   echo "Common settings:"
-  echo "  --configuration <value>    Build configuration: 'Debug' or 'Release' (short: --c)"
+  echo "  --configuration <value>    Build configuration: 'Debug' or 'Release' (short: -c)"
   echo "  --verbosity <value>        Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)"
   echo "  --binaryLog                Create MSBuild binary log (short: -bl)"
   echo ""
@@ -191,7 +191,6 @@ function Build {
     /p:PerformanceTest=$performance_test \
     /p:Sign=$sign \
     /p:Publish=$publish \
-    /p:ContinuousIntegrationBuild=$ci \
     $properties
 
   ExitWithExitCode 0
diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1
index 57db185df1..24676b261d 100644
--- a/eng/common/darc-init.ps1
+++ b/eng/common/darc-init.ps1
@@ -19,7 +19,7 @@ function InstallDarcCli ($darcVersion) {
   # Until we can anonymously query the BAR API for the latest arcade-services
   # build applied to the PROD channel, this is hardcoded.
   if (-not $darcVersion) {
-    $darcVersion = '1.1.0-beta.19081.1'
+    $darcVersion = '1.1.0-beta.19120.2'
   }
   
   $arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json'
diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh
index bad07c3ae6..d4dfdc94fc 100755
--- a/eng/common/darc-init.sh
+++ b/eng/common/darc-init.sh
@@ -1,6 +1,24 @@
 #!/usr/bin/env bash
 
 source="${BASH_SOURCE[0]}"
+darcVersion="1.1.0-beta.19120.2"
+
+while [[ $# > 0 ]]; do
+  opt="$(echo "$1" | awk '{print tolower($0)}')"
+  case "$opt" in
+    --darcversion)
+      darcVersion=$2
+      shift
+      ;;
+    *)
+      echo "Invalid argument: $1"
+      usage
+      exit 1
+      ;;
+  esac
+
+  shift
+done
 
 # resolve $source until the file is no longer a symlink
 while [[ -h "$source" ]]; do
@@ -27,12 +45,11 @@ function InstallDarcCli {
     echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name -g)
   fi
 
-  ReadGlobalVersion "Microsoft.DotNet.Arcade.Sdk"
-  local toolset_version=$_ReadGlobalVersion
+  local arcadeServicesSource="https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json"
 
   echo "Installing Darc CLI version $toolset_version..."
   echo "You may need to restart your command shell if this is the first dotnet tool you have installed."
-  echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $toolset_version -v $verbosity -g)
+  echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g)
 }
 
 InstallDarcCli
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 98ca94c326..cd4e5731a6 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -108,6 +108,10 @@ jobs:
         - name: ${{ pair.key }}
           value: ${{ pair.value }}
 
+  # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds
+  - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+    - group: DotNet-HelixApi-Access
+
   ${{ if ne(parameters.workspace, '') }}:
     workspace: ${{ parameters.workspace }}
 
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index fbcc4e3ba0..de7523cae5 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -461,7 +461,7 @@ function MSBuild() {
 
   $buildTool = InitializeBuildTool
 
-  $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse"
+  $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"
 
   if ($warnAsError) { 
     $cmdArgs += " /warnaserror /p:TreatWarningsAsErrors=true" 
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 633a8167b0..ecdece1f85 100644
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -293,7 +293,7 @@ function MSBuild {
     warnaserror_switch="/warnaserror"
   fi
 
-  "$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error "$@" || {
+  "$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" || {
     local exit_code=$?
     echo "Build failed (exit code '$exit_code')." >&2
     ExitWithExitCode $exit_code
-- 
cgit v1.2.3