Update dependencies from dotnet/arcade

eng/Version.Details.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="1.0.0-beta.19058.5">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="1.0.0-beta.19060.8">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3220be53ac764d9ee160b0bc64baa492af219aa7</Sha>
+      <Sha>67384d20d310611afc1c2b4dd3b953fda182def4</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19058.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19060.8">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3220be53ac764d9ee160b0bc64baa492af219aa7</Sha>
+      <Sha>67384d20d310611afc1c2b4dd3b953fda182def4</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -22,7 +22,7 @@
     <PlatformAbstractionsVersion>2.0.0</PlatformAbstractionsVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>1.5.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>1.0.0-beta.19058.5</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>1.0.0-beta.19060.8</MicrosoftDotNetSignToolVersion>
   </PropertyGroup>
   <!-- Get .NET Framework reference assemblies from NuGet packages -->
   <PropertyGroup>

eng/common/build.sh

@@ -137,6 +137,9 @@ while [[ $# > 0 ]]; do
     /m:*)
       properties="$properties $1"
       ;;
+    /bl:*)
+      properties="$properties $1"
+      ;;
     *)
       echo "Invalid argument: $1"
       usage

eng/common/helixpublish.proj

@@ -14,6 +14,7 @@
     <HelixWorkItem Include="WorkItem" Condition="'$(WorkItemDirectory)' != ''">
       <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
       <Command>$(WorkItemCommand)</Command>
+      <Timeout Condition="'$(WorkItemTimeout)' != ''">$(WorkItemTimeout)</Timeout>
     </HelixWorkItem>
   </ItemGroup>
 

eng/common/templates/phases/base.yml

@@ -85,7 +85,6 @@ phases:
       - task: MicroBuildSigningPlugin@2
         displayName: Install MicroBuild plugin
         inputs:
-          version: 1.1.35
           signType: $(_SignType)
           zipSources: false
           feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json

eng/common/templates/steps/send-to-helix.yml

@@ -8,6 +8,7 @@ parameters:
   HelixPostCommands: ''              # optional -- commands to run after Helix work item execution
   WorkItemDirectory: ''              # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
   WorkItemCommand: ''                # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
+  WorkItemTimeout: ''                # optional -- a timeout in seconds for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
   CorrelationPayloadDirectory: ''    # optional -- a directory to zip up and send to Helix as a correlation payload
   XUnitProjects: ''                  # optional -- semicolon delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true
   XUnitPublishTargetFramework: ''    # optional -- framework to use to publish your xUnit projects
@@ -37,6 +38,7 @@ steps:
       HelixPostCommands: ${{ parameters.HelixPostCommands }}
       WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
       WorkItemCommand: ${{ parameters.WorkItemCommand }}
+      WorkItemTimeout: ${{ parameters.WorkItemTimeout }}
       CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
       XUnitProjects: ${{ parameters.XUnitProjects }}
       XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }}
@@ -64,6 +66,7 @@ steps:
       HelixPostCommands: ${{ parameters.HelixPostCommands }}
       WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
       WorkItemCommand: ${{ parameters.WorkItemCommand }}
+      WorkItemTimeout: ${{ parameters.WorkItemTimeout }}
       CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
       XUnitProjects: ${{ parameters.XUnitProjects }}
       XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }}

eng/common/tools.ps1

@@ -141,6 +141,13 @@ function InitializeDotNetCli([bool]$install) {
   # It also ensures that VS msbuild will use the downloaded sdk targets.
   $env:PATH = "$dotnetRoot;$env:PATH"
 
+  if ($ci) {
+    # Make Sure that our bootstrapped dotnet cli is avaliable in future steps of the Azure Pipelines build
+    Write-Host "##vso[task.prependpath]$dotnetRoot"
+    Write-Host "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP]0"
+    Write-Host "##vso[task.setvariable variable=DOTNET_SKIP_FIRST_TIME_EXPERIENCE]1"
+  }
+
   return $global:_DotNetInstallDir = $dotnetRoot
 }
 

eng/common/tools.sh

@@ -135,6 +135,13 @@ function InitializeDotNetCli {
   # build steps from using anything other than what we've downloaded.
   export PATH="$dotnet_root:$PATH"
 
+  if [[ $ci == true ]]; then
+    # Make Sure that our bootstrapped dotnet cli is avaliable in future steps of the Azure Pipelines build
+    echo "##vso[task.prependpath]$dotnet_root"
+    echo "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP]0"
+    echo "##vso[task.setvariable variable=DOTNET_SKIP_FIRST_TIME_EXPERIENCE]1"
+  fi
+
   # return value
   _InitializeDotNetCli="$dotnet_root"
 }

global.json

@@ -6,6 +6,6 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19058.5"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19060.8"
   }
 }