diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 71a8568b2138..01369ea54d01 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,15 +1,15 @@
-
+
https://github.com/dotnet/arcade
- 3220be53ac764d9ee160b0bc64baa492af219aa7
+ 67384d20d310611afc1c2b4dd3b953fda182def4
-
+
https://github.com/dotnet/arcade
- 3220be53ac764d9ee160b0bc64baa492af219aa7
+ 67384d20d310611afc1c2b4dd3b953fda182def4
diff --git a/eng/Versions.props b/eng/Versions.props
index 77bc4f04d59f..36672bbe89be 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -22,7 +22,7 @@
2.0.0
4.0.0
1.5.0
- 1.0.0-beta.19058.5
+ 1.0.0-beta.19060.8
diff --git a/eng/common/build.sh b/eng/common/build.sh
index faccf43179b0..4fe8b41ed706 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -137,6 +137,9 @@ while [[ $# > 0 ]]; do
/m:*)
properties="$properties $1"
;;
+ /bl:*)
+ properties="$properties $1"
+ ;;
*)
echo "Invalid argument: $1"
usage
diff --git a/eng/common/helixpublish.proj b/eng/common/helixpublish.proj
index 72668a13374f..d7f185856e79 100644
--- a/eng/common/helixpublish.proj
+++ b/eng/common/helixpublish.proj
@@ -14,6 +14,7 @@
$(WorkItemDirectory)
$(WorkItemCommand)
+ $(WorkItemTimeout)
diff --git a/eng/common/templates/phases/base.yml b/eng/common/templates/phases/base.yml
index e075e8b78bf5..0123cf43b168 100644
--- a/eng/common/templates/phases/base.yml
+++ b/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
diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml
index 03f0e3866298..ab44a32769e7 100644
--- a/eng/common/templates/steps/send-to-helix.yml
+++ b/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 }}
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index a607ec608085..4204dc14f892 100644
--- a/eng/common/tools.ps1
+++ b/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
}
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 9c3c132abf3d..8a253bef5131 100644
--- a/eng/common/tools.sh
+++ b/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"
}
diff --git a/global.json b/global.json
index b08aa2db2000..7d8993226dac 100644
--- a/global.json
+++ b/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"
}
}