From 3174da7f9612bc6c46762fb73bba7d1cc0066b75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Aug 2020 08:09:50 +0000 Subject: [PATCH] [master] Update dependencies from dotnet/arcade mono/linker dotnet/llvm-project dotnet/xharness dotnet/icu (#40376) [master] Update dependencies from dotnet/arcade mono/linker dotnet/llvm-project dotnet/xharness dotnet/icu - Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-preview.3.20403.5 to 5.0.0-preview.3.20412.1 - Updates: - Microsoft.NETCore.Runtime.ICU.Transport: from 5.0.0-preview.8.20403.1 to 5.0.0-preview.8.20410.1 - Updates: - Microsoft.DotNet.XUnitExtensions: from 5.0.0-beta.20374.1 to 5.0.0-beta.20407.3 - Microsoft.DotNet.GenFacades: from 5.0.0-beta.20374.1 to 5.0.0-beta.20407.3 - Microsoft.DotNet.Build.Tasks.Feed: from 5.0.0-beta.20374.1 to 5.0.0-beta.20407.3 - Microsoft.DotNet.Build.Tasks.Packaging: from 5.0.0-beta.20374.1 to 5.0.0-beta.20407.3 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk: from 5.0.0-beta.20374.1 to 5.0.0-beta.20407.3 - Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk: from 5.0.0-beta.20374.1 to 5.0.0-beta.20407.3 - Microsoft.DotNet.CodeAnalysis: from 5.0.0-beta.20374.1 to 5.0.0-beta.20407.3 - Microsoft.DotNet.GenAPI: from 5.0.0-beta.20374.1 to 5.0.0-beta.20407.3 - Microsoft.DotNet.XUnitConsoleRunner: from 2.5.1-beta.20374.1 to 2.5.1-beta.20407.3 - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20374.1 to 5.0.0-beta.20407.3 - Microsoft.DotNet.Helix.Sdk: from 5.0.0-beta.20374.1 to 5.0.0-beta.20407.3 - Microsoft.DotNet.RemoteExecutor: from 5.0.0-beta.20374.1 to 5.0.0-beta.20407.3 - Microsoft.DotNet.VersionTools.Tasks: from 5.0.0-beta.20374.1 to 5.0.0-beta.20407.3 - Microsoft.DotNet.ApiCompat: from 5.0.0-beta.20381.6 to 5.0.0-beta.20407.3 - Updates: - runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools: from 9.0.1-alpha.1.20403.1 to 9.0.1-alpha.1.20410.1 - runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools: from 9.0.1-alpha.1.20403.1 to 9.0.1-alpha.1.20410.1 - runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk: from 9.0.1-alpha.1.20403.1 to 9.0.1-alpha.1.20410.1 - runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools: from 9.0.1-alpha.1.20403.1 to 9.0.1-alpha.1.20410.1 - runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk: from 9.0.1-alpha.1.20403.1 to 9.0.1-alpha.1.20410.1 - runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools: from 9.0.1-alpha.1.20403.1 to 9.0.1-alpha.1.20410.1 - runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk: from 9.0.1-alpha.1.20403.1 to 9.0.1-alpha.1.20410.1 - runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk: from 9.0.1-alpha.1.20403.1 to 9.0.1-alpha.1.20410.1 - Updates: - Microsoft.DotNet.XHarness.CLI: from 1.0.0-prerelease.20403.2 to 1.0.0-prerelease.20411.1 - Microsoft.DotNet.XHarness.TestRunners.Xunit: from 1.0.0-prerelease.20403.2 to 1.0.0-prerelease.20411.1 - Merge branch 'master' into darc-master-cf92596d-90a4-4e3c-8692-fff33361f7e0 - Merge branch 'master' into darc-master-cf92596d-90a4-4e3c-8692-fff33361f7e0 --- eng/Version.Details.xml | 104 +++++++++++----------- eng/Versions.props | 44 ++++----- eng/common/SetupNugetSources.ps1 | 17 ++++ eng/common/SetupNugetSources.sh | 23 ++++- eng/common/cross/arm64/tizen-fetch.sh | 2 +- eng/common/cross/armel/tizen-fetch.sh | 7 +- eng/common/cross/toolchain.cmake | 2 +- eng/common/performance/microbenchmarks.proj | 2 +- eng/common/performance/performance-setup.sh | 6 +- eng/common/templates/steps/perf-send-to-helix.yml | 4 +- global.json | 8 +- 11 files changed, 125 insertions(+), 94 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78762c5..8742e9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,67 +4,67 @@ https://github.com/dotnet/standard cfe95a23647c7de1fe1a349343115bd7720d6949 - + https://github.com/dotnet/icu - 8bd04d98c75cc7d8ac9026eab2c63e50294b0552 + 0f49268ddfd3331ca090f1c51d2baa2f75f6c6c0 - + https://github.com/dotnet/arcade - f6192d1e284a08ac05041d05fa6e60dec74b24f5 + ea8f37e8982dc22022b33c5e151081ad04d923a6 - + https://github.com/dotnet/arcade - f6192d1e284a08ac05041d05fa6e60dec74b24f5 + ea8f37e8982dc22022b33c5e151081ad04d923a6 - + https://github.com/dotnet/arcade - 39c3b73c4b2b79981405e865e5a4fa096662f13a + ea8f37e8982dc22022b33c5e151081ad04d923a6 - + https://github.com/dotnet/arcade - f6192d1e284a08ac05041d05fa6e60dec74b24f5 + ea8f37e8982dc22022b33c5e151081ad04d923a6 - + https://github.com/dotnet/arcade - f6192d1e284a08ac05041d05fa6e60dec74b24f5 + ea8f37e8982dc22022b33c5e151081ad04d923a6 - + https://github.com/dotnet/arcade - f6192d1e284a08ac05041d05fa6e60dec74b24f5 + ea8f37e8982dc22022b33c5e151081ad04d923a6 - + https://github.com/dotnet/arcade - f6192d1e284a08ac05041d05fa6e60dec74b24f5 + ea8f37e8982dc22022b33c5e151081ad04d923a6 - + https://github.com/dotnet/arcade - f6192d1e284a08ac05041d05fa6e60dec74b24f5 + ea8f37e8982dc22022b33c5e151081ad04d923a6 - + https://github.com/dotnet/arcade - f6192d1e284a08ac05041d05fa6e60dec74b24f5 + ea8f37e8982dc22022b33c5e151081ad04d923a6 - + https://github.com/dotnet/arcade - f6192d1e284a08ac05041d05fa6e60dec74b24f5 + ea8f37e8982dc22022b33c5e151081ad04d923a6 - + https://github.com/dotnet/arcade - f6192d1e284a08ac05041d05fa6e60dec74b24f5 + ea8f37e8982dc22022b33c5e151081ad04d923a6 - + https://github.com/dotnet/arcade - f6192d1e284a08ac05041d05fa6e60dec74b24f5 + ea8f37e8982dc22022b33c5e151081ad04d923a6 - + https://github.com/dotnet/arcade - f6192d1e284a08ac05041d05fa6e60dec74b24f5 + ea8f37e8982dc22022b33c5e151081ad04d923a6 - + https://github.com/dotnet/arcade - f6192d1e284a08ac05041d05fa6e60dec74b24f5 + ea8f37e8982dc22022b33c5e151081ad04d923a6 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -122,37 +122,37 @@ https://github.com/dotnet/runtime-assets 4d5781485294568e51a4673719c8ae5ae8955e70 - + https://github.com/dotnet/llvm-project - 62d9a4d09b44ebaa1c9f94bca1066aef426a5bbf + 9cdff1ac4ccaf70a9172139fbd3e41dbb6a9d6bb - + https://github.com/dotnet/llvm-project - 62d9a4d09b44ebaa1c9f94bca1066aef426a5bbf + 9cdff1ac4ccaf70a9172139fbd3e41dbb6a9d6bb - + https://github.com/dotnet/llvm-project - 62d9a4d09b44ebaa1c9f94bca1066aef426a5bbf + 9cdff1ac4ccaf70a9172139fbd3e41dbb6a9d6bb - + https://github.com/dotnet/llvm-project - 62d9a4d09b44ebaa1c9f94bca1066aef426a5bbf + 9cdff1ac4ccaf70a9172139fbd3e41dbb6a9d6bb - + https://github.com/dotnet/llvm-project - 62d9a4d09b44ebaa1c9f94bca1066aef426a5bbf + 9cdff1ac4ccaf70a9172139fbd3e41dbb6a9d6bb - + https://github.com/dotnet/llvm-project - 62d9a4d09b44ebaa1c9f94bca1066aef426a5bbf + 9cdff1ac4ccaf70a9172139fbd3e41dbb6a9d6bb - + https://github.com/dotnet/llvm-project - 62d9a4d09b44ebaa1c9f94bca1066aef426a5bbf + 9cdff1ac4ccaf70a9172139fbd3e41dbb6a9d6bb - + https://github.com/dotnet/llvm-project - 62d9a4d09b44ebaa1c9f94bca1066aef426a5bbf + 9cdff1ac4ccaf70a9172139fbd3e41dbb6a9d6bb https://github.com/dotnet/runtime @@ -182,17 +182,17 @@ https://github.com/dotnet/runtime 0375524a91a47ca4db3ee1be548f74bab7e26e76 - + https://github.com/mono/linker - 8f32ed57a05eeb0bae3790c4db75b316c3da76c7 + fc5e4aa86ad543ab3a730e0e0e8dacc6a379d4a5 - + https://github.com/dotnet/xharness - abc6d581ce00214ef763fb8510d1ba0aa54e7717 + 3cecc1a18c6063eeabc63984215c1cfb23018a63 - + https://github.com/dotnet/xharness - abc6d581ce00214ef763fb8510d1ba0aa54e7717 + 3cecc1a18c6063eeabc63984215c1cfb23018a63 diff --git a/eng/Versions.props b/eng/Versions.props index 807c238..b4a1f5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,16 +51,16 @@ - 5.0.0-beta.20381.6 - 5.0.0-beta.20374.1 - 5.0.0-beta.20374.1 - 5.0.0-beta.20374.1 - 5.0.0-beta.20374.1 - 5.0.0-beta.20374.1 - 2.5.1-beta.20374.1 - 5.0.0-beta.20374.1 - 5.0.0-beta.20374.1 - 5.0.0-beta.20374.1 + 5.0.0-beta.20407.3 + 5.0.0-beta.20407.3 + 5.0.0-beta.20407.3 + 5.0.0-beta.20407.3 + 5.0.0-beta.20407.3 + 5.0.0-beta.20407.3 + 2.5.1-beta.20407.3 + 5.0.0-beta.20407.3 + 5.0.0-beta.20407.3 + 5.0.0-beta.20407.3 5.0.0-preview.4.20202.18 5.0.0-preview.4.20202.18 @@ -133,8 +133,8 @@ 4.9.4 16.8.0-preview-20200730-03 - 1.0.0-prerelease.20403.2 - 1.0.0-prerelease.20403.2 + 1.0.0-prerelease.20411.1 + 1.0.0-prerelease.20411.1 2.4.1 2.4.2 1.3.0 @@ -145,18 +145,18 @@ 3.0.0-preview-20200715.1 - 5.0.0-preview.3.20403.5 + 5.0.0-preview.3.20412.1 - 5.0.0-preview.8.20404.1 + 5.0.0-preview.8.20410.1 - 9.0.1-alpha.1.20403.1 - 9.0.1-alpha.1.20403.1 - 9.0.1-alpha.1.20403.1 - 9.0.1-alpha.1.20403.1 - 9.0.1-alpha.1.20403.1 - 9.0.1-alpha.1.20403.1 - 9.0.1-alpha.1.20403.1 - 9.0.1-alpha.1.20403.1 + 9.0.1-alpha.1.20410.1 + 9.0.1-alpha.1.20410.1 + 9.0.1-alpha.1.20410.1 + 9.0.1-alpha.1.20410.1 + 9.0.1-alpha.1.20410.1 + 9.0.1-alpha.1.20410.1 + 9.0.1-alpha.1.20410.1 + 9.0.1-alpha.1.20410.1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index dc221781..bb36171 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -11,6 +11,8 @@ # See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` # from the AzureDevOps-Artifact-Feeds-Pats variable group. # +# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing +# # - task: PowerShell@2 # displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') @@ -94,6 +96,14 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw } } +function EnablePrivatePackageSources($DisabledPackageSources) { + $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") + ForEach ($DisabledPackageSource in $maestroPrivateSources) { + Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled" + $DisabledPackageSource.SetAttribute("value", "false") + } +} + if (!(Test-Path $ConfigFile -PathType Leaf)) { Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" ExitWithExitCode 1 @@ -123,6 +133,13 @@ if ($creds -eq $null) { $doc.DocumentElement.AppendChild($creds) | Out-Null } +# Check for disabledPackageSources; we'll enable any darc-int ones we find there +$disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources") +if ($disabledSources -ne $null) { + Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node" + EnablePrivatePackageSources -DisabledPackageSources $disabledSources +} + $userName = "dn-bot" # Insert credential nodes for Maestro's private feeds diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index f33e377..ef33382 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -13,6 +13,8 @@ # See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` # from the AzureDevOps-Artifact-Feeds-Pats variable group. # +# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing. +# # - task: Bash@3 # displayName: Setup Private Feeds Credentials # inputs: @@ -63,7 +65,7 @@ if [ "$?" != "0" ]; then ConfigNodeHeader="" PackageSourcesTemplate="${TB}${NL}${TB}" - sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" NuGet.config + sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile fi # Ensure there is a ... section. @@ -74,7 +76,7 @@ if [ "$?" != "0" ]; then PackageSourcesNodeFooter="" PackageSourceCredentialsTemplate="${TB}${NL}${TB}" - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile fi PackageSources=() @@ -146,3 +148,20 @@ for FeedName in ${PackageSources[@]} ; do sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile fi done + +# Re-enable any entries in disabledPackageSources where the feed name contains darc-int +grep -i "" $ConfigFile +if [ "$?" == "0" ]; then + DisabledDarcIntSources=() + echo "Re-enabling any disabled \"darc-int\" package sources in $ConfigFile" + DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' $ConfigFile | tr -d '"') + for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do + if [[ $DisabledSourceName == darc-int* ]] + then + OldDisableValue="add key=\"$DisabledSourceName\" value=\"true\"" + NewDisableValue="add key=\"$DisabledSourceName\" value=\"false\"" + sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile + echo "Neutralized disablePackageSources entry for '$DisabledSourceName'" + fi + done +fi diff --git a/eng/common/cross/arm64/tizen-fetch.sh b/eng/common/cross/arm64/tizen-fetch.sh index 338d1c3..a48a6f5 100644 --- a/eng/common/cross/arm64/tizen-fetch.sh +++ b/eng/common/cross/arm64/tizen-fetch.sh @@ -161,7 +161,7 @@ fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic lin Inform "fetch coreclr packages" fetch_tizen_pkgs aarch64 lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu Inform "fetch corefx packages" -fetch_tizen_pkgs aarch64 libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl1.1-devel krb5 krb5-devel +fetch_tizen_pkgs aarch64 libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel Inform "Initialize standard unified" fetch_tizen_pkgs_init standard unified diff --git a/eng/common/cross/armel/tizen-fetch.sh b/eng/common/cross/armel/tizen-fetch.sh index ed70e0a..2776cbb 100755 --- a/eng/common/cross/armel/tizen-fetch.sh +++ b/eng/common/cross/armel/tizen-fetch.sh @@ -51,7 +51,7 @@ if [ ! -d $TMPDIR ]; then mkdir -p $TMPDIR fi -TIZEN_URL=http://download.tizen.org/releases/milestone/tizen +TIZEN_URL=http://download.tizen.org/snapshots/tizen BUILD_XML=build.xml REPOMD_XML=repomd.xml PRIMARY_XML=primary.xml @@ -157,12 +157,11 @@ fetch_tizen_pkgs() Inform "Initialize arm base" fetch_tizen_pkgs_init standard base Inform "fetch common packages" -fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel libatomic -fetch_tizen_pkgs noarch linux-glibc-devel +fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel Inform "fetch coreclr packages" fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu Inform "fetch corefx packages" -fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel krb5 krb5-devel libcurl libcurl-devel +fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel Inform "Initialize standard unified" fetch_tizen_pkgs_init standard unified diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index b9fe796..2566707 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -15,7 +15,7 @@ if(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") if("$ENV{__DistroRid}" MATCHES "tizen.*") - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/6.2.1") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm") set(CMAKE_SYSTEM_PROCESSOR armv7l) diff --git a/eng/common/performance/microbenchmarks.proj b/eng/common/performance/microbenchmarks.proj index 71114b0..5c95ef4 100644 --- a/eng/common/performance/microbenchmarks.proj +++ b/eng/common/performance/microbenchmarks.proj @@ -69,7 +69,7 @@ - 12:30 + 2:30 0:15 diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index 66f63a3..fd26bdb 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -136,7 +136,7 @@ while (($# > 0)); do echo " --runcategories Related to csproj. Categories of benchmarks to run. Defaults to \"coreclr corefx\"" echo " --internal If the benchmarks are running as an official job." echo " --monodotnet Pass the path to the mono dotnet for mono performance testing." - echo " --wasm Path to the unpacled wasm runtime pack." + echo " --wasm Path to the unpacked wasm runtime pack." echo "" exit 0 ;; @@ -230,13 +230,9 @@ fi if [[ "$wasm_runtime_loc" != "" ]]; then using_wasm=true - wasm_dotnet_path=$payload_directory/dotnet-wasm - mv $wasm_runtime_loc $wasm_dotnet_path - extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --wasmMainJS \$HELIX_CORRELATION_PAYLOAD/dotnet-wasm/runtime-test.js --wasmEngine /home/helixbot/.jsvu/v8 --customRuntimePack \$HELIX_CORRELATION_PAYLOAD/dotnet-wasm" - fi if [[ "$mono_dotnet" != "" ]]; then diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml index 1e3bed7..e003fe2 100644 --- a/eng/common/templates/steps/perf-send-to-helix.yml +++ b/eng/common/templates/steps/perf-send-to-helix.yml @@ -4,8 +4,8 @@ parameters: HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number - HelixTargetQueues: '' # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/ for a list 0of queues - HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixTargetQueues: '' # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues + HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group HelixPreCommands: '' # optional -- commands to run before Helix work item execution 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 diff --git a/global.json b/global.json index 5d4b27a..8032e3e 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20374.1", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20374.1", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20374.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20374.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20407.3", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20407.3", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20407.3", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20407.3", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "1.0.53", -- 2.7.4