From e3afc1634c81bdf9858a9f5daf87a701ab4b9e1c Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 7 May 2019 12:04:53 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20190506.12 - Microsoft.DotNet.XUnitExtensions - 2.4.0-beta.19256.12 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19256.12 - Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19256.12 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19256.12 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19256.12 - Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19256.12 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19256.12 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19256.12 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19256.12 - Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19256.12 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19256.12 - Microsoft.DotNet.GenFacades - 1.0.0-beta.19256.12 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19256.12 - Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19256.12 --- eng/Version.Details.xml | 56 ++++++++++++++++---------------- eng/Versions.props | 24 +++++++------- eng/common/build.sh | 18 ++-------- eng/common/dotnet-install.cmd | 2 ++ eng/common/dotnet-install.ps1 | 22 +++++++++++++ eng/common/dotnet-install.sh | 49 ++++++++++++++++++++++++++++ eng/common/templates/job/job.yml | 3 ++ eng/common/tools.ps1 | 27 +++++++++++---- eng/common/tools.sh | 39 ++++++++++++++++++---- global.json | 4 +-- 10 files changed, 173 insertions(+), 71 deletions(-) create mode 100644 eng/common/dotnet-install.cmd create mode 100644 eng/common/dotnet-install.ps1 create mode 100644 eng/common/dotnet-install.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e26dcc62810..2955a91adc54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,65 +34,65 @@ https://github.com/dotnet/corefx bd278630dd08914ef521e62658afb69845c5b93a - + https://github.com/dotnet/arcade - a7a250e9c13147134543c35fef2fb81f19592edf + c31fac9f6899094226cb5cd77c85b8f60ecafa3d https://github.com/dotnet/standard e94d4263f03ced7269275c10a59d1dddb0c76b7c - + https://github.com/dotnet/arcade - a7a250e9c13147134543c35fef2fb81f19592edf + c31fac9f6899094226cb5cd77c85b8f60ecafa3d - + https://github.com/dotnet/arcade - 1b8589bbf53b9a5e819460798eff59830f39a3be + c31fac9f6899094226cb5cd77c85b8f60ecafa3d - + https://github.com/dotnet/arcade - 1b8589bbf53b9a5e819460798eff59830f39a3be + c31fac9f6899094226cb5cd77c85b8f60ecafa3d - + https://github.com/dotnet/arcade - 1b8589bbf53b9a5e819460798eff59830f39a3be + c31fac9f6899094226cb5cd77c85b8f60ecafa3d - + https://github.com/dotnet/arcade - 1b8589bbf53b9a5e819460798eff59830f39a3be + c31fac9f6899094226cb5cd77c85b8f60ecafa3d - + https://github.com/dotnet/arcade - 1b8589bbf53b9a5e819460798eff59830f39a3be + c31fac9f6899094226cb5cd77c85b8f60ecafa3d - + https://github.com/dotnet/arcade - 1b8589bbf53b9a5e819460798eff59830f39a3be + c31fac9f6899094226cb5cd77c85b8f60ecafa3d - + https://github.com/dotnet/arcade - 1b8589bbf53b9a5e819460798eff59830f39a3be + c31fac9f6899094226cb5cd77c85b8f60ecafa3d - + https://github.com/dotnet/arcade - 1b8589bbf53b9a5e819460798eff59830f39a3be + c31fac9f6899094226cb5cd77c85b8f60ecafa3d - + https://github.com/dotnet/arcade - 1b8589bbf53b9a5e819460798eff59830f39a3be + c31fac9f6899094226cb5cd77c85b8f60ecafa3d - + https://github.com/dotnet/arcade - 1b8589bbf53b9a5e819460798eff59830f39a3be + c31fac9f6899094226cb5cd77c85b8f60ecafa3d - + https://github.com/dotnet/arcade - 1b8589bbf53b9a5e819460798eff59830f39a3be + c31fac9f6899094226cb5cd77c85b8f60ecafa3d - + https://github.com/dotnet/arcade - 1b8589bbf53b9a5e819460798eff59830f39a3be + c31fac9f6899094226cb5cd77c85b8f60ecafa3d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 6633bea6a84a..16f1931808d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,18 +23,18 @@ - 1.0.0-beta.19229.8 - 1.0.0-beta.19254.1 - 1.0.0-beta.19254.1 - 1.0.0-beta.19254.1 - 2.4.0-beta.19254.1 - 2.5.1-beta.19254.1 - 1.0.0-beta.19254.1 - 1.0.0-beta.19254.1 - 1.0.0-beta.19254.1 - 1.0.0-beta.19254.1 - 2.2.0-beta.19254.1 - 1.0.0-beta.19254.1 + 1.0.0-beta.19256.12 + 1.0.0-beta.19256.12 + 1.0.0-beta.19256.12 + 1.0.0-beta.19256.12 + 2.4.0-beta.19256.12 + 2.5.1-beta.19256.12 + 1.0.0-beta.19256.12 + 1.0.0-beta.19256.12 + 1.0.0-beta.19256.12 + 1.0.0-beta.19256.12 + 2.2.0-beta.19256.12 + 1.0.0-beta.19256.12 3.0.0-preview6-27705-02 3.0.0-preview6-27705-02 diff --git a/eng/common/build.sh b/eng/common/build.sh index d038959ab46c..ce846d888df3 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -35,7 +35,7 @@ usage() echo " --nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" echo " --warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" echo "" - echo "Command line arguments starting with '/p:' are passed through to MSBuild." + echo "Command line arguments not listed above are passed thru to msbuild." echo "Arguments can also be passed in with a single hyphen." } @@ -137,22 +137,8 @@ while [[ $# > 0 ]]; do node_reuse=$2 shift ;; - -p:*|/p:*) - properties="$properties $1" - ;; - -m:*|/m:*) - properties="$properties $1" - ;; - -bl:*|/bl:*) - properties="$properties $1" - ;; - -dl:*|/dl:*) - properties="$properties $1" - ;; *) - echo "Invalid argument: $1" - usage - exit 1 + properties="$properties $1" ;; esac diff --git a/eng/common/dotnet-install.cmd b/eng/common/dotnet-install.cmd new file mode 100644 index 000000000000..b1c2642e76f7 --- /dev/null +++ b/eng/common/dotnet-install.cmd @@ -0,0 +1,2 @@ +@echo off +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*" \ No newline at end of file diff --git a/eng/common/dotnet-install.ps1 b/eng/common/dotnet-install.ps1 new file mode 100644 index 000000000000..5987943fd6f1 --- /dev/null +++ b/eng/common/dotnet-install.ps1 @@ -0,0 +1,22 @@ +[CmdletBinding(PositionalBinding=$false)] +Param( + [string] $verbosity = "minimal", + [string] $architecture = "", + [string] $version = "Latest", + [string] $runtime = "dotnet" +) + +. $PSScriptRoot\tools.ps1 + +try { + $dotnetRoot = Join-Path $RepoRoot ".dotnet" + InstallDotNet $dotnetRoot $version $architecture $runtime $true +} +catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} + +ExitWithExitCode 0 \ No newline at end of file diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh new file mode 100644 index 000000000000..c3072c958af0 --- /dev/null +++ b/eng/common/dotnet-install.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +version='Latest' +architecture='' +runtime='dotnet' +while [[ $# > 0 ]]; do + opt="$(echo "$1" | awk '{print tolower($0)}')" + case "$opt" in + -version|-v) + shift + version="$1" + ;; + -architecture|-a) + shift + architecture="$1" + ;; + -runtime|-r) + shift + runtime="$1" + ;; + *) + echo "Invalid argument: $1" + usage + exit 1 + ;; + esac + shift +done + +. "$scriptroot/tools.sh" +dotnetRoot="$repo_root/.dotnet" +InstallDotNet $dotnetRoot $version "$architecture" $runtime true || { + local exit_code=$? + echo "dotnet-install.sh failed (exit code '$exit_code')." >&2 + ExitWithExitCode $exit_code +} + +ExitWithExitCode 0 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 7839b70bb708..1814e0ab6124 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -90,6 +90,9 @@ jobs: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} variables: + - ${{ if eq(parameters.enableTelemetry, 'true') }}: + - name: DOTNET_CLI_TELEMETRY_PROFILE + value: '$(Build.Repository.Uri)' - ${{ each variable in parameters.variables }}: # handle name-value variable syntax # example: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 09794dff8377..d86eef1e3a71 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -108,7 +108,7 @@ function InitializeDotNetCli([bool]$install) { } # Find the first path on %PATH% that contains the dotnet.exe - if ($useInstalledDotNetCli -and ($env:DOTNET_INSTALL_DIR -eq $null)) { + if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) { $dotnetCmd = Get-Command "dotnet.exe" -ErrorAction SilentlyContinue if ($dotnetCmd -ne $null) { $env:DOTNET_INSTALL_DIR = Split-Path $dotnetCmd.Path -Parent @@ -119,7 +119,7 @@ function InitializeDotNetCli([bool]$install) { # Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version, # otherwise install the dotnet CLI and SDK to repo local .dotnet directory to avoid potential permission issues. - if (($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) { + if ((-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) { $dotnetRoot = $env:DOTNET_INSTALL_DIR } else { $dotnetRoot = Join-Path $RepoRoot ".dotnet" @@ -152,7 +152,7 @@ function InitializeDotNetCli([bool]$install) { } function GetDotNetInstallScript([string] $dotnetRoot) { - $installScript = "$dotnetRoot\dotnet-install.ps1" + $installScript = Join-Path $dotnetRoot "dotnet-install.ps1" if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile $installScript @@ -162,9 +162,21 @@ function GetDotNetInstallScript([string] $dotnetRoot) { } function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = "") { + InstallDotNet $dotnetRoot $version $architecture +} + +function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { $installScript = GetDotNetInstallScript $dotnetRoot $installScript = GetDotNetInstallScript $dotnetRoot - $archArg = if ($architecture) { $architecture } else { "" } - & $installScript -Version $version -InstallDir $dotnetRoot -Architecture $archArg + $installParameters = @{ + Version = $version + InstallDir = $dotnetRoot + } + + if ($architecture) { $installParameters.Architecture = $architecture } + if ($runtime) { $installParameters.Runtime = $runtime } + if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } + + & $installScript @installParameters if ($lastExitCode -ne 0) { Write-Host "Failed to install dotnet cli (exit code '$lastExitCode')." -ForegroundColor Red ExitWithExitCode $lastExitCode @@ -429,6 +441,7 @@ function InitializeToolset() { $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "ToolsetRestore.binlog") } else { "" } '' | Set-Content $proj + MSBuild $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile $path = Get-Content $toolsetLocationFile -TotalCount 1 @@ -522,6 +535,8 @@ $ToolsDir = Join-Path $RepoRoot ".tools" $LogDir = Join-Path (Join-Path $ArtifactsDir "log") $configuration $TempDir = Join-Path (Join-Path $ArtifactsDir "tmp") $configuration $GlobalJson = Get-Content -Raw -Path (Join-Path $RepoRoot "global.json") | ConvertFrom-Json +# true if global.json contains a "runtimes" section +$globalJsonHasRuntimes = if ($GlobalJson.tools.PSObject.Properties.Name -Match 'runtimes') { $true } else { $false } Create-Directory $ToolsetDir Create-Directory $TempDir @@ -534,4 +549,4 @@ if ($ci) { $env:TEMP = $TempDir $env:TMP = $TempDir -} +} \ No newline at end of file diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 59f47c5fa90d..9dc565e2961a 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -101,7 +101,7 @@ function InitializeDotNetCli { fi # Find the first path on $PATH that contains the dotnet.exe - if [[ "$use_installed_dotnet_cli" == true && -z "${DOTNET_INSTALL_DIR:-}" ]]; then + if [[ "$use_installed_dotnet_cli" == true && $global_json_has_runtimes == false && -z "${DOTNET_INSTALL_DIR:-}" ]]; then local dotnet_path=`command -v dotnet` if [[ -n "$dotnet_path" ]]; then ResolvePath "$dotnet_path" @@ -115,10 +115,11 @@ function InitializeDotNetCli { # Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version, # otherwise install the dotnet CLI and SDK to repo local .dotnet directory to avoid potential permission issues. - if [[ -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then + if [[ $global_json_has_runtimes == false && -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then dotnet_root="$DOTNET_INSTALL_DIR" else dotnet_root="$repo_root/.dotnet" + export DOTNET_INSTALL_DIR="$dotnet_root" if [[ ! -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then @@ -149,16 +150,34 @@ function InitializeDotNetCli { function InstallDotNetSdk { local root=$1 local version=$2 + local architecture="" + if [[ $# == 3 ]]; then + architecture=$3 + fi + InstallDotNet "$root" "$version" $architecture +} +function InstallDotNet { + local root=$1 + local version=$2 + GetDotNetInstallScript "$root" local install_script=$_GetDotNetInstallScript - local arch_arg="" - if [[ $# == 3 ]]; then - arch_arg="--architecture $3" + local archArg='' + if [[ "$#" -ge "3" ]]; then + archArg="--architecture $3" + fi + local runtimeArg='' + if [[ "$#" -ge "4" ]]; then + runtimeArg="--runtime $4" fi - bash "$install_script" --version $version --install-dir "$root" $arch_arg || { + local skipNonVersionedFilesArg="" + if [[ "$#" -ge "5" ]]; then + skipNonVersionedFilesArg="--skip-non-versioned-files" + fi + bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { local exit_code=$? echo "Failed to install dotnet SDK (exit code '$exit_code')." >&2 ExitWithExitCode $exit_code @@ -323,6 +342,12 @@ log_dir="$artifacts_dir/log/$configuration" temp_dir="$artifacts_dir/tmp/$configuration" global_json_file="$repo_root/global.json" +# determine if global.json contains a "runtimes" entry +global_json_has_runtimes=false +dotnetlocal_key=`grep -m 1 "runtimes" "$global_json_file"` || true +if [[ -n "$dotnetlocal_key" ]]; then + global_json_has_runtimes=true +fi # HOME may not be defined in some scenarios, but it is required by NuGet if [[ -z $HOME ]]; then @@ -337,4 +362,4 @@ mkdir -p "$log_dir" if [[ $ci == true ]]; then export TEMP="$temp_dir" export TMP="$temp_dir" -fi +fi \ No newline at end of file diff --git a/global.json b/global.json index f5752f4c55e4..65c9d84526f2 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "3.0.100-preview6-011681" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19229.8", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19229.8", + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19256.12", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19256.12", "Microsoft.NET.Sdk.IL": "3.0.0-preview6-27705-72" } } From 81c86d9b8851eb45fef4894af54ae9a875f59e44 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 7 May 2019 20:54:14 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20190507.3 - Microsoft.DotNet.XUnitExtensions - 2.4.0-beta.19257.3 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19257.3 - Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19257.3 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19257.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19257.3 - Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19257.3 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19257.3 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19257.3 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19257.3 - Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19257.3 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19257.3 - Microsoft.DotNet.GenFacades - 1.0.0-beta.19257.3 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19257.3 - Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19257.3 --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++++--------- global.json | 4 +-- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2955a91adc54..9d92c220b94e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,65 +34,65 @@ https://github.com/dotnet/corefx bd278630dd08914ef521e62658afb69845c5b93a - + https://github.com/dotnet/arcade - c31fac9f6899094226cb5cd77c85b8f60ecafa3d + b1d8ba9936d10e8d287474e28278477d2126742a https://github.com/dotnet/standard e94d4263f03ced7269275c10a59d1dddb0c76b7c - + https://github.com/dotnet/arcade - c31fac9f6899094226cb5cd77c85b8f60ecafa3d + b1d8ba9936d10e8d287474e28278477d2126742a - + https://github.com/dotnet/arcade - c31fac9f6899094226cb5cd77c85b8f60ecafa3d + b1d8ba9936d10e8d287474e28278477d2126742a - + https://github.com/dotnet/arcade - c31fac9f6899094226cb5cd77c85b8f60ecafa3d + b1d8ba9936d10e8d287474e28278477d2126742a - + https://github.com/dotnet/arcade - c31fac9f6899094226cb5cd77c85b8f60ecafa3d + b1d8ba9936d10e8d287474e28278477d2126742a - + https://github.com/dotnet/arcade - c31fac9f6899094226cb5cd77c85b8f60ecafa3d + b1d8ba9936d10e8d287474e28278477d2126742a - + https://github.com/dotnet/arcade - c31fac9f6899094226cb5cd77c85b8f60ecafa3d + b1d8ba9936d10e8d287474e28278477d2126742a - + https://github.com/dotnet/arcade - c31fac9f6899094226cb5cd77c85b8f60ecafa3d + b1d8ba9936d10e8d287474e28278477d2126742a - + https://github.com/dotnet/arcade - c31fac9f6899094226cb5cd77c85b8f60ecafa3d + b1d8ba9936d10e8d287474e28278477d2126742a - + https://github.com/dotnet/arcade - c31fac9f6899094226cb5cd77c85b8f60ecafa3d + b1d8ba9936d10e8d287474e28278477d2126742a - + https://github.com/dotnet/arcade - c31fac9f6899094226cb5cd77c85b8f60ecafa3d + b1d8ba9936d10e8d287474e28278477d2126742a - + https://github.com/dotnet/arcade - c31fac9f6899094226cb5cd77c85b8f60ecafa3d + b1d8ba9936d10e8d287474e28278477d2126742a - + https://github.com/dotnet/arcade - c31fac9f6899094226cb5cd77c85b8f60ecafa3d + b1d8ba9936d10e8d287474e28278477d2126742a - + https://github.com/dotnet/arcade - c31fac9f6899094226cb5cd77c85b8f60ecafa3d + b1d8ba9936d10e8d287474e28278477d2126742a https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 16f1931808d9..9d01573dd803 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,18 +23,18 @@ - 1.0.0-beta.19256.12 - 1.0.0-beta.19256.12 - 1.0.0-beta.19256.12 - 1.0.0-beta.19256.12 - 2.4.0-beta.19256.12 - 2.5.1-beta.19256.12 - 1.0.0-beta.19256.12 - 1.0.0-beta.19256.12 - 1.0.0-beta.19256.12 - 1.0.0-beta.19256.12 - 2.2.0-beta.19256.12 - 1.0.0-beta.19256.12 + 1.0.0-beta.19257.3 + 1.0.0-beta.19257.3 + 1.0.0-beta.19257.3 + 1.0.0-beta.19257.3 + 2.4.0-beta.19257.3 + 2.5.1-beta.19257.3 + 1.0.0-beta.19257.3 + 1.0.0-beta.19257.3 + 1.0.0-beta.19257.3 + 1.0.0-beta.19257.3 + 2.2.0-beta.19257.3 + 1.0.0-beta.19257.3 3.0.0-preview6-27705-02 3.0.0-preview6-27705-02 diff --git a/global.json b/global.json index 65c9d84526f2..a377c555c93f 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "3.0.100-preview6-011681" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19256.12", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19256.12", + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19257.3", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19257.3", "Microsoft.NET.Sdk.IL": "3.0.0-preview6-27705-72" } }