From 169e3b00fe4ca8e8bdc1014ffb9be12522dc38d4 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Wed, 15 May 2019 12:11:39 +0000 Subject: [PATCH 001/471] Update dependencies from https://github.com/dotnet/arcade build 20190514.13 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19264.13 --- eng/Version.Details.xml | 4 ++-- eng/common/PublishToPackageFeed.proj | 1 + eng/common/cross/arm64/sources.list.buster | 11 +++++++++++ eng/common/cross/arm64/sources.list.stretch | 12 ++++++++++++ eng/common/cross/build-rootfs.sh | 17 +++++++++++++---- eng/common/darc-init.ps1 | 9 +++++---- eng/common/darc-init.sh | 13 +++++++++++-- global.json | 4 ++-- 8 files changed, 57 insertions(+), 14 deletions(-) create mode 100644 eng/common/cross/arm64/sources.list.buster create mode 100644 eng/common/cross/arm64/sources.list.stretch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4f9e0efa..6513dd650 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - e6712584bba6e2f0e35a3704793c459ff97c09af + 670f6ee1a619a2a7c84cfdfe2a1c84fbe94e1c6b diff --git a/eng/common/PublishToPackageFeed.proj b/eng/common/PublishToPackageFeed.proj index e17f72644..9120b2d21 100644 --- a/eng/common/PublishToPackageFeed.proj +++ b/eng/common/PublishToPackageFeed.proj @@ -53,6 +53,7 @@ https://dotnetfeed.blob.core.windows.net/dotnet-toolset/index.json https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json https://dotnetfeed.blob.core.windows.net/nuget-nugetclient/index.json + https://dotnetfeed.blob.core.windows.net/aspnet-entityframework6/index.json ]" + echo "Usage: $0 [BuildArch] [LinuxCodeName] [lldbx.y] [--skipunmount] --rootfsdir ]" echo "BuildArch can be: arm(default), armel, arm64, x86" echo "LinuxCodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine" @@ -113,12 +113,12 @@ while :; do __LinuxCodeName=trusty fi ;; - xenial) # Ubunry 16.04 + xenial) # Ubuntu 16.04 if [ "$__LinuxCodeName" != "jessie" ]; then __LinuxCodeName=xenial fi ;; - zesty) # Ununtu 17.04 + zesty) # Ubuntu 17.04 if [ "$__LinuxCodeName" != "jessie" ]; then __LinuxCodeName=zesty fi @@ -132,7 +132,16 @@ while :; do __LinuxCodeName=jessie __UbuntuRepo="http://ftp.debian.org/debian/" ;; - # TBD Stretch -> Debian 9, Buster -> Debian 10 + stretch) # Debian 9 + __LinuxCodeName=stretch + __UbuntuRepo="http://ftp.debian.org/debian/" + __LLDB_Package="liblldb-6.0-dev" + ;; + buster) # Debian 10 + __LinuxCodeName=buster + __UbuntuRepo="http://ftp.debian.org/debian/" + __LLDB_Package="liblldb-6.0-dev" + ;; tizen) if [ "$__BuildArch" != "armel" ]; then echo "Tizen is available only for armel." diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 823d72a37..dea7cdd90 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,5 +1,6 @@ param ( - $darcVersion = $null + $darcVersion = $null, + $versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16" ) $verbosity = "m" @@ -16,10 +17,10 @@ function InstallDarcCli ($darcVersion) { Invoke-Expression "& `"$dotnet`" tool uninstall $darcCliPackageName -g" } - # Until we can anonymously query the BAR API for the latest arcade-services - # build applied to the PROD channel, this is hardcoded. + # If the user didn't explicitly specify the darc version, + # query the Maestro API for the correct version of darc to install. if (-not $darcVersion) { - $darcVersion = '1.1.0-beta.19258.3' + $darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content } $arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json' diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 36d675738..abdd0bc05 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash source="${BASH_SOURCE[0]}" -darcVersion="1.1.0-beta.19258.3" +darcVersion='' +versionEndpoint="https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16" while [[ $# > 0 ]]; do opt="$(echo "$1" | awk '{print tolower($0)}')" @@ -10,6 +11,10 @@ while [[ $# > 0 ]]; do darcVersion=$2 shift ;; + --versionendpoint) + versionEndpoint=$2 + shift + ;; *) echo "Invalid argument: $1" usage @@ -33,6 +38,10 @@ verbosity=m . "$scriptroot/tools.sh" +if [ -z "$darcVersion" ]; then + darcVersion=$(curl -X GET "$versionEndpoint" -H "accept: text/plain") +fi + function InstallDarcCli { local darc_cli_package_name="microsoft.dotnet.darc" @@ -47,7 +56,7 @@ function InstallDarcCli { local arcadeServicesSource="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" - echo "Installing Darc CLI version $toolset_version..." + echo "Installing Darc CLI version $darcVersion..." 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 $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g) } diff --git a/global.json b/global.json index 1e1c1ac9b..fd1dcf235 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,8 @@ { "tools": { - "dotnet": "3.0.100-preview4-011223" + "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19263.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19264.13" } } From ba04c20cbffa96d9db906a009a9246fe3a383d40 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Thu, 16 May 2019 12:10:41 +0000 Subject: [PATCH 002/471] Update dependencies from https://github.com/dotnet/arcade build 20190516.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19266.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6513dd650..efbdcd9a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 670f6ee1a619a2a7c84cfdfe2a1c84fbe94e1c6b + 37c11672ee11dc2b3365b95a29e0c012f44032be diff --git a/global.json b/global.json index fd1dcf235..b09b8ea0b 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19264.13" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19266.2" } } From c8d671d46fc6d94819a3389acd7c3b39e377a6b5 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Fri, 17 May 2019 12:10:18 +0000 Subject: [PATCH 003/471] Update dependencies from https://github.com/dotnet/arcade build 20190516.4 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19266.4 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efbdcd9a2..f5780fb89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 37c11672ee11dc2b3365b95a29e0c012f44032be + 61cc7d4d347300835925ce5245bfc3ecb6b621d7 diff --git a/global.json b/global.json index b09b8ea0b..4ae3fa6c3 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19266.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19266.4" } } From 9866df174039d9f8e32764e79459b76fbd8024d6 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Sat, 18 May 2019 12:09:41 +0000 Subject: [PATCH 004/471] Update dependencies from https://github.com/dotnet/arcade build 20190517.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19267.7 --- eng/Version.Details.xml | 4 ++-- eng/common/build.ps1 | 4 ++++ eng/common/dotnet-install.ps1 | 11 ++++++++--- global.json | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5780fb89..d68ec38c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 61cc7d4d347300835925ce5245bfc3ecb6b621d7 + 55ce2900743cb609e51e2c6487e87e42eb627880 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index d7e3799eb..67046a43f 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -1,6 +1,7 @@ [CmdletBinding(PositionalBinding=$false)] Param( [string][Alias('c')]$configuration = "Debug", + [string]$platform = $null, [string] $projects, [string][Alias('v')]$verbosity = "minimal", [string] $msbuildEngine = $null, @@ -29,6 +30,7 @@ Param( function Print-Usage() { Write-Host "Common settings:" Write-Host " -configuration Build configuration: 'Debug' or 'Release' (short: -c)" + Write-Host " -platform Platform configuration: 'x86', 'x64' or any valid Platform value to pass to msbuild" Write-Host " -verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)" Write-Host " -binaryLog Output binary log (short: -bl)" Write-Host " -help Print help and exit" @@ -77,6 +79,7 @@ function Build { InitializeCustomToolset $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.binlog") } else { "" } + $platformArg = if ($platform) { "/p:Platform=$platform" } else { "" } if ($projects) { # Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons. @@ -88,6 +91,7 @@ function Build { MSBuild $toolsetBuildProj ` $bl ` + $platformArg ` /p:Configuration=$configuration ` /p:RepoRoot=$RepoRoot ` /p:Restore=$restore ` diff --git a/eng/common/dotnet-install.ps1 b/eng/common/dotnet-install.ps1 index 5987943fd..0b629b830 100644 --- a/eng/common/dotnet-install.ps1 +++ b/eng/common/dotnet-install.ps1 @@ -8,9 +8,14 @@ Param( . $PSScriptRoot\tools.ps1 +$dotnetRoot = Join-Path $RepoRoot ".dotnet" + +$installdir = $dotnetRoot try { - $dotnetRoot = Join-Path $RepoRoot ".dotnet" - InstallDotNet $dotnetRoot $version $architecture $runtime $true + if ($architecture -and $architecture.Trim() -eq "x86") { + $installdir = Join-Path $installdir "x86" + } + InstallDotNet $installdir $version $architecture $runtime $true } catch { Write-Host $_ @@ -19,4 +24,4 @@ catch { ExitWithExitCode 1 } -ExitWithExitCode 0 \ No newline at end of file +ExitWithExitCode 0 diff --git a/global.json b/global.json index 4ae3fa6c3..32837536d 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19266.4" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19267.7" } } From ae8a506499b156cf5190eebb7db6ac6d77a31e5d Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Sun, 19 May 2019 12:08:55 +0000 Subject: [PATCH 005/471] Update dependencies from https://github.com/dotnet/arcade build 20190518.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19268.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d68ec38c5..e4ec83b13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 55ce2900743cb609e51e2c6487e87e42eb627880 + 6d0514d3da59137630b9add5b5e619bce2631f02 diff --git a/global.json b/global.json index 32837536d..cafa7b374 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19267.7" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19268.2" } } From 4d39411e8de5584d74d46c914efeacfb540a4d49 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Mon, 20 May 2019 12:08:21 +0000 Subject: [PATCH 006/471] Update dependencies from https://github.com/dotnet/arcade build 20190520.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19270.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4ec83b13..36cb3862c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 6d0514d3da59137630b9add5b5e619bce2631f02 + e913fb3b02d4089a91ff91c041c5f6e7c29038b0 diff --git a/global.json b/global.json index cafa7b374..ced7fd51f 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19268.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19270.1" } } From 193483ddd826c5eb0b4331aa28690412a38b25bd Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 21 May 2019 12:09:57 +0000 Subject: [PATCH 007/471] Update dependencies from https://github.com/dotnet/arcade build 20190520.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19270.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36cb3862c..cd90bcc63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - e913fb3b02d4089a91ff91c041c5f6e7c29038b0 + 3b0760f8789d5d4bd146b36bd9051696d7a56bfa diff --git a/global.json b/global.json index ced7fd51f..419057eaf 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19270.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19270.2" } } From b6436a3dbef51198458af2239347e3fbf2dce831 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Wed, 22 May 2019 12:11:57 +0000 Subject: [PATCH 008/471] Update dependencies from https://github.com/dotnet/arcade build 20190521.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19271.7 --- eng/Version.Details.xml | 4 +- eng/common/build.sh | 5 ++ eng/common/tools.ps1 | 6 ++- eng/common/tools.sh | 115 ++++++++++++++++++++++++++++++++++++---- global.json | 2 +- 5 files changed, 119 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd90bcc63..df3e96ee5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 3b0760f8789d5d4bd146b36bd9051696d7a56bfa + 7a6fb6528b2060cd9e3a3d92535f5b6fdc6b2e82 diff --git a/eng/common/build.sh b/eng/common/build.sh index ce846d888..6236fc4d3 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -66,6 +66,7 @@ ci=false warn_as_error=true node_reuse=true binary_log=false +pipelines_log=false projects='' configuration='Debug' @@ -92,6 +93,9 @@ while [[ $# > 0 ]]; do -binarylog|-bl) binary_log=true ;; + -pipelineslog|-pl) + pipelines_log=true + ;; -restore|-r) restore=true ;; @@ -146,6 +150,7 @@ while [[ $# > 0 ]]; do done if [[ "$ci" == true ]]; then + pipelines_log=true binary_log=true node_reuse=false fi diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9ca177b82..9cea610a2 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -213,7 +213,11 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = if ($env:VSINSTALLDIR -ne $null) { $msbuildCmd = Get-Command "msbuild.exe" -ErrorAction SilentlyContinue if ($msbuildCmd -ne $null) { - if ($msbuildCmd.Version -ge $vsMinVersion) { + # Workaround for https://github.com/dotnet/roslyn/issues/35793 + # Due to this issue $msbuildCmd.Version returns 0.0.0.0 for msbuild.exe 16.2+ + $msbuildVersion = [Version]::new((Get-Item $msbuildCmd.Path).VersionInfo.ProductVersion.Split(@('-', '+'))[0]) + + if ($msbuildVersion -ge $vsMinVersion) { return $global:_MSBuildExe = $msbuildCmd.Path } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index df3eb8bce..34a23e947 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -1,8 +1,20 @@ +#!/usr/bin/env bash + # Initialize variables if they aren't already defined. # CI mode - set to true on CI server for PR validation build or official build. ci=${ci:-false} +# Set to true to use the pipelines logger which will enable Azure logging output. +# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md +# This flag is meant as a temporary opt-opt for the feature while validate it across +# our consumers. It will be deleted in the future. +if [[ "$ci" == true ]]; then + pipelines_log=${pipelines_log:-true} +else + pipelines_log=${pipelines_log:-false} +fi + # Build configuration. Common values include 'Debug' and 'Release', but the repository may use other names. configuration=${configuration:-'Debug'} @@ -40,6 +52,78 @@ else use_global_nuget_cache=${use_global_nuget_cache:-true} fi +function EmitError { + if [[ "$ci" != true ]]; then + echo "$@" >&2 + return + fi + + message_type="error" + sourcepath='' + linenumber='' + columnnumber='' + error_code='' + + while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" + case "$opt" in + -type|-t) + message_type=$2 + shift + ;; + -sourcepath|-s) + sourcepath=$2 + shift + ;; + -linenumber|-l) + linenumber=$2 + shift + ;; + -columnnumber|-col) + columnnumber=$2 + shift + ;; + -code|-c) + error_code=$2 + shift + ;; + *) + break + ;; + esac + + shift + done + + message='##vso[task.logissue' + + message="$message type=$message_type" + + if [ -n "$sourcepath" ]; then + message="$message;sourcepath=$sourcepath" + else + message="$message;sourcepath=${BASH_SOURCE[1]}" + fi + + if [ -n "$linenumber" ]; then + message="$message;linenumber=$linenumber" + else + message="$message;linenumber=${BASH_LINENO[0]}" + fi + + if [ -n "$columnnumber" ]; then + message="$message;columnnumber=$columnnumber" + fi + + if [ -n "$error_code" ]; then + message="$message;code=$error_code" + fi + + message="$message]$*" + + echo "$message" +} + # Resolve any symlinks in the given path. function ResolvePath { local path=$1 @@ -65,7 +149,7 @@ function ReadGlobalVersion { local pattern="\"$key\" *: *\"(.*)\"" if [[ ! $line =~ $pattern ]]; then - echo "Error: Cannot find \"$key\" in $global_json_file" >&2 + EmitError "Error: Cannot find \"$key\" in $global_json_file" ExitWithExitCode 1 fi @@ -126,7 +210,7 @@ function InitializeDotNetCli { if [[ "$install" == true ]]; then InstallDotNetSdk "$dotnet_root" "$dotnet_sdk_version" else - echo "Unable to find dotnet with SDK version '$dotnet_sdk_version'" >&2 + EmitError "Unable to find dotnet with SDK version '$dotnet_sdk_version'" ExitWithExitCode 1 fi fi @@ -179,7 +263,7 @@ function InstallDotNet { 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 + EmitError "Failed to install dotnet SDK (exit code '$exit_code')." ExitWithExitCode $exit_code } } @@ -216,6 +300,7 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" + _InitializeBuildToolFramework="netcoreapp2.1" } function GetNuGetPackageCachePath { @@ -264,7 +349,7 @@ function InitializeToolset { fi if [[ "$restore" != true ]]; then - echo "Toolset version $toolsetVersion has not been restored." >&2 + EmitError "Toolset version $toolsetVersion has not been restored." ExitWithExitCode 2 fi @@ -276,12 +361,12 @@ function InitializeToolset { fi echo '' > "$proj" - MSBuild "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file" + MSBuild-Core "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file" local toolset_build_proj=`cat "$toolset_location_file"` if [[ ! -a "$toolset_build_proj" ]]; then - echo "Invalid toolset path: $toolset_build_proj" >&2 + EmitError "Invalid toolset path: $toolset_build_proj" ExitWithExitCode 3 fi @@ -304,14 +389,26 @@ function StopProcesses { } function MSBuild { + args=$@ + if [[ "$pipelines_log" == true ]]; then + InitializeBuildTool + InitializeToolset + _toolset_dir="${_InitializeToolset%/*}" + _loggerPath="$_toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" + args=( "${args[@]}" "-logger:$_loggerPath" ) + fi + MSBuild-Core ${args[@]} +} + +function MSBuild-Core { if [[ "$ci" == true ]]; then if [[ "$binary_log" != true ]]; then - echo "Binary log must be enabled in CI build." >&2 + EmitError "Binary log must be enabled in CI build." ExitWithExitCode 1 fi if [[ "$node_reuse" == true ]]; then - echo "Node reuse must be disabled in CI build." >&2 + EmitError "Node reuse must be disabled in CI build." ExitWithExitCode 1 fi fi @@ -325,7 +422,7 @@ function MSBuild { "$_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 + EmitError "Build failed (exit code '$exit_code')." ExitWithExitCode $exit_code } } diff --git a/global.json b/global.json index 419057eaf..99a57f3be 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19270.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19271.7" } } From 39bd247a9d56bd359fb05a29121758a36891cfab Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Thu, 23 May 2019 12:12:19 +0000 Subject: [PATCH 009/471] Update dependencies from https://github.com/dotnet/arcade build 20190522.13 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19272.13 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/steps/send-to-helix.yml | 3 +++ global.json | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df3e96ee5..b53b65e83 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 7a6fb6528b2060cd9e3a3d92535f5b6fdc6b2e82 + 86e674361bdcefecbd8199ab62d0b1a6cb25703d diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml index d1ce577db..05df886f5 100644 --- a/eng/common/templates/steps/send-to-helix.yml +++ b/eng/common/templates/steps/send-to-helix.yml @@ -5,6 +5,7 @@ parameters: 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 of queues HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixConfiguration: '' # optional -- additional property attached to a job 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 @@ -35,6 +36,7 @@ steps: HelixSource: ${{ parameters.HelixSource }} HelixType: ${{ parameters.HelixType }} HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} HelixTargetQueues: ${{ parameters.HelixTargetQueues }} HelixAccessToken: ${{ parameters.HelixAccessToken }} HelixPreCommands: ${{ parameters.HelixPreCommands }} @@ -64,6 +66,7 @@ steps: HelixSource: ${{ parameters.HelixSource }} HelixType: ${{ parameters.HelixType }} HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} HelixTargetQueues: ${{ parameters.HelixTargetQueues }} HelixAccessToken: ${{ parameters.HelixAccessToken }} HelixPreCommands: ${{ parameters.HelixPreCommands }} diff --git a/global.json b/global.json index 99a57f3be..3b4838e4e 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19271.7" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19272.13" } } From 7f101dbf65ef1b5109401af7487a22962f273aa6 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Fri, 24 May 2019 12:12:50 +0000 Subject: [PATCH 010/471] Update dependencies from https://github.com/dotnet/arcade build 20190523.11 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19273.11 --- eng/Version.Details.xml | 4 ++-- eng/common/tools.sh | 9 +++++---- global.json | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b53b65e83..1feee4aa2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 86e674361bdcefecbd8199ab62d0b1a6cb25703d + 02a90cc69d2d32bbde9e6e0e41186711c591de27 diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 34a23e947..fd26f6fbb 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -389,14 +389,15 @@ function StopProcesses { } function MSBuild { - args=$@ + local args=$@ if [[ "$pipelines_log" == true ]]; then InitializeBuildTool InitializeToolset - _toolset_dir="${_InitializeToolset%/*}" - _loggerPath="$_toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" - args=( "${args[@]}" "-logger:$_loggerPath" ) + local toolset_dir="${_InitializeToolset%/*}" + local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" + args=( "${args[@]}" "-logger:$logger_path" ) fi + MSBuild-Core ${args[@]} } diff --git a/global.json b/global.json index 3b4838e4e..a645ac656 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19272.13" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19273.11" } } From 320458b0c3c138916cfc1d284962ca9d4061f80c Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Sat, 25 May 2019 12:11:31 +0000 Subject: [PATCH 011/471] Update dependencies from https://github.com/dotnet/arcade build 20190524.6 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19274.6 --- eng/Version.Details.xml | 4 ++-- eng/common/PublishToPackageFeed.proj | 1 + global.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1feee4aa2..428c6ebde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 02a90cc69d2d32bbde9e6e0e41186711c591de27 + b5016f5688dc8ca9f3e4811ee7e2e86ad8907a40 diff --git a/eng/common/PublishToPackageFeed.proj b/eng/common/PublishToPackageFeed.proj index 9120b2d21..a1b133372 100644 --- a/eng/common/PublishToPackageFeed.proj +++ b/eng/common/PublishToPackageFeed.proj @@ -54,6 +54,7 @@ https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json https://dotnetfeed.blob.core.windows.net/nuget-nugetclient/index.json https://dotnetfeed.blob.core.windows.net/aspnet-entityframework6/index.json + https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json Date: Wed, 29 May 2019 12:13:35 +0000 Subject: [PATCH 012/471] Update dependencies from https://github.com/dotnet/arcade build 20190528.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19278.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 428c6ebde..79d7c3b80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - b5016f5688dc8ca9f3e4811ee7e2e86ad8907a40 + 11f90a2a260422201895de58e57170131ab4efe7 diff --git a/global.json b/global.json index c4af47e20..f6977637a 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19274.6" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19278.1" } } From 1bebddda422a7985d9fddd3a366aa1e23cc2b75c Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Thu, 30 May 2019 12:13:34 +0000 Subject: [PATCH 013/471] Update dependencies from https://github.com/dotnet/arcade build 20190529.5 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19279.5 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79d7c3b80..f05e89b86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 11f90a2a260422201895de58e57170131ab4efe7 + fb62c6377a6bd163af2a7516260f064498942585 diff --git a/global.json b/global.json index f6977637a..8a7ccf379 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19278.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19279.5" } } From 3418a926267389dfdd69e55c1feeaa48c6597dbd Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Fri, 31 May 2019 12:10:52 +0000 Subject: [PATCH 014/471] Update dependencies from https://github.com/dotnet/arcade build 20190530.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19280.2 --- eng/Version.Details.xml | 4 +- eng/common/LoggingCommandFunctions.ps1 | 146 +++++++++++++++++++++++++ eng/common/build.ps1 | 3 +- eng/common/tools.ps1 | 103 +++++++++++++---- global.json | 2 +- 5 files changed, 231 insertions(+), 27 deletions(-) create mode 100644 eng/common/LoggingCommandFunctions.ps1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f05e89b86..bcbf4a176 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - fb62c6377a6bd163af2a7516260f064498942585 + 7c50d548001a83a18449ad4dda370122ede5fbf6 diff --git a/eng/common/LoggingCommandFunctions.ps1 b/eng/common/LoggingCommandFunctions.ps1 new file mode 100644 index 000000000..c225eaecb --- /dev/null +++ b/eng/common/LoggingCommandFunctions.ps1 @@ -0,0 +1,146 @@ +# Source for this file was taken from https://github.com/microsoft/azure-pipelines-task-lib/blob/11c9439d4af17e6475d9fe058e6b2e03914d17e6/powershell/VstsTaskSdk/LoggingCommandFunctions.ps1 + +# NOTE: You should not be calling these method directly as they are likely to change. Instead you should be calling the Write-Pipeline* functions defined in tools.ps1 + +$script:loggingCommandPrefix = '##vso[' +$script:loggingCommandEscapeMappings = @( # TODO: WHAT ABOUT "="? WHAT ABOUT "%"? + New-Object psobject -Property @{ Token = ';' ; Replacement = '%3B' } + New-Object psobject -Property @{ Token = "`r" ; Replacement = '%0D' } + New-Object psobject -Property @{ Token = "`n" ; Replacement = '%0A' } + New-Object psobject -Property @{ Token = "]" ; Replacement = '%5D' } +) +# TODO: BUG: Escape % ??? +# TODO: Add test to verify don't need to escape "=". + +<######################################## +# Private functions. +########################################> +function Format-LoggingCommandData { + [CmdletBinding()] + param([string]$Value, [switch]$Reverse) + + if (!$Value) { + return '' + } + + if (!$Reverse) { + foreach ($mapping in $script:loggingCommandEscapeMappings) { + $Value = $Value.Replace($mapping.Token, $mapping.Replacement) + } + } else { + for ($i = $script:loggingCommandEscapeMappings.Length - 1 ; $i -ge 0 ; $i--) { + $mapping = $script:loggingCommandEscapeMappings[$i] + $Value = $Value.Replace($mapping.Replacement, $mapping.Token) + } + } + + return $Value +} + +function Format-LoggingCommand { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Area, + [Parameter(Mandatory = $true)] + [string]$Event, + [string]$Data, + [hashtable]$Properties) + + # Append the preamble. + [System.Text.StringBuilder]$sb = New-Object -TypeName System.Text.StringBuilder + $null = $sb.Append($script:loggingCommandPrefix).Append($Area).Append('.').Append($Event) + + # Append the properties. + if ($Properties) { + $first = $true + foreach ($key in $Properties.Keys) { + [string]$value = Format-LoggingCommandData $Properties[$key] + if ($value) { + if ($first) { + $null = $sb.Append(' ') + $first = $false + } else { + $null = $sb.Append(';') + } + + $null = $sb.Append("$key=$value") + } + } + } + + # Append the tail and output the value. + $Data = Format-LoggingCommandData $Data + $sb.Append(']').Append($Data).ToString() +} + +function Write-LoggingCommand { + [CmdletBinding(DefaultParameterSetName = 'Parameters')] + param( + [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] + [string]$Area, + [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] + [string]$Event, + [Parameter(ParameterSetName = 'Parameters')] + [string]$Data, + [Parameter(ParameterSetName = 'Parameters')] + [hashtable]$Properties, + [Parameter(Mandatory = $true, ParameterSetName = 'Object')] + $Command, + [switch]$AsOutput) + + if ($PSCmdlet.ParameterSetName -eq 'Object') { + Write-LoggingCommand -Area $Command.Area -Event $Command.Event -Data $Command.Data -Properties $Command.Properties -AsOutput:$AsOutput + return + } + + $command = Format-LoggingCommand -Area $Area -Event $Event -Data $Data -Properties $Properties + if ($AsOutput) { + $command + } else { + Write-Host $command + } +} + +function Write-LogIssue { + [CmdletBinding()] + param( + [ValidateSet('warning', 'error')] + [Parameter(Mandatory = $true)] + [string]$Type, + [string]$Message, + [string]$ErrCode, + [string]$SourcePath, + [string]$LineNumber, + [string]$ColumnNumber, + [switch]$AsOutput) + + $command = Format-LoggingCommand -Area 'task' -Event 'logissue' -Data $Message -Properties @{ + 'type' = $Type + 'code' = $ErrCode + 'sourcepath' = $SourcePath + 'linenumber' = $LineNumber + 'columnnumber' = $ColumnNumber + } + if ($AsOutput) { + return $command + } + + if ($Type -eq 'error') { + $foregroundColor = $host.PrivateData.ErrorForegroundColor + $backgroundColor = $host.PrivateData.ErrorBackgroundColor + if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { + $foregroundColor = [System.ConsoleColor]::Red + $backgroundColor = [System.ConsoleColor]::Black + } + } else { + $foregroundColor = $host.PrivateData.WarningForegroundColor + $backgroundColor = $host.PrivateData.WarningBackgroundColor + if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { + $foregroundColor = [System.ConsoleColor]::Yellow + $backgroundColor = [System.ConsoleColor]::Black + } + } + + Write-Host $command -ForegroundColor $foregroundColor -BackgroundColor $backgroundColor +} \ No newline at end of file diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 67046a43f..4cb2ce489 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -133,9 +133,8 @@ try { Build } catch { - Write-Host $_ - Write-Host $_.Exception Write-Host $_.ScriptStackTrace + Write-PipelineTaskError -Message $_ ExitWithExitCode 1 } diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9cea610a2..3983d719b 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -92,6 +92,68 @@ function Exec-Process([string]$command, [string]$commandArgs) { } } +function Write-PipelineTaskError { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Message, + [Parameter(Mandatory = $false)] + [string]$Type = 'error', + [string]$ErrCode, + [string]$SourcePath, + [string]$LineNumber, + [string]$ColumnNumber, + [switch]$AsOutput) + + if(!$ci) { + if($Type -eq 'error') { + Write-Error $Message + return + } + elseif ($Type -eq 'warning') { + Write-Warning $Message + return + } + } + + if(($Type -ne 'error') -and ($Type -ne 'warning')) { + Write-Host $Message + return + } + if(-not $PSBoundParameters.ContainsKey('Type')) { + $PSBoundParameters.Add('Type', 'error') + } + Write-LogIssue @PSBoundParameters +} + +function Write-PipelineSetVariable { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Name, + [string]$Value, + [switch]$Secret, + [switch]$AsOutput) + + if($ci) { + Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $Value -Properties @{ + 'variable' = $Name + 'issecret' = $Secret + } -AsOutput:$AsOutput + } +} + +function Write-PipelinePrependPath { + [CmdletBinding()] + param( + [Parameter(Mandatory=$true)] + [string]$Path, + [switch]$AsOutput) + if($ci) { + Write-LoggingCommand -Area 'task' -Event 'prependpath' -Data $Path -AsOutput:$AsOutput + } +} + function InitializeDotNetCli([bool]$install) { if (Test-Path variable:global:_DotNetInstallDir) { return $global:_DotNetInstallDir @@ -134,7 +196,7 @@ function InitializeDotNetCli([bool]$install) { if ($install) { InstallDotNetSdk $dotnetRoot $dotnetSdkVersion } else { - Write-Host "Unable to find dotnet with SDK version '$dotnetSdkVersion'" -ForegroundColor Red + Write-PipelineTaskError "Unable to find dotnet with SDK version '$dotnetSdkVersion'" ExitWithExitCode 1 } } @@ -147,12 +209,10 @@ 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" - } + # Make Sure that our bootstrapped dotnet cli is avaliable in future steps of the Azure Pipelines build + Write-PipelinePrependPath -Path $dotnetRoot + Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' + Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot } @@ -184,7 +244,7 @@ function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $archit & $installScript @installParameters if ($lastExitCode -ne 0) { - Write-Host "Failed to install dotnet cli (exit code '$lastExitCode')." -ForegroundColor Red + Write-PipelineTaskError -Message "Failed to install dotnet cli (exit code '$lastExitCode')." ExitWithExitCode $lastExitCode } } @@ -358,7 +418,7 @@ function InitializeBuildTool() { if ($msbuildEngine -eq "dotnet") { if (!$dotnetRoot) { - Write-Host "/global.json must specify 'tools.dotnet'." -ForegroundColor Red + Write-PipelineTaskError "/global.json must specify 'tools.dotnet'." ExitWithExitCode 1 } @@ -367,13 +427,13 @@ function InitializeBuildTool() { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore } catch { - Write-Host $_ -ForegroundColor Red + Write-PipelineTaskError $_ ExitWithExitCode 1 } $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472" } } else { - Write-Host "Unexpected value of -msbuildEngine: '$msbuildEngine'." -ForegroundColor Red + Write-PipelineTaskError "Unexpected value of -msbuildEngine: '$msbuildEngine'." ExitWithExitCode 1 } @@ -390,7 +450,7 @@ function GetDefaultMSBuildEngine() { return "dotnet" } - Write-Host "-msbuildEngine must be specified, or /global.json must specify 'tools.dotnet' or 'tools.vs'." -ForegroundColor Red + Write-PipelineTaskError "-msbuildEngine must be specified, or /global.json must specify 'tools.dotnet' or 'tools.vs'." ExitWithExitCode 1 } @@ -441,7 +501,7 @@ function InitializeToolset() { } if (-not $restore) { - Write-Host "Toolset version $toolsetVersion has not been restored." -ForegroundColor Red + Write-PipelineTaskError "Toolset version $toolsetVersion has not been restored." ExitWithExitCode 1 } @@ -526,7 +586,7 @@ function MSBuild-Core() { $exitCode = Exec-Process $buildTool.Path $cmdArgs if ($exitCode -ne 0) { - Write-Host "Build failed." -ForegroundColor Red + Write-PipelineTaskError "Build failed." $buildLog = GetMSBuildBinaryLogCommandLineArgument $args if ($buildLog -ne $null) { @@ -554,6 +614,8 @@ function GetMSBuildBinaryLogCommandLineArgument($arguments) { return $null } +. $PSScriptRoot\LoggingCommandFunctions.ps1 + $RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "..\..") $EngRoot = Resolve-Path (Join-Path $PSScriptRoot "..") $ArtifactsDir = Join-Path $RepoRoot "artifacts" @@ -569,11 +631,8 @@ Create-Directory $ToolsetDir Create-Directory $TempDir Create-Directory $LogDir -if ($ci) { - Write-Host "##vso[task.setvariable variable=Artifacts]$ArtifactsDir" - Write-Host "##vso[task.setvariable variable=Artifacts.Toolset]$ToolsetDir" - Write-Host "##vso[task.setvariable variable=Artifacts.Log]$LogDir" - - $env:TEMP = $TempDir - $env:TMP = $TempDir -} +Write-PipelineSetVariable -Name 'Artifacts' -Value $ArtifactsDir +Write-PipelineSetVariable -Name 'Artifacts.Toolset' -Value $ToolsetDir +Write-PipelineSetVariable -Name 'Artifacts.Log' -Value $LogDir +Write-PipelineSetVariable -Name 'TEMP' -Value $TempDir +Write-PipelineSetVariable -Name 'TMP' -Value $TempDir diff --git a/global.json b/global.json index 8a7ccf379..d2d6016c5 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19279.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19280.2" } } From f34db6e1cb8c034a80404211e8c0f5ab6d84759c Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Sat, 1 Jun 2019 12:08:56 +0000 Subject: [PATCH 015/471] Update dependencies from https://github.com/dotnet/arcade build 20190531.5 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19281.5 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bcbf4a176..7c09359f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 7c50d548001a83a18449ad4dda370122ede5fbf6 + c901850aa1e175c124da771863dacc763743a520 diff --git a/global.json b/global.json index d2d6016c5..605ea48b3 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19280.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19281.5" } } From cff7863cac482345b975832aa710e682c757a17d Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Sun, 2 Jun 2019 12:08:03 +0000 Subject: [PATCH 016/471] Update dependencies from https://github.com/dotnet/arcade build 20190601.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19301.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c09359f9..264cdd76c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - c901850aa1e175c124da771863dacc763743a520 + 8fd0b50b9d689e8d87ab202f11b7c9fbe81271c4 diff --git a/global.json b/global.json index 605ea48b3..1c3b81381 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19281.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19301.2" } } From b47d352a48031ca1192cd9d520ae094ce0bad9eb Mon Sep 17 00:00:00 2001 From: William Li Date: Sun, 2 Jun 2019 19:35:45 -0700 Subject: [PATCH 017/471] Update branding to preview 7 --- src/redist/targets/Versions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index 0181f9835..d6b16b412 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -4,7 +4,7 @@ 0 1 00 - preview6 + preview7 From b87c3fa2d34aae5c13abfe4703b22f3f853a63e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Jun 2019 03:09:40 +0000 Subject: [PATCH 018/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190602.3 (#2255) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview6.19302.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview6.19302.3 - dotnet-watch - 3.0.0-preview6.19302.3 - dotnet-user-secrets - 3.0.0-preview6.19302.3 - dotnet-dev-certs - 3.0.0-preview6.19302.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview6.19302.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61337290a..04bfe36a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 63abc77da6d99470caa5bfa0465afe244105e595 - + https://github.com/aspnet/AspNetCore - 620c673705bb17b33cbc5ff32872d85a5fbf82b9 + 91e6839c8d0b3c1723f80ba839749a23ce52870c - + https://github.com/aspnet/AspNetCore - 620c673705bb17b33cbc5ff32872d85a5fbf82b9 + 91e6839c8d0b3c1723f80ba839749a23ce52870c - + https://github.com/aspnet/AspNetCore - 620c673705bb17b33cbc5ff32872d85a5fbf82b9 + 91e6839c8d0b3c1723f80ba839749a23ce52870c - + https://github.com/aspnet/AspNetCore - 620c673705bb17b33cbc5ff32872d85a5fbf82b9 + 91e6839c8d0b3c1723f80ba839749a23ce52870c - + https://github.com/aspnet/AspNetCore - 620c673705bb17b33cbc5ff32872d85a5fbf82b9 + 91e6839c8d0b3c1723f80ba839749a23ce52870c - + https://github.com/aspnet/AspNetCore - 620c673705bb17b33cbc5ff32872d85a5fbf82b9 + 91e6839c8d0b3c1723f80ba839749a23ce52870c https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 056f4e1d4..6b2bb6afc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview6.19302.2 - 3.0.0-preview6.19302.2 - 3.0.0-preview6.19302.2 - 3.0.0-preview6.19302.2 - 3.0.0-preview6.19302.2 - 3.0.0-preview6.19302.2 + 3.0.0-preview6.19302.3 + 3.0.0-preview6.19302.3 + 3.0.0-preview6.19302.3 + 3.0.0-preview6.19302.3 + 3.0.0-preview6.19302.3 + 3.0.0-preview6.19302.3 From 791c503b0c19b5a45bc4136bcbd3b868ffda8d0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Jun 2019 09:58:57 +0000 Subject: [PATCH 019/471] [master] Update dependencies from aspnet/AspNetCore (#2256) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190602.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview6.19302.4 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview6.19302.4 - dotnet-watch - 3.0.0-preview6.19302.4 - dotnet-user-secrets - 3.0.0-preview6.19302.4 - dotnet-dev-certs - 3.0.0-preview6.19302.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview6.19302.4 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190603.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview6.19303.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview6.19303.1 - dotnet-watch - 3.0.0-preview6.19303.1 - dotnet-user-secrets - 3.0.0-preview6.19303.1 - dotnet-dev-certs - 3.0.0-preview6.19303.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview6.19303.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04bfe36a7..85d6546d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 63abc77da6d99470caa5bfa0465afe244105e595 - + https://github.com/aspnet/AspNetCore - 91e6839c8d0b3c1723f80ba839749a23ce52870c + f0df10f211b5ea8192579808c223e82aab549268 - + https://github.com/aspnet/AspNetCore - 91e6839c8d0b3c1723f80ba839749a23ce52870c + f0df10f211b5ea8192579808c223e82aab549268 - + https://github.com/aspnet/AspNetCore - 91e6839c8d0b3c1723f80ba839749a23ce52870c + f0df10f211b5ea8192579808c223e82aab549268 - + https://github.com/aspnet/AspNetCore - 91e6839c8d0b3c1723f80ba839749a23ce52870c + f0df10f211b5ea8192579808c223e82aab549268 - + https://github.com/aspnet/AspNetCore - 91e6839c8d0b3c1723f80ba839749a23ce52870c + f0df10f211b5ea8192579808c223e82aab549268 - + https://github.com/aspnet/AspNetCore - 91e6839c8d0b3c1723f80ba839749a23ce52870c + f0df10f211b5ea8192579808c223e82aab549268 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 6b2bb6afc..5be33568f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview6.19302.3 - 3.0.0-preview6.19302.3 - 3.0.0-preview6.19302.3 - 3.0.0-preview6.19302.3 - 3.0.0-preview6.19302.3 - 3.0.0-preview6.19302.3 + 3.0.0-preview6.19303.1 + 3.0.0-preview6.19303.1 + 3.0.0-preview6.19303.1 + 3.0.0-preview6.19303.1 + 3.0.0-preview6.19303.1 + 3.0.0-preview6.19303.1 From c1240794d53b6e142ec3e7fbc62a04b3f29300f4 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Mon, 3 Jun 2019 12:08:55 +0000 Subject: [PATCH 020/471] Update dependencies from https://github.com/dotnet/arcade build 20190602.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19302.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 264cdd76c..7792f1bc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 8fd0b50b9d689e8d87ab202f11b7c9fbe81271c4 + e6a5d5f970bb872451c6310ae34eda31041fb552 diff --git a/global.json b/global.json index 1c3b81381..7e3008a0f 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19301.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19302.2" } } From 0ac325c266b76a6f45eb203125a6899f9f57c788 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Jun 2019 12:41:31 +0000 Subject: [PATCH 021/471] [master] Update dependencies from dotnet/toolset (#2249) * Update dependencies from https://github.com/dotnet/toolset build 20190602.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview6.19302.4 * Update dependencies from https://github.com/dotnet/toolset build 20190603.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview6.19303.1 * Update dependencies from https://github.com/dotnet/toolset build 20190603.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview6.19303.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85d6546d4..befce17f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 1b687f22bef2ba1ec7d4ff2f8c080b5c833e077c - + https://github.com/dotnet/toolset - 966c7f394f6b67e10e2474d990f1f25b7b173780 + 71bf2ee3451a4d8ddea27037a376ec695ef3f052 https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index 5be33568f..e3f0931a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview6.19302.3 + 3.0.100-preview6.19303.2 From 8e0f48a95956d5ee3157dfed030648b5d6a2c778 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Jun 2019 12:56:11 +0000 Subject: [PATCH 022/471] Update dependencies from https://github.com/dotnet/toolset build 20190603.3 (#2258) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview6.19303.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index befce17f4..fb389e3e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 1b687f22bef2ba1ec7d4ff2f8c080b5c833e077c - + https://github.com/dotnet/toolset - 71bf2ee3451a4d8ddea27037a376ec695ef3f052 + 891ce89398e5805d8ceaa34260b0a710130d05c1 https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index e3f0931a7..96ff34117 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview6.19303.2 + 3.0.100-preview6.19303.3 From 3aeb422efc3afd9f8ba0711a5d5c633f20725e1c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Jun 2019 13:11:46 +0000 Subject: [PATCH 023/471] Update dependencies from https://github.com/dotnet/toolset build 20190603.4 (#2259) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview6.19303.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb389e3e6..de929587b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 1b687f22bef2ba1ec7d4ff2f8c080b5c833e077c - + https://github.com/dotnet/toolset - 891ce89398e5805d8ceaa34260b0a710130d05c1 + cec9009be8cbd658f49d539ffc65650de26b6abb https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index 96ff34117..b6602390b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview6.19303.3 + 3.0.100-preview6.19303.4 From 8ae88e340d26ef1335746a9feb3464f66567dab9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Jun 2019 13:59:57 +0000 Subject: [PATCH 024/471] Update dependencies from https://github.com/dotnet/cli build 20190603.1 (#2260) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview6.19303.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de929587b..69e678283 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/sdk 2091d9e3d25dee185dcedf5cb0c2798837dd3a8d - + https://github.com/dotnet/cli - 0148f94d0af61b8047fa834257f8519ccb14e0ad + 27edae1963950346dfe497b5fbb84cbca6e0173a diff --git a/eng/Versions.props b/eng/Versions.props index b6602390b..c3a500b87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview6.19302.4 + 3.0.100-preview6.19303.1 1.0.2-beta5.19301.1 From bc3c913d3557bdba3d8870f8b6a71b1e883a66e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Jun 2019 14:21:04 +0000 Subject: [PATCH 025/471] Update dependencies from https://github.com/dotnet/cli build 20190603.2 (#2262) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview6.19303.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69e678283..f8c74f679 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/sdk 2091d9e3d25dee185dcedf5cb0c2798837dd3a8d - + https://github.com/dotnet/cli - 27edae1963950346dfe497b5fbb84cbca6e0173a + a3c7b41542ef75d2877c4200c767e5275b577a79 diff --git a/eng/Versions.props b/eng/Versions.props index c3a500b87..cdd804acf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview6.19303.1 + 3.0.100-preview6.19303.2 1.0.2-beta5.19301.1 From 1d6c0f9c02e24a0ced7fdd1898d6b2fe0e60ba30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Jun 2019 19:15:43 +0000 Subject: [PATCH 026/471] Update dependencies from https://github.com/dotnet/cli build 20190603.5 (#2267) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19303.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8c74f679..b24bc94d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/sdk 2091d9e3d25dee185dcedf5cb0c2798837dd3a8d - + https://github.com/dotnet/cli - a3c7b41542ef75d2877c4200c767e5275b577a79 + fe9d2a3b01ef92942c6872946b148a1037587f6a diff --git a/eng/Versions.props b/eng/Versions.props index cdd804acf..6b64ea586 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview6.19303.2 + 3.0.100-preview7.19303.5 1.0.2-beta5.19301.1 From 8cc9fb83ffd365a3bf8c255de29daa950fd1fe6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Jun 2019 14:41:02 -0700 Subject: [PATCH 027/471] Update dependencies from https://github.com/dotnet/standard build 20190603.1 (#2261) - NETStandard.Library - 2.1.0-prerelease.19303.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b24bc94d1..47e024723 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset cec9009be8cbd658f49d539ffc65650de26b6abb - + https://github.com/dotnet/standard - 5b593e7bb6f4f213c5b324f36c05c7581a1a3222 + c40f794cfbeda7b48122b930131188594d5dcc77 https://github.com/dotnet/sdk From 13c965fd0691a03615ea491eeaa16947b7028e68 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 3 Jun 2019 17:28:01 -0700 Subject: [PATCH 028/471] Remove unused NETStandard.Library (#2270) Unused and per-empted by NETStandard.Library.Ref --- eng/Version.Details.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47e024723..6a599812d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,10 +46,6 @@ https://github.com/dotnet/toolset cec9009be8cbd658f49d539ffc65650de26b6abb - - https://github.com/dotnet/standard - c40f794cfbeda7b48122b930131188594d5dcc77 - https://github.com/dotnet/sdk 2091d9e3d25dee185dcedf5cb0c2798837dd3a8d From b9d88fb38d32619bdeb84ac7e03fd60999934a70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Jun 2019 17:28:57 -0700 Subject: [PATCH 029/471] Update dependencies from https://github.com/dotnet/sdk build 20190531.6 (#2236) - Microsoft.NET.Sdk - 3.0.100-preview6.19281.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a599812d..59732ac3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset cec9009be8cbd658f49d539ffc65650de26b6abb - + https://github.com/dotnet/sdk - 2091d9e3d25dee185dcedf5cb0c2798837dd3a8d + 5bea321cf4616560b8b5fc4442f86be3dd99df2f https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 6b64ea586..7da943b7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview6.19281.4 + 3.0.100-preview6.19281.6 3.0.0-preview6-27730-01 From 7cbec05bd52b711f808453d03635ffd6398e5b66 Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 3 Jun 2019 17:30:28 -0700 Subject: [PATCH 030/471] correct branch info on master (#2253) --- src/CopyToLatest/targets/BranchInfo.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CopyToLatest/targets/BranchInfo.props b/src/CopyToLatest/targets/BranchInfo.props index d103b00f0..9bd214aa9 100644 --- a/src/CopyToLatest/targets/BranchInfo.props +++ b/src/CopyToLatest/targets/BranchInfo.props @@ -1,5 +1,5 @@ - release/3.0.1xx + master From 467f7d719a05ad10beaddf31a9c8a6fe5a3c75ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jun 2019 00:44:03 +0000 Subject: [PATCH 031/471] Update dependencies from https://github.com/dotnet/templating build 20190602.1 (#2257) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19302.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59732ac3e..cbf959daf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore f0df10f211b5ea8192579808c223e82aab549268 - + https://github.com/dotnet/templating - 1b687f22bef2ba1ec7d4ff2f8c080b5c833e077c + 6e7805d201f2fe43d7205101c238419dcef74fac https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 7da943b7a..ed53ea4a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19303.5 - 1.0.2-beta5.19301.1 + 1.0.2-beta5.19302.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From e5275d990f655e7722c43098a9d9b1e7cc54f0a5 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 3 Jun 2019 19:01:54 -0700 Subject: [PATCH 032/471] Add KnownFrameworkReference items for WPF and WindowsForms profiles --- .../targets/GenerateBundledVersions.targets | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 676d3748c..a2f854bdc 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -214,6 +214,32 @@ Copyright (c) .NET Foundation. All rights reserved. IsWindowsOnly="true" /> + + + + Date: Tue, 4 Jun 2019 04:22:18 +0000 Subject: [PATCH 033/471] [master] Update dependencies from dotnet/core-setup (#2277) * Update dependencies from https://github.com/dotnet/core-setup build 20190603.01 - Microsoft.NETCore.App - 3.0.0-preview7-27803-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27803-01 - NETStandard.Library.Ref - 2.1.0-preview7-27803-01 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview6.19301.3 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190603.11 - Microsoft.NETCore.App - 3.0.0-preview7-27803-11 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27803-11 - NETStandard.Library.Ref - 2.1.0-preview7-27803-11 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19303.7 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cbf959daf..01d81f314 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 63abc77da6d99470caa5bfa0465afe244105e595 + c113140681cdb8224dffc2da8df3e2f9bcbdc4a0 - + https://github.com/dotnet/core-setup - 63abc77da6d99470caa5bfa0465afe244105e595 + c113140681cdb8224dffc2da8df3e2f9bcbdc4a0 - + https://github.com/dotnet/core-setup - 63abc77da6d99470caa5bfa0465afe244105e595 + c113140681cdb8224dffc2da8df3e2f9bcbdc4a0 https://github.com/aspnet/AspNetCore @@ -59,9 +59,9 @@ https://github.com/dotnet/winforms 2c7ad6c0dc07d8b6cb86822ad2830e5ead35a749 - + https://github.com/dotnet/wpf - 8f2a49898b5feb0220d1effad0bdf6d258f9cb1e + db41c5dd6b6a92ca7670ef43aed4b640b99acc66 diff --git a/eng/Versions.props b/eng/Versions.props index ed53ea4a9..93634aa9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.0-preview6.19278.1 + 3.0.0-preview7.19303.7 @@ -47,7 +47,7 @@ 3.0.100-preview6.19281.6 - 3.0.0-preview6-27730-01 + 3.0.0-preview7-27803-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview6-27730-01 + 2.1.0-preview7-27803-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview6-27730-01 + 3.0.0-preview7-27803-11 $(MicrosoftWindowsDesktopAppPackageVersion) From bcdffb43552aa9e51fb230effcf15faf3613634f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jun 2019 04:26:46 +0000 Subject: [PATCH 034/471] Update dependencies from https://github.com/dotnet/sdk build 20190603.5 (#2280) - Microsoft.NET.Sdk - 3.0.100-preview7.19303.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01d81f314..e20962605 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset cec9009be8cbd658f49d539ffc65650de26b6abb - + https://github.com/dotnet/sdk - 5bea321cf4616560b8b5fc4442f86be3dd99df2f + 69d51538bdbdb03c758b924f887a6f596e590c7d https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 93634aa9d..2193d358a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview6.19281.6 + 3.0.100-preview7.19303.5 3.0.0-preview7-27803-11 From 6612380e93e9850781935465851461d056580935 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jun 2019 04:53:05 +0000 Subject: [PATCH 035/471] Update dependencies from https://github.com/dotnet/toolset build 20190603.6 (#2265) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19303.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e20962605..9d795a8ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 6e7805d201f2fe43d7205101c238419dcef74fac - + https://github.com/dotnet/toolset - cec9009be8cbd658f49d539ffc65650de26b6abb + 6fe747ae413e4978e661913e533ab543255ca274 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2193d358a..1e947281a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview6.19303.4 + 3.0.100-preview7.19303.6 From ffd60e603c027aad3b29e2faa69002eda0d6a40f Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 4 Jun 2019 12:12:11 +0000 Subject: [PATCH 036/471] Update dependencies from https://github.com/dotnet/arcade build 20190604.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19304.1 --- eng/Version.Details.xml | 4 +- eng/common/sdl/NuGet.config | 13 ++++ eng/common/sdl/execute-all-sdl-tools.ps1 | 97 ++++++++++++++++++++++++ eng/common/sdl/init-sdl.ps1 | 48 ++++++++++++ eng/common/sdl/packages.config | 4 + eng/common/sdl/push-gdn.ps1 | 51 +++++++++++++ eng/common/sdl/run-sdl.ps1 | 65 ++++++++++++++++ global.json | 2 +- 8 files changed, 281 insertions(+), 3 deletions(-) create mode 100644 eng/common/sdl/NuGet.config create mode 100644 eng/common/sdl/execute-all-sdl-tools.ps1 create mode 100644 eng/common/sdl/init-sdl.ps1 create mode 100644 eng/common/sdl/packages.config create mode 100644 eng/common/sdl/push-gdn.ps1 create mode 100644 eng/common/sdl/run-sdl.ps1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7792f1bc1..914de509f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - e6a5d5f970bb872451c6310ae34eda31041fb552 + d2599acd9703ef747dfb4329ec3e3beff182e755 diff --git a/eng/common/sdl/NuGet.config b/eng/common/sdl/NuGet.config new file mode 100644 index 000000000..0c5451c11 --- /dev/null +++ b/eng/common/sdl/NuGet.config @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 new file mode 100644 index 000000000..74080f22d --- /dev/null +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -0,0 +1,97 @@ +Param( + [string] $GuardianPackageName, # Required: the name of guardian CLI pacakge (not needed if GuardianCliLocation is specified) + [string] $NugetPackageDirectory, # Required: directory where NuGet packages are installed (not needed if GuardianCliLocation is specified) + [string] $GuardianCliLocation, # Optional: Direct location of Guardian CLI executable if GuardianPackageName & NugetPackageDirectory are not specified + [string] $Repository, # Required: the name of the repository (e.g. dotnet/arcade) + [string] $BranchName="master", # Optional: name of branch or version of gdn settings; defaults to master + [string] $SourceDirectory, # Required: the directory where source files are located + [string] $ArtifactsDirectory, # Required: the directory where build artifacts are located + [string] $DncEngAccessToken, # Required: access token for dnceng; should be provided via KeyVault + [string[]] $SourceToolsList, # Optional: list of SDL tools to run on source code + [string[]] $ArtifactToolsList, # Optional: list of SDL tools to run on built artifacts + [bool] $TsaPublish=$False, # Optional: true will publish results to TSA; only set to true after onboarding to TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaBranchName=$env:BUILD_SOURCEBRANCHNAME, # Optional: required for TSA publish; defaults to $(Build.SourceBranchName); TSA is the automated framework used to upload test results as bugs. + [string] $TsaRepositoryName, # Optional: TSA repository name; will be generated automatically if not submitted; TSA is the automated framework used to upload test results as bugs. + [string] $BuildNumber=$env:BUILD_BUILDNUMBER, # Optional: required for TSA publish; defaults to $(Build.BuildNumber) + [bool] $UpdateBaseline=$False, # Optional: if true, will update the baseline in the repository; should only be run after fixing any issues which need to be fixed + [bool] $TsaOnboard=$False, # Optional: if true, will onboard the repository to TSA; should only be run once; TSA is the automated framework used to upload test results as bugs. + [string] $TsaInstanceUrl, # Optional: only needed if TsaOnboard or TsaPublish is true; the instance-url registered with TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaCodebaseName, # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the codebase registered with TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaProjectName, # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the project registered with TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaNotificationEmail, # Optional: only needed if TsaOnboard is true; the email(s) which will receive notifications of TSA bug filings (e.g. alias@microsoft.com); TSA is the automated framework used to upload test results as bugs. + [string] $TsaCodebaseAdmin, # Optional: only needed if TsaOnboard is true; the aliases which are admins of the TSA codebase (e.g. DOMAIN\alias); TSA is the automated framework used to upload test results as bugs. + [string] $TsaBugAreaPath, # Optional: only needed if TsaOnboard is true; the area path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. + [string] $TsaIterationPath, # Optional: only needed if TsaOnboard is true; the iteration path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. + [string] $GuardianLoggerLevel="Standard" # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +$LASTEXITCODE = 0 + +#Replace repo names to the format of org/repo +if (!($Repository.contains('/'))) { + $RepoName = $Repository -replace '(.*?)-(.*)', '$1/$2'; +} +else{ + $RepoName = $Repository; +} + +if ($GuardianPackageName) { + $guardianCliLocation = Join-Path $NugetPackageDirectory (Join-Path $GuardianPackageName (Join-Path "tools" "guardian.cmd")) +} else { + $guardianCliLocation = $GuardianCliLocation +} + +$ValidPath = Test-Path $guardianCliLocation + +if ($ValidPath -eq $False) +{ + Write-Host "Invalid Guardian CLI Location." + exit 1 +} + +& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $ArtifactsDirectory -DncEngAccessToken $DncEngAccessToken -GuardianLoggerLevel $GuardianLoggerLevel +$gdnFolder = Join-Path $ArtifactsDirectory ".gdn" + +if ($TsaOnboard) { + if ($TsaCodebaseName -and $TsaNotificationEmail -and $TsaCodebaseAdmin -and $TsaBugAreaPath) { + Write-Host "$guardianCliLocation tsa-onboard --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel" + & $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel + if ($LASTEXITCODE -ne 0) { + Write-Host "Guardian tsa-onboard failed with exit code $LASTEXITCODE." + exit $LASTEXITCODE + } + } else { + Write-Host "Could not onboard to TSA -- not all required values ($$TsaCodebaseName, $$TsaNotificationEmail, $$TsaCodebaseAdmin, $$TsaBugAreaPath) were specified." + exit 1 + } +} + +if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) { + & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -DncEngAccessToken $DncEngAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel +} +if ($SourceToolsList -and $SourceToolsList.Count -gt 0) { + & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -DncEngAccessToken $DncEngAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel +} + +if ($UpdateBaseline) { + & (Join-Path $PSScriptRoot "push-gdn.ps1") -Repository $RepoName -BranchName $BranchName -GdnFolder $GdnFolder -DncEngAccessToken $DncEngAccessToken -PushReason "Update baseline" +} + +if ($TsaPublish) { + if ($TsaBranchName -and $BuildNumber) { + if (-not $TsaRepositoryName) { + $TsaRepositoryName = "$($Repository)-$($BranchName)" + } + Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $SourceDirectory --logger-level $GuardianLoggerLevel" + & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel + if ($LASTEXITCODE -ne 0) { + Write-Host "Guardian tsa-publish failed with exit code $LASTEXITCODE." + exit $LASTEXITCODE + } + } else { + Write-Host "Could not publish to TSA -- not all required values ($$TsaBranchName, $$BuildNumber) were specified." + exit 1 + } +} diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 new file mode 100644 index 000000000..cbf5c36a8 --- /dev/null +++ b/eng/common/sdl/init-sdl.ps1 @@ -0,0 +1,48 @@ +Param( + [string] $GuardianCliLocation, + [string] $Repository, + [string] $BranchName="master", + [string] $WorkingDirectory, + [string] $DncEngAccessToken, + [string] $GuardianLoggerLevel="Standard" +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +$LASTEXITCODE = 0 + +# Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file +$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$DncEngAccessToken")) +$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") +$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0-preview.1" +$zipFile = "$WorkingDirectory/gdn.zip" + +Add-Type -AssemblyName System.IO.Compression.FileSystem +$gdnFolder = (Join-Path $WorkingDirectory ".gdn") +Try +{ + # We try to download the zip; if the request fails (e.g. the file doesn't exist), we catch it and init guardian instead + Write-Host "Downloading gdn folder from internal config repostiory..." + Invoke-WebRequest -Headers @{ "Accept"="application/zip"; "Authorization"="Basic $encodedPat" } -Uri $uri -OutFile $zipFile + if (Test-Path $gdnFolder) { + # Remove the gdn folder if it exists (it shouldn't unless there's too much caching; this is just in case) + Remove-Item -Force -Recurse $gdnFolder + } + [System.IO.Compression.ZipFile]::ExtractToDirectory($zipFile, $WorkingDirectory) + Write-Host $gdnFolder +} Catch [System.Net.WebException] { + # if the folder does not exist, we'll do a guardian init and push it to the remote repository + Write-Host "Initializing Guardian..." + Write-Host "$GuardianCliLocation init --working-directory $WorkingDirectory --logger-level $GuardianLoggerLevel" + & $GuardianCliLocation init --working-directory $WorkingDirectory --logger-level $GuardianLoggerLevel + if ($LASTEXITCODE -ne 0) { + Write-Error "Guardian init failed with exit code $LASTEXITCODE." + } + # We create the mainbaseline so it can be edited later + Write-Host "$GuardianCliLocation baseline --working-directory $WorkingDirectory --name mainbaseline" + & $GuardianCliLocation baseline --working-directory $WorkingDirectory --name mainbaseline + if ($LASTEXITCODE -ne 0) { + Write-Error "Guardian baseline failed with exit code $LASTEXITCODE." + } + & $(Join-Path $PSScriptRoot "push-gdn.ps1") -Repository $Repository -BranchName $BranchName -GdnFolder $gdnFolder -DncEngAccessToken $DncEngAccessToken -PushReason "Initialize gdn folder" +} \ No newline at end of file diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config new file mode 100644 index 000000000..b054737df --- /dev/null +++ b/eng/common/sdl/packages.config @@ -0,0 +1,4 @@ + + + + diff --git a/eng/common/sdl/push-gdn.ps1 b/eng/common/sdl/push-gdn.ps1 new file mode 100644 index 000000000..cacaf8e91 --- /dev/null +++ b/eng/common/sdl/push-gdn.ps1 @@ -0,0 +1,51 @@ +Param( + [string] $Repository, + [string] $BranchName="master", + [string] $GdnFolder, + [string] $DncEngAccessToken, + [string] $PushReason +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +$LASTEXITCODE = 0 + +# We create the temp directory where we'll store the sdl-config repository +$sdlDir = Join-Path $env:TEMP "sdl" +if (Test-Path $sdlDir) { + Remove-Item -Force -Recurse $sdlDir +} + +Write-Host "git clone https://dnceng:`$DncEngAccessToken@dev.azure.com/dnceng/internal/_git/sdl-tool-cfg $sdlDir" +git clone https://dnceng:$DncEngAccessToken@dev.azure.com/dnceng/internal/_git/sdl-tool-cfg $sdlDir +if ($LASTEXITCODE -ne 0) { + Write-Error "Git clone failed with exit code $LASTEXITCODE." +} +# We copy the .gdn folder from our local run into the git repository so it can be committed +$sdlRepositoryFolder = Join-Path (Join-Path (Join-Path $sdlDir $Repository) $BranchName) ".gdn" +if (Get-Command Robocopy) { + Robocopy /S $GdnFolder $sdlRepositoryFolder +} else { + rsync -r $GdnFolder $sdlRepositoryFolder +} +# cd to the sdl-config directory so we can run git there +Push-Location $sdlDir +# git add . --> git commit --> git push +Write-Host "git add ." +git add . +if ($LASTEXITCODE -ne 0) { + Write-Error "Git add failed with exit code $LASTEXITCODE." +} +Write-Host "git -c user.email=`"dn-bot@microsoft.com`" -c user.name=`"Dotnet Bot`" commit -m `"$PushReason for $Repository/$BranchName`"" +git -c user.email="dn-bot@microsoft.com" -c user.name="Dotnet Bot" commit -m "$PushReason for $Repository/$BranchName" +if ($LASTEXITCODE -ne 0) { + Write-Error "Git commit failed with exit code $LASTEXITCODE." +} +Write-Host "git push" +git push +if ($LASTEXITCODE -ne 0) { + Write-Error "Git push failed with exit code $LASTEXITCODE." +} + +# Return to the original directory +Pop-Location \ No newline at end of file diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1 new file mode 100644 index 000000000..e6a86d03a --- /dev/null +++ b/eng/common/sdl/run-sdl.ps1 @@ -0,0 +1,65 @@ +Param( + [string] $GuardianCliLocation, + [string] $WorkingDirectory, + [string] $TargetDirectory, + [string] $GdnFolder, + [string[]] $ToolsList, + [string] $UpdateBaseline, + [string] $GuardianLoggerLevel="Standard" +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +$LASTEXITCODE = 0 + +# We store config files in the r directory of .gdn +Write-Host $ToolsList +$gdnConfigPath = Join-Path $GdnFolder "r" +$ValidPath = Test-Path $GuardianCliLocation + +if ($ValidPath -eq $False) +{ + Write-Host "Invalid Guardian CLI Location." + exit 1 +} + +foreach ($tool in $ToolsList) { + $gdnConfigFile = Join-Path $gdnConfigPath "$tool-configure.gdnconfig" + $config = $False + Write-Host $tool + # We have to manually configure tools that run on source to look at the source directory only + if ($tool -eq "credscan") { + Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory : $TargetDirectory `"" + & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " + if ($LASTEXITCODE -ne 0) { + Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE." + exit $LASTEXITCODE + } + $config = $True + } + if ($tool -eq "policheck") { + Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target : $TargetDirectory `"" + & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target : $TargetDirectory " + if ($LASTEXITCODE -ne 0) { + Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE." + exit $LASTEXITCODE + } + $config = $True + } + + Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel --config $gdnConfigFile $config" + if ($config) { + & $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel --config $gdnConfigFile + if ($LASTEXITCODE -ne 0) { + Write-Host "Guardian run for $tool using $gdnConfigFile failed with exit code $LASTEXITCODE." + exit $LASTEXITCODE + } + } else { + & $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel + if ($LASTEXITCODE -ne 0) { + Write-Host "Guardian run for $tool failed with exit code $LASTEXITCODE." + exit $LASTEXITCODE + } + } +} + diff --git a/global.json b/global.json index 7e3008a0f..ac934c93e 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19302.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19304.1" } } From 436e5c4da72a37a26a918ac75e0aa4ad634782f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jun 2019 12:32:51 +0000 Subject: [PATCH 037/471] Update dependencies from https://github.com/dotnet/templating build 20190603.1 (#2288) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19303.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d795a8ff..5a288adda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore f0df10f211b5ea8192579808c223e82aab549268 - + https://github.com/dotnet/templating - 6e7805d201f2fe43d7205101c238419dcef74fac + a59c4747634fcbfa08493b7348ad9ba07b5599dc https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 1e947281a..0d9ea5ae6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19303.5 - 1.0.2-beta5.19302.1 + 1.0.2-beta5.19303.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From 59773a80294aa881f0908e01a63820d50b756d45 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jun 2019 12:46:36 +0000 Subject: [PATCH 038/471] Update dependencies from https://github.com/dotnet/toolset build 20190604.3 (#2289) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19304.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a288adda..13d865cce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating a59c4747634fcbfa08493b7348ad9ba07b5599dc - + https://github.com/dotnet/toolset - 6fe747ae413e4978e661913e533ab543255ca274 + 818359026baf20ef5b0ce8d55df0c4709c4f73af https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 0d9ea5ae6..472d9b008 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19303.6 + 3.0.100-preview7.19304.3 From aa0a3c27927292e22805cd5d134f443ad7d3f836 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jun 2019 13:03:53 +0000 Subject: [PATCH 039/471] [master] Update dependencies from dotnet/toolset (#2290) * Update dependencies from https://github.com/dotnet/toolset build 20190604.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19304.4 * Update dependencies from https://github.com/dotnet/toolset build 20190604.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19304.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13d865cce..da744ee7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating a59c4747634fcbfa08493b7348ad9ba07b5599dc - + https://github.com/dotnet/toolset - 818359026baf20ef5b0ce8d55df0c4709c4f73af + 7f6c4d616ed367dbcec1c5693cbb95ae1fafbcf3 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 472d9b008..5f2f29c9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19304.3 + 3.0.100-preview7.19304.5 From 66dddb99282726750083f3b3ae2658f69a1ce476 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jun 2019 13:24:52 +0000 Subject: [PATCH 040/471] Update dependencies from https://github.com/dotnet/toolset build 20190604.6 (#2291) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19304.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da744ee7d..fd3b1f226 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating a59c4747634fcbfa08493b7348ad9ba07b5599dc - + https://github.com/dotnet/toolset - 7f6c4d616ed367dbcec1c5693cbb95ae1fafbcf3 + 8b7a99dede44a41ba1ffcb9ffc8027e3731bb801 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5f2f29c9c..adc202a49 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19304.5 + 3.0.100-preview7.19304.6 From 2697ac430f01b09c13c7df7d9827c17b8e1cbf6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jun 2019 06:54:38 -0700 Subject: [PATCH 041/471] Update dependencies from https://github.com/dotnet/toolset build 20190604.7 (#2292) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19304.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd3b1f226..76ae00155 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating a59c4747634fcbfa08493b7348ad9ba07b5599dc - + https://github.com/dotnet/toolset - 8b7a99dede44a41ba1ffcb9ffc8027e3731bb801 + 296c3d648b9027f8da71ab22bf0fcda21e7db1ec https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index adc202a49..0d7d94fee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19304.6 + 3.0.100-preview7.19304.7 From ee18d1e262630b9d60b82890a70ed5b2933b9df7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jun 2019 20:01:05 +0000 Subject: [PATCH 042/471] [master] Update dependencies from dotnet/cli (#2297) * Update dependencies from https://github.com/dotnet/cli build 20190604.1 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19304.1 * Update dependencies from https://github.com/dotnet/cli build 20190604.2 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19304.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76ae00155..c0b9ee1a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 69d51538bdbdb03c758b924f887a6f596e590c7d - + https://github.com/dotnet/cli - fe9d2a3b01ef92942c6872946b148a1037587f6a + c9fee3dfa1ae15d7a44ceb434b8cab9090d42b57 diff --git a/eng/Versions.props b/eng/Versions.props index 0d7d94fee..fdd85a7f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19303.5 + 3.0.100-preview7.19304.2 1.0.2-beta5.19303.1 From 92d69e68855f94033fc6715d06a775ef8516301a Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 4 Jun 2019 13:05:25 -0700 Subject: [PATCH 043/471] Exclude sdk resolver layout from source build (#2232) --- src/SdkResolver/SdkResolver.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SdkResolver/SdkResolver.csproj b/src/SdkResolver/SdkResolver.csproj index 2cd928e14..70089c1f1 100644 --- a/src/SdkResolver/SdkResolver.csproj +++ b/src/SdkResolver/SdkResolver.csproj @@ -7,6 +7,7 @@ false false UNUSED + true From bfdb6a2aacae153aecaf89e377eaeea6c4847543 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jun 2019 15:53:48 -0700 Subject: [PATCH 044/471] Update dependencies from https://github.com/dotnet/toolset build 20190604.10 (#2299) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19304.10 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0b9ee1a6..111f16ee1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating a59c4747634fcbfa08493b7348ad9ba07b5599dc - + https://github.com/dotnet/toolset - 296c3d648b9027f8da71ab22bf0fcda21e7db1ec + 0e8d535262d4fb6fd9360123e57e8ba4463c46be https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index fdd85a7f8..38f0ecf40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19304.7 + 3.0.100-preview7.19304.10 From 82fd13e1904fa61e03daf5be60e2cd8191ca776e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jun 2019 23:15:12 +0000 Subject: [PATCH 045/471] Update dependencies from https://github.com/dotnet/sdk build 20190604.1 (#2302) - Microsoft.NET.Sdk - 3.0.100-preview7.19304.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 111f16ee1..5deab84f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 0e8d535262d4fb6fd9360123e57e8ba4463c46be - + https://github.com/dotnet/sdk - 69d51538bdbdb03c758b924f887a6f596e590c7d + e915ce180c39a79e2ff1597d1a3fb3c9565c4c27 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 38f0ecf40..c1804abb8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19303.5 + 3.0.100-preview7.19304.1 3.0.0-preview7-27803-11 From d65a464563fcb5bbc8e4b389b281a2fd1e9f70de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jun 2019 23:24:56 +0000 Subject: [PATCH 046/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190604.6 (#2303) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19304.6 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19304.6 - dotnet-watch - 3.0.0-preview7.19304.6 - dotnet-user-secrets - 3.0.0-preview7.19304.6 - dotnet-dev-certs - 3.0.0-preview7.19304.6 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19304.6 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5deab84f7..4bef69033 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup c113140681cdb8224dffc2da8df3e2f9bcbdc4a0 - + https://github.com/aspnet/AspNetCore - f0df10f211b5ea8192579808c223e82aab549268 + bb9ba122c169c3fe4d8edc3446c2434cafe194aa - + https://github.com/aspnet/AspNetCore - f0df10f211b5ea8192579808c223e82aab549268 + bb9ba122c169c3fe4d8edc3446c2434cafe194aa - + https://github.com/aspnet/AspNetCore - f0df10f211b5ea8192579808c223e82aab549268 + bb9ba122c169c3fe4d8edc3446c2434cafe194aa - + https://github.com/aspnet/AspNetCore - f0df10f211b5ea8192579808c223e82aab549268 + bb9ba122c169c3fe4d8edc3446c2434cafe194aa - + https://github.com/aspnet/AspNetCore - f0df10f211b5ea8192579808c223e82aab549268 + bb9ba122c169c3fe4d8edc3446c2434cafe194aa - + https://github.com/aspnet/AspNetCore - f0df10f211b5ea8192579808c223e82aab549268 + bb9ba122c169c3fe4d8edc3446c2434cafe194aa https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index c1804abb8..ef48521d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview6.19303.1 - 3.0.0-preview6.19303.1 - 3.0.0-preview6.19303.1 - 3.0.0-preview6.19303.1 - 3.0.0-preview6.19303.1 - 3.0.0-preview6.19303.1 + 3.0.0-preview7.19304.6 + 3.0.0-preview7.19304.6 + 3.0.0-preview7.19304.6 + 3.0.0-preview7.19304.6 + 3.0.0-preview7.19304.6 + 3.0.0-preview7.19304.6 From 61c4be5aada41eb7af7b26691c4c1cf23620c00e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jun 2019 23:35:29 +0000 Subject: [PATCH 047/471] Update dependencies from https://github.com/dotnet/cli build 20190604.5 (#2304) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19304.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4bef69033..2ec3cbbe6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk e915ce180c39a79e2ff1597d1a3fb3c9565c4c27 - + https://github.com/dotnet/cli - c9fee3dfa1ae15d7a44ceb434b8cab9090d42b57 + 2d35b25417509bd2d9816bf64a7951b5d2172ba2 diff --git a/eng/Versions.props b/eng/Versions.props index ef48521d3..209060aaa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19304.2 + 3.0.100-preview7.19304.5 1.0.2-beta5.19303.1 From 20539bc01c9800a762d212969a563bf4d94df0f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jun 2019 00:00:28 +0000 Subject: [PATCH 048/471] Update dependencies from https://github.com/dotnet/cli build 20190604.6 (#2306) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19304.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ec3cbbe6..a83518624 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk e915ce180c39a79e2ff1597d1a3fb3c9565c4c27 - + https://github.com/dotnet/cli - 2d35b25417509bd2d9816bf64a7951b5d2172ba2 + 04f59d0c4a694c3c9c4bb3b1d34b577803d4cf33 diff --git a/eng/Versions.props b/eng/Versions.props index 209060aaa..9fde6d7c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19304.5 + 3.0.100-preview7.19304.6 1.0.2-beta5.19303.1 From c41cd1ba7dc1ffbddb4d6b01f90edb4f0a6ed019 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jun 2019 01:55:19 +0000 Subject: [PATCH 049/471] Update dependencies from https://github.com/dotnet/toolset build 20190604.13 (#2305) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19304.13 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a83518624..1e13ec046 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating a59c4747634fcbfa08493b7348ad9ba07b5599dc - + https://github.com/dotnet/toolset - 0e8d535262d4fb6fd9360123e57e8ba4463c46be + 081dff9632d7e27fd424ddc26cf48659edab75ff https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9fde6d7c2..0bedca259 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19304.10 + 3.0.100-preview7.19304.13 From 4453e56ec3c035511eda846746b0c5ea35af14fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jun 2019 02:36:42 +0000 Subject: [PATCH 050/471] Update dependencies from https://github.com/dotnet/core-setup build 20190604.02 (#2308) - Microsoft.NETCore.App - 3.0.0-preview7-27804-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27804-02 - NETStandard.Library.Ref - 2.1.0-preview7-27804-02 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19303.5 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19303.13 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e13ec046..8eae12e0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - c113140681cdb8224dffc2da8df3e2f9bcbdc4a0 + fdc2a215b0e021abff8d56f57f30f9318c84fd0d - + https://github.com/dotnet/core-setup - c113140681cdb8224dffc2da8df3e2f9bcbdc4a0 + fdc2a215b0e021abff8d56f57f30f9318c84fd0d - + https://github.com/dotnet/core-setup - c113140681cdb8224dffc2da8df3e2f9bcbdc4a0 + fdc2a215b0e021abff8d56f57f30f9318c84fd0d https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 04f59d0c4a694c3c9c4bb3b1d34b577803d4cf33 - + https://github.com/dotnet/winforms - 2c7ad6c0dc07d8b6cb86822ad2830e5ead35a749 + f1519043cc6448b199af913915ae1d6215ca5840 - + https://github.com/dotnet/wpf - db41c5dd6b6a92ca7670ef43aed4b640b99acc66 + 9a7e6e4d6fd36f48e4265347552e20b6572afa3e diff --git a/eng/Versions.props b/eng/Versions.props index 0bedca259..b11f11669 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview6.19274.3 + 4.8.0-preview7.19303.5 - 3.0.0-preview7.19303.7 + 3.0.0-preview7.19303.13 @@ -47,7 +47,7 @@ 3.0.100-preview7.19304.1 - 3.0.0-preview7-27803-11 + 3.0.0-preview7-27804-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27803-11 + 2.1.0-preview7-27804-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27803-11 + 3.0.0-preview7-27804-02 $(MicrosoftWindowsDesktopAppPackageVersion) From 159796c439b931b89f736b1c37fd88a7a04efc70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jun 2019 03:35:27 +0000 Subject: [PATCH 051/471] Update dependencies from https://github.com/dotnet/cli build 20190604.7 (#2310) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19304.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8eae12e0d..f9ad5c6e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk e915ce180c39a79e2ff1597d1a3fb3c9565c4c27 - + https://github.com/dotnet/cli - 04f59d0c4a694c3c9c4bb3b1d34b577803d4cf33 + 20152b3beeec7b9157ab4688494b52cb2fffb190 diff --git a/eng/Versions.props b/eng/Versions.props index b11f11669..f8329d52c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19304.6 + 3.0.100-preview7.19304.7 1.0.2-beta5.19303.1 From 89cc67c6bbdf04876def68862898a758ad7dfb73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jun 2019 04:25:33 +0000 Subject: [PATCH 052/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190604.10 (#2312) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19304.10 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19304.10 - dotnet-watch - 3.0.0-preview7.19304.10 - dotnet-user-secrets - 3.0.0-preview7.19304.10 - dotnet-dev-certs - 3.0.0-preview7.19304.10 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19304.10 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9ad5c6e1..7673fdb09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup fdc2a215b0e021abff8d56f57f30f9318c84fd0d - + https://github.com/aspnet/AspNetCore - bb9ba122c169c3fe4d8edc3446c2434cafe194aa + 5af8e170bc11aa189f7be0aab777b1bdfb76a431 - + https://github.com/aspnet/AspNetCore - bb9ba122c169c3fe4d8edc3446c2434cafe194aa + 5af8e170bc11aa189f7be0aab777b1bdfb76a431 - + https://github.com/aspnet/AspNetCore - bb9ba122c169c3fe4d8edc3446c2434cafe194aa + 5af8e170bc11aa189f7be0aab777b1bdfb76a431 - + https://github.com/aspnet/AspNetCore - bb9ba122c169c3fe4d8edc3446c2434cafe194aa + 5af8e170bc11aa189f7be0aab777b1bdfb76a431 - + https://github.com/aspnet/AspNetCore - bb9ba122c169c3fe4d8edc3446c2434cafe194aa + 5af8e170bc11aa189f7be0aab777b1bdfb76a431 - + https://github.com/aspnet/AspNetCore - bb9ba122c169c3fe4d8edc3446c2434cafe194aa + 5af8e170bc11aa189f7be0aab777b1bdfb76a431 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index f8329d52c..cba679463 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19304.6 - 3.0.0-preview7.19304.6 - 3.0.0-preview7.19304.6 - 3.0.0-preview7.19304.6 - 3.0.0-preview7.19304.6 - 3.0.0-preview7.19304.6 + 3.0.0-preview7.19304.10 + 3.0.0-preview7.19304.10 + 3.0.0-preview7.19304.10 + 3.0.0-preview7.19304.10 + 3.0.0-preview7.19304.10 + 3.0.0-preview7.19304.10 From b30c9a39455627b611f94d471917af0424389d34 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Wed, 5 Jun 2019 12:10:31 +0000 Subject: [PATCH 053/471] Update dependencies from https://github.com/dotnet/arcade build 20190604.23 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19304.23 --- eng/Version.Details.xml | 4 ++-- eng/common/cross/build-rootfs.sh | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 914de509f..465155180 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - d2599acd9703ef747dfb4329ec3e3beff182e755 + c9ab9c47d6c66fb9ad89e331900e06bed7463904 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 34d3d2ba1..7c4e12265 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -181,7 +181,7 @@ if [ -z "$__RootfsDir" ] && [ ! -z "$ROOTFS_DIR" ]; then fi if [ -z "$__RootfsDir" ]; then - __RootfsDir="$__CrossDir/rootfs/$__BuildArch" + __RootfsDir="$__CrossDir/../../../.tools/rootfs/$__BuildArch" fi if [ -d "$__RootfsDir" ]; then diff --git a/global.json b/global.json index ac934c93e..f3390eb1c 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19304.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19304.23" } } From 7bfcfb4e1e41ffd661ae5bb1b09d71bed92a00db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jun 2019 12:26:07 +0000 Subject: [PATCH 054/471] Update dependencies from https://github.com/dotnet/templating build 20190604.1 (#2316) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19304.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7673fdb09..24266cb48 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore 5af8e170bc11aa189f7be0aab777b1bdfb76a431 - + https://github.com/dotnet/templating - a59c4747634fcbfa08493b7348ad9ba07b5599dc + 778af19c2c7f99320fe33d38b18003483ebed559 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index cba679463..5b90edf94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19304.7 - 1.0.2-beta5.19303.1 + 1.0.2-beta5.19304.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From af8999637e6206dee789b7b48058db854eec5a5d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jun 2019 12:49:37 +0000 Subject: [PATCH 055/471] [master] Update dependencies from dotnet/toolset (#2317) * Update dependencies from https://github.com/dotnet/toolset build 20190605.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19305.1 * Update dependencies from https://github.com/dotnet/toolset build 20190605.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19305.2 * Update dependencies from https://github.com/dotnet/toolset build 20190605.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19305.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24266cb48..326845486 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 778af19c2c7f99320fe33d38b18003483ebed559 - + https://github.com/dotnet/toolset - 081dff9632d7e27fd424ddc26cf48659edab75ff + 84544e02a7008a43834461823d95af3e9de63b8f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5b90edf94..764c46325 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19304.13 + 3.0.100-preview7.19305.3 From 7996f7e53ffdf42feec5f1344df29ba53fcdf9ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jun 2019 13:52:30 +0000 Subject: [PATCH 056/471] [master] Update dependencies from dotnet/toolset (#2318) * Update dependencies from https://github.com/dotnet/toolset build 20190605.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19305.4 * Update dependencies from https://github.com/dotnet/toolset build 20190605.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19305.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 326845486..ccde553fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 778af19c2c7f99320fe33d38b18003483ebed559 - + https://github.com/dotnet/toolset - 84544e02a7008a43834461823d95af3e9de63b8f + f22806c09f734211ed7bf6484f7e6c8e7afdeffb https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 764c46325..e65f5469c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19305.3 + 3.0.100-preview7.19305.5 From 375de44e45a93b431a5c7eea154bcc2ffcd63334 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jun 2019 16:14:42 +0000 Subject: [PATCH 057/471] Update dependencies from https://github.com/dotnet/core-setup build 20190604.03 (#2311) - Microsoft.NETCore.App - 3.0.0-preview7-27804-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27804-03 - NETStandard.Library.Ref - 2.1.0-preview7-27804-03 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19304.1 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ccde553fb..fdc381ff9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - fdc2a215b0e021abff8d56f57f30f9318c84fd0d + a620d0dba57cd18e49fa686e28e18369be23d067 - + https://github.com/dotnet/core-setup - fdc2a215b0e021abff8d56f57f30f9318c84fd0d + a620d0dba57cd18e49fa686e28e18369be23d067 - + https://github.com/dotnet/core-setup - fdc2a215b0e021abff8d56f57f30f9318c84fd0d + a620d0dba57cd18e49fa686e28e18369be23d067 https://github.com/aspnet/AspNetCore @@ -59,7 +59,7 @@ https://github.com/dotnet/winforms f1519043cc6448b199af913915ae1d6215ca5840 - + https://github.com/dotnet/wpf 9a7e6e4d6fd36f48e4265347552e20b6572afa3e diff --git a/eng/Versions.props b/eng/Versions.props index e65f5469c..2b64dc222 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.0-preview7.19303.13 + 3.0.0-preview7.19304.1 @@ -47,7 +47,7 @@ 3.0.100-preview7.19304.1 - 3.0.0-preview7-27804-02 + 3.0.0-preview7-27804-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27804-02 + 2.1.0-preview7-27804-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27804-02 + 3.0.0-preview7-27804-03 $(MicrosoftWindowsDesktopAppPackageVersion) From f1886a17792c37233b5bb858e26b2ad2bb9e4198 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jun 2019 16:30:22 +0000 Subject: [PATCH 058/471] Update dependencies from https://github.com/dotnet/core-setup build 20190605.01 (#2320) - Microsoft.NETCore.App - 3.0.0-preview7-27805-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27805-01 - NETStandard.Library.Ref - 2.1.0-preview7-27805-01 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19304.4 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdc381ff9..6f2eb1382 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - a620d0dba57cd18e49fa686e28e18369be23d067 + de0cba8d344629f38eba10596cb9c69fb8214f0c - + https://github.com/dotnet/core-setup - a620d0dba57cd18e49fa686e28e18369be23d067 + de0cba8d344629f38eba10596cb9c69fb8214f0c - + https://github.com/dotnet/core-setup - a620d0dba57cd18e49fa686e28e18369be23d067 + de0cba8d344629f38eba10596cb9c69fb8214f0c https://github.com/aspnet/AspNetCore @@ -59,9 +59,9 @@ https://github.com/dotnet/winforms f1519043cc6448b199af913915ae1d6215ca5840 - + https://github.com/dotnet/wpf - 9a7e6e4d6fd36f48e4265347552e20b6572afa3e + e3b442768dff9d3afc49d35c331d29177e3bac5f diff --git a/eng/Versions.props b/eng/Versions.props index 2b64dc222..ce1b777dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.0-preview7.19304.1 + 3.0.0-preview7.19304.4 @@ -47,7 +47,7 @@ 3.0.100-preview7.19304.1 - 3.0.0-preview7-27804-03 + 3.0.0-preview7-27805-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27804-03 + 2.1.0-preview7-27805-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27804-03 + 3.0.0-preview7-27805-01 $(MicrosoftWindowsDesktopAppPackageVersion) From 5850b0c99811a9f3c94180aa48432d92b975900b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jun 2019 10:41:17 -0700 Subject: [PATCH 059/471] Update dependencies from https://github.com/dotnet/sdk build 20190605.1 (#2315) - Microsoft.NET.Sdk - 3.0.100-preview7.19305.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f2eb1382..11d99fcb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset f22806c09f734211ed7bf6484f7e6c8e7afdeffb - + https://github.com/dotnet/sdk - e915ce180c39a79e2ff1597d1a3fb3c9565c4c27 + f9a338d041118637890869bba587b82557947f8f https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index ce1b777dc..e744c3ff1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19304.1 + 3.0.100-preview7.19305.1 3.0.0-preview7-27805-01 From 3b7c98e310185073d4fad9c24440d0017dc0d7f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jun 2019 18:01:09 +0000 Subject: [PATCH 060/471] Update dependencies from https://github.com/dotnet/toolset build 20190605.7 (#2323) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19305.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11d99fcb8..2baeca67e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 778af19c2c7f99320fe33d38b18003483ebed559 - + https://github.com/dotnet/toolset - f22806c09f734211ed7bf6484f7e6c8e7afdeffb + b31cf935fbaa4a6e7877175a13a1e1a8b49ec5eb https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e744c3ff1..dbf92538b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19305.5 + 3.0.100-preview7.19305.7 From 4a8269fdd52e0ef4aba18d4cc6bdd1381e07233b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jun 2019 20:46:32 +0000 Subject: [PATCH 061/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190605.2 (#2325) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19305.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19305.2 - dotnet-watch - 3.0.0-preview7.19305.2 - dotnet-user-secrets - 3.0.0-preview7.19305.2 - dotnet-dev-certs - 3.0.0-preview7.19305.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19305.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2baeca67e..231eb611e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup de0cba8d344629f38eba10596cb9c69fb8214f0c - + https://github.com/aspnet/AspNetCore - 5af8e170bc11aa189f7be0aab777b1bdfb76a431 + 214ca07b6c1efd48abd07ec10c50db9a6a4b830d - + https://github.com/aspnet/AspNetCore - 5af8e170bc11aa189f7be0aab777b1bdfb76a431 + 214ca07b6c1efd48abd07ec10c50db9a6a4b830d - + https://github.com/aspnet/AspNetCore - 5af8e170bc11aa189f7be0aab777b1bdfb76a431 + 214ca07b6c1efd48abd07ec10c50db9a6a4b830d - + https://github.com/aspnet/AspNetCore - 5af8e170bc11aa189f7be0aab777b1bdfb76a431 + 214ca07b6c1efd48abd07ec10c50db9a6a4b830d - + https://github.com/aspnet/AspNetCore - 5af8e170bc11aa189f7be0aab777b1bdfb76a431 + 214ca07b6c1efd48abd07ec10c50db9a6a4b830d - + https://github.com/aspnet/AspNetCore - 5af8e170bc11aa189f7be0aab777b1bdfb76a431 + 214ca07b6c1efd48abd07ec10c50db9a6a4b830d https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index dbf92538b..ab28bfcbc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19304.10 - 3.0.0-preview7.19304.10 - 3.0.0-preview7.19304.10 - 3.0.0-preview7.19304.10 - 3.0.0-preview7.19304.10 - 3.0.0-preview7.19304.10 + 3.0.0-preview7.19305.2 + 3.0.0-preview7.19305.2 + 3.0.0-preview7.19305.2 + 3.0.0-preview7.19305.2 + 3.0.0-preview7.19305.2 + 3.0.0-preview7.19305.2 From 93f969433bc6d0e8323437bd8aa757b7b98911a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jun 2019 21:17:33 +0000 Subject: [PATCH 062/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190605.3 (#2326) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19305.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19305.3 - dotnet-watch - 3.0.0-preview7.19305.3 - dotnet-user-secrets - 3.0.0-preview7.19305.3 - dotnet-dev-certs - 3.0.0-preview7.19305.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19305.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 231eb611e..3a8c86e52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup de0cba8d344629f38eba10596cb9c69fb8214f0c - + https://github.com/aspnet/AspNetCore - 214ca07b6c1efd48abd07ec10c50db9a6a4b830d + 9cd2ad15ff2a306bab9894dc7c1926c196b3fa2e - + https://github.com/aspnet/AspNetCore - 214ca07b6c1efd48abd07ec10c50db9a6a4b830d + 9cd2ad15ff2a306bab9894dc7c1926c196b3fa2e - + https://github.com/aspnet/AspNetCore - 214ca07b6c1efd48abd07ec10c50db9a6a4b830d + 9cd2ad15ff2a306bab9894dc7c1926c196b3fa2e - + https://github.com/aspnet/AspNetCore - 214ca07b6c1efd48abd07ec10c50db9a6a4b830d + 9cd2ad15ff2a306bab9894dc7c1926c196b3fa2e - + https://github.com/aspnet/AspNetCore - 214ca07b6c1efd48abd07ec10c50db9a6a4b830d + 9cd2ad15ff2a306bab9894dc7c1926c196b3fa2e - + https://github.com/aspnet/AspNetCore - 214ca07b6c1efd48abd07ec10c50db9a6a4b830d + 9cd2ad15ff2a306bab9894dc7c1926c196b3fa2e https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index ab28bfcbc..805443203 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19305.2 - 3.0.0-preview7.19305.2 - 3.0.0-preview7.19305.2 - 3.0.0-preview7.19305.2 - 3.0.0-preview7.19305.2 - 3.0.0-preview7.19305.2 + 3.0.0-preview7.19305.3 + 3.0.0-preview7.19305.3 + 3.0.0-preview7.19305.3 + 3.0.0-preview7.19305.3 + 3.0.0-preview7.19305.3 + 3.0.0-preview7.19305.3 From dbdf828c20716fcdc2f7f060f3064ea84c72be2b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jun 2019 01:36:44 +0000 Subject: [PATCH 063/471] [master] Update dependencies from aspnet/AspNetCore (#2327) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190605.8 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19305.8 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19305.8 - dotnet-watch - 3.0.0-preview7.19305.8 - dotnet-user-secrets - 3.0.0-preview7.19305.8 - dotnet-dev-certs - 3.0.0-preview7.19305.8 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19305.8 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190605.10 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19305.10 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19305.10 - dotnet-watch - 3.0.0-preview7.19305.10 - dotnet-user-secrets - 3.0.0-preview7.19305.10 - dotnet-dev-certs - 3.0.0-preview7.19305.10 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19305.10 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a8c86e52..86be075bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup de0cba8d344629f38eba10596cb9c69fb8214f0c - + https://github.com/aspnet/AspNetCore - 9cd2ad15ff2a306bab9894dc7c1926c196b3fa2e + 1ca61453c8ec442a8a1ac6b47b562f37ca529e64 - + https://github.com/aspnet/AspNetCore - 9cd2ad15ff2a306bab9894dc7c1926c196b3fa2e + 1ca61453c8ec442a8a1ac6b47b562f37ca529e64 - + https://github.com/aspnet/AspNetCore - 9cd2ad15ff2a306bab9894dc7c1926c196b3fa2e + 1ca61453c8ec442a8a1ac6b47b562f37ca529e64 - + https://github.com/aspnet/AspNetCore - 9cd2ad15ff2a306bab9894dc7c1926c196b3fa2e + 1ca61453c8ec442a8a1ac6b47b562f37ca529e64 - + https://github.com/aspnet/AspNetCore - 9cd2ad15ff2a306bab9894dc7c1926c196b3fa2e + 1ca61453c8ec442a8a1ac6b47b562f37ca529e64 - + https://github.com/aspnet/AspNetCore - 9cd2ad15ff2a306bab9894dc7c1926c196b3fa2e + 1ca61453c8ec442a8a1ac6b47b562f37ca529e64 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 805443203..c879c1d3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19305.3 - 3.0.0-preview7.19305.3 - 3.0.0-preview7.19305.3 - 3.0.0-preview7.19305.3 - 3.0.0-preview7.19305.3 - 3.0.0-preview7.19305.3 + 3.0.0-preview7.19305.10 + 3.0.0-preview7.19305.10 + 3.0.0-preview7.19305.10 + 3.0.0-preview7.19305.10 + 3.0.0-preview7.19305.10 + 3.0.0-preview7.19305.10 From 8e88b806acedf1c2a7926b531a9cd715423f3e91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jun 2019 02:10:57 +0000 Subject: [PATCH 064/471] [master] Update dependencies from dotnet/sdk (#2330) * Update dependencies from https://github.com/dotnet/sdk build 20190605.4 - Microsoft.NET.Sdk - 3.0.100-preview7.19305.4 * Update dependencies from https://github.com/dotnet/sdk build 20190605.5 - Microsoft.NET.Sdk - 3.0.100-preview7.19305.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86be075bc..324d775ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset b31cf935fbaa4a6e7877175a13a1e1a8b49ec5eb - + https://github.com/dotnet/sdk - f9a338d041118637890869bba587b82557947f8f + ec0d2190853afd6c6a8a410d7dc386a9f1ca391b https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index c879c1d3b..2f643f410 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19305.1 + 3.0.100-preview7.19305.5 3.0.0-preview7-27805-01 From 3aaaedea50ba8b9e46c7c9f7bc9ef62fa2d50c86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jun 2019 04:35:59 +0000 Subject: [PATCH 065/471] Update dependencies from https://github.com/dotnet/core-setup build 20190605.02 (#2333) - Microsoft.NETCore.App - 3.0.0-preview7-27805-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27805-02 - NETStandard.Library.Ref - 2.1.0-preview7-27805-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 324d775ca..30212397f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - de0cba8d344629f38eba10596cb9c69fb8214f0c + 2e54d1f6a6a9126126d6c9f8d730489892acf730 - + https://github.com/dotnet/core-setup - de0cba8d344629f38eba10596cb9c69fb8214f0c + 2e54d1f6a6a9126126d6c9f8d730489892acf730 - + https://github.com/dotnet/core-setup - de0cba8d344629f38eba10596cb9c69fb8214f0c + 2e54d1f6a6a9126126d6c9f8d730489892acf730 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 2f643f410..ffc50af8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19305.5 - 3.0.0-preview7-27805-01 + 3.0.0-preview7-27805-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27805-01 + 2.1.0-preview7-27805-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27805-01 + 3.0.0-preview7-27805-02 $(MicrosoftWindowsDesktopAppPackageVersion) From b0c90e8fe408cfaa988a51e9a906b8a0e55adb3c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jun 2019 05:54:11 +0000 Subject: [PATCH 066/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190605.14 (#2334) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19305.14 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19305.14 - dotnet-watch - 3.0.0-preview7.19305.14 - dotnet-user-secrets - 3.0.0-preview7.19305.14 - dotnet-dev-certs - 3.0.0-preview7.19305.14 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19305.14 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30212397f..f1dd93b25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 2e54d1f6a6a9126126d6c9f8d730489892acf730 - + https://github.com/aspnet/AspNetCore - 1ca61453c8ec442a8a1ac6b47b562f37ca529e64 + d3e90a7c07cb2f6770288bc700c5c177882257c8 - + https://github.com/aspnet/AspNetCore - 1ca61453c8ec442a8a1ac6b47b562f37ca529e64 + d3e90a7c07cb2f6770288bc700c5c177882257c8 - + https://github.com/aspnet/AspNetCore - 1ca61453c8ec442a8a1ac6b47b562f37ca529e64 + d3e90a7c07cb2f6770288bc700c5c177882257c8 - + https://github.com/aspnet/AspNetCore - 1ca61453c8ec442a8a1ac6b47b562f37ca529e64 + d3e90a7c07cb2f6770288bc700c5c177882257c8 - + https://github.com/aspnet/AspNetCore - 1ca61453c8ec442a8a1ac6b47b562f37ca529e64 + d3e90a7c07cb2f6770288bc700c5c177882257c8 - + https://github.com/aspnet/AspNetCore - 1ca61453c8ec442a8a1ac6b47b562f37ca529e64 + d3e90a7c07cb2f6770288bc700c5c177882257c8 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index ffc50af8a..fe3b3c7af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19305.10 - 3.0.0-preview7.19305.10 - 3.0.0-preview7.19305.10 - 3.0.0-preview7.19305.10 - 3.0.0-preview7.19305.10 - 3.0.0-preview7.19305.10 + 3.0.0-preview7.19305.14 + 3.0.0-preview7.19305.14 + 3.0.0-preview7.19305.14 + 3.0.0-preview7.19305.14 + 3.0.0-preview7.19305.14 + 3.0.0-preview7.19305.14 From b06a79097b1a194cb15fbe0ff3b4841554f58536 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jun 2019 06:15:34 +0000 Subject: [PATCH 067/471] Update dependencies from https://github.com/dotnet/cli build 20190605.4 (#2335) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19305.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1dd93b25..4176970c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk ec0d2190853afd6c6a8a410d7dc386a9f1ca391b - + https://github.com/dotnet/cli - 20152b3beeec7b9157ab4688494b52cb2fffb190 + 72e57ebcc2dd86feec253d596af23a44a97961d9 diff --git a/eng/Versions.props b/eng/Versions.props index fe3b3c7af..1c69edd35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19304.7 + 3.0.100-preview7.19305.4 1.0.2-beta5.19304.1 From 1811ce77dccc62eb33b8524cb83800ff62df42f2 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Thu, 6 Jun 2019 12:10:53 +0000 Subject: [PATCH 068/471] Update dependencies from https://github.com/dotnet/arcade build 20190605.13 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19305.13 --- eng/Version.Details.xml | 4 ++-- eng/common/tools.ps1 | 4 ++-- global.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 465155180..4538a9e4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - c9ab9c47d6c66fb9ad89e331900e06bed7463904 + d05c046913964e880be08b804e7249f297617c2f diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 3983d719b..538a0262b 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -107,11 +107,11 @@ function Write-PipelineTaskError { if(!$ci) { if($Type -eq 'error') { - Write-Error $Message + Write-Host $Message -ForegroundColor Red return } elseif ($Type -eq 'warning') { - Write-Warning $Message + Write-Host $Message -ForegroundColor Yellow return } } diff --git a/global.json b/global.json index f3390eb1c..314f38d60 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19304.23" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19305.13" } } From 88e42ac270e693d779f0208847525af449ee7a67 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jun 2019 12:42:31 +0000 Subject: [PATCH 069/471] Update dependencies from https://github.com/dotnet/toolset build 20190606.1 (#2337) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19306.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4176970c0..eb0c5319d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 778af19c2c7f99320fe33d38b18003483ebed559 - + https://github.com/dotnet/toolset - b31cf935fbaa4a6e7877175a13a1e1a8b49ec5eb + 6fe28dcc69c5de87189cbe5c1a4aecdbc6e3b642 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 1c69edd35..264976148 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19305.7 + 3.0.100-preview7.19306.1 From 9cbcd5902ce69ee864e8f980d58bfb94917de0dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jun 2019 13:00:52 +0000 Subject: [PATCH 070/471] [master] Update dependencies from dotnet/toolset (#2338) * Update dependencies from https://github.com/dotnet/toolset build 20190606.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19306.2 * Update dependencies from https://github.com/dotnet/toolset build 20190606.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19306.3 * Update dependencies from https://github.com/dotnet/toolset build 20190606.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19306.4 * Update dependencies from https://github.com/dotnet/toolset build 20190606.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19306.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb0c5319d..998460a37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 778af19c2c7f99320fe33d38b18003483ebed559 - + https://github.com/dotnet/toolset - 6fe28dcc69c5de87189cbe5c1a4aecdbc6e3b642 + 616c5f6482be4223bdf2e0f70f59ca8b2a7491c8 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 264976148..6bb45ea51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19306.1 + 3.0.100-preview7.19306.5 From 48b03b956dd6ed204a17b0c3d3a5188be978c2bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jun 2019 13:43:29 +0000 Subject: [PATCH 071/471] Update dependencies from https://github.com/dotnet/toolset build 20190606.6 (#2339) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19306.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 998460a37..1307f84f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 778af19c2c7f99320fe33d38b18003483ebed559 - + https://github.com/dotnet/toolset - 616c5f6482be4223bdf2e0f70f59ca8b2a7491c8 + 89861e2258f43cde56d8bb31d667effc48450ce7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6bb45ea51..c54a076a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19306.5 + 3.0.100-preview7.19306.6 From da18817631d863105e0b2ce2b1dfcd31bab07ee2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jun 2019 14:09:06 +0000 Subject: [PATCH 072/471] Update dependencies from https://github.com/dotnet/toolset build 20190606.7 (#2341) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19306.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1307f84f2..3f3240425 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 778af19c2c7f99320fe33d38b18003483ebed559 - + https://github.com/dotnet/toolset - 89861e2258f43cde56d8bb31d667effc48450ce7 + d4533298cd08398e7fbcc8ef60aaa2345de50d8b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c54a076a1..a6da86dc1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19306.6 + 3.0.100-preview7.19306.7 From cb639db693d4e607f7b288e620abe211e76df5f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jun 2019 15:51:49 +0000 Subject: [PATCH 073/471] Update dependencies from https://github.com/dotnet/toolset build 20190606.8 (#2342) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19306.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f3240425..c4cca751f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 778af19c2c7f99320fe33d38b18003483ebed559 - + https://github.com/dotnet/toolset - d4533298cd08398e7fbcc8ef60aaa2345de50d8b + 99b14de4e8ee45b435ad0c68210fcd59c4987795 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a6da86dc1..f9c93dbc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19306.7 + 3.0.100-preview7.19306.8 From 676f147d2d8e8e56b6054d25de5272752c42ad5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jun 2019 18:43:13 +0000 Subject: [PATCH 074/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190606.1 (#2343) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19306.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19306.1 - dotnet-watch - 3.0.0-preview7.19306.1 - dotnet-user-secrets - 3.0.0-preview7.19306.1 - dotnet-dev-certs - 3.0.0-preview7.19306.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19306.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4cca751f..81b16f538 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 2e54d1f6a6a9126126d6c9f8d730489892acf730 - + https://github.com/aspnet/AspNetCore - d3e90a7c07cb2f6770288bc700c5c177882257c8 + b08577342dc39bc8e6051a66311bfc40f623fccc - + https://github.com/aspnet/AspNetCore - d3e90a7c07cb2f6770288bc700c5c177882257c8 + b08577342dc39bc8e6051a66311bfc40f623fccc - + https://github.com/aspnet/AspNetCore - d3e90a7c07cb2f6770288bc700c5c177882257c8 + b08577342dc39bc8e6051a66311bfc40f623fccc - + https://github.com/aspnet/AspNetCore - d3e90a7c07cb2f6770288bc700c5c177882257c8 + b08577342dc39bc8e6051a66311bfc40f623fccc - + https://github.com/aspnet/AspNetCore - d3e90a7c07cb2f6770288bc700c5c177882257c8 + b08577342dc39bc8e6051a66311bfc40f623fccc - + https://github.com/aspnet/AspNetCore - d3e90a7c07cb2f6770288bc700c5c177882257c8 + b08577342dc39bc8e6051a66311bfc40f623fccc https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index f9c93dbc3..7453317b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19305.14 - 3.0.0-preview7.19305.14 - 3.0.0-preview7.19305.14 - 3.0.0-preview7.19305.14 - 3.0.0-preview7.19305.14 - 3.0.0-preview7.19305.14 + 3.0.0-preview7.19306.1 + 3.0.0-preview7.19306.1 + 3.0.0-preview7.19306.1 + 3.0.0-preview7.19306.1 + 3.0.0-preview7.19306.1 + 3.0.0-preview7.19306.1 From 16d92750447d2800d8f0d5efb0aa202556e392e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jun 2019 19:01:53 +0000 Subject: [PATCH 075/471] Update dependencies from https://github.com/dotnet/core-setup build 20190606.02 (#2344) - Microsoft.NETCore.App - 3.0.0-preview7-27806-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27806-02 - NETStandard.Library.Ref - 2.1.0-preview7-27806-02 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19304.2 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19305.1 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81b16f538..63cebf0f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 2e54d1f6a6a9126126d6c9f8d730489892acf730 + 90a101062a687dc1ac02e02d18c3356feb5e9a09 - + https://github.com/dotnet/core-setup - 2e54d1f6a6a9126126d6c9f8d730489892acf730 + 90a101062a687dc1ac02e02d18c3356feb5e9a09 - + https://github.com/dotnet/core-setup - 2e54d1f6a6a9126126d6c9f8d730489892acf730 + 90a101062a687dc1ac02e02d18c3356feb5e9a09 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 72e57ebcc2dd86feec253d596af23a44a97961d9 - + https://github.com/dotnet/winforms - f1519043cc6448b199af913915ae1d6215ca5840 + f59e9a9dde144098bb58365f210dfdf4acc9e693 - + https://github.com/dotnet/wpf - e3b442768dff9d3afc49d35c331d29177e3bac5f + d1280eb9093b0dd1424777278b93d90adddda5f5 diff --git a/eng/Versions.props b/eng/Versions.props index 7453317b6..1b1f13b4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19303.5 + 4.8.0-preview7.19304.2 - 3.0.0-preview7.19304.4 + 3.0.0-preview7.19305.1 @@ -47,7 +47,7 @@ 3.0.100-preview7.19305.5 - 3.0.0-preview7-27805-02 + 3.0.0-preview7-27806-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27805-02 + 2.1.0-preview7-27806-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27805-02 + 3.0.0-preview7-27806-02 $(MicrosoftWindowsDesktopAppPackageVersion) From c5943a259af22e444e1c386929c4ffd8b64a5e72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Jun 2019 22:06:53 +0000 Subject: [PATCH 076/471] Update dependencies from https://github.com/dotnet/sdk build 20190606.1 (#2346) - Microsoft.NET.Sdk - 3.0.100-preview7.19306.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 63cebf0f6..798f8b3a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 99b14de4e8ee45b435ad0c68210fcd59c4987795 - + https://github.com/dotnet/sdk - ec0d2190853afd6c6a8a410d7dc386a9f1ca391b + d927525780a8fb5edc8a1f5834a0453d64f4c87b https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 1b1f13b4a..b090fa9b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19305.5 + 3.0.100-preview7.19306.1 3.0.0-preview7-27806-02 From eae91d0d97232e58f7d512704b86a81af139ecfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Jun 2019 02:56:12 +0000 Subject: [PATCH 077/471] Update dependencies from https://github.com/dotnet/sdk build 20190606.2 (#2348) - Microsoft.NET.Sdk - 3.0.100-preview7.19306.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 798f8b3a8..b974803c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 99b14de4e8ee45b435ad0c68210fcd59c4987795 - + https://github.com/dotnet/sdk - d927525780a8fb5edc8a1f5834a0453d64f4c87b + de72490d26acee011e22f40113209323976980e0 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index b090fa9b4..0ff325611 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19306.1 + 3.0.100-preview7.19306.2 3.0.0-preview7-27806-02 From f202b594027003b9bca4d05572f2a12755fbe710 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Jun 2019 03:34:40 +0000 Subject: [PATCH 078/471] [master] Update dependencies from aspnet/AspNetCore (#2345) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190606.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19306.4 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19306.4 - dotnet-watch - 3.0.0-preview7.19306.4 - dotnet-user-secrets - 3.0.0-preview7.19306.4 - dotnet-dev-certs - 3.0.0-preview7.19306.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19306.4 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190606.7 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19306.7 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19306.7 - dotnet-watch - 3.0.0-preview7.19306.7 - dotnet-user-secrets - 3.0.0-preview7.19306.7 - dotnet-dev-certs - 3.0.0-preview7.19306.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19306.7 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b974803c1..0b2250f10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 90a101062a687dc1ac02e02d18c3356feb5e9a09 - + https://github.com/aspnet/AspNetCore - b08577342dc39bc8e6051a66311bfc40f623fccc + f7f80fdbaaa0283e8e2e89ceed7abf7fe413b17c - + https://github.com/aspnet/AspNetCore - b08577342dc39bc8e6051a66311bfc40f623fccc + f7f80fdbaaa0283e8e2e89ceed7abf7fe413b17c - + https://github.com/aspnet/AspNetCore - b08577342dc39bc8e6051a66311bfc40f623fccc + f7f80fdbaaa0283e8e2e89ceed7abf7fe413b17c - + https://github.com/aspnet/AspNetCore - b08577342dc39bc8e6051a66311bfc40f623fccc + f7f80fdbaaa0283e8e2e89ceed7abf7fe413b17c - + https://github.com/aspnet/AspNetCore - b08577342dc39bc8e6051a66311bfc40f623fccc + f7f80fdbaaa0283e8e2e89ceed7abf7fe413b17c - + https://github.com/aspnet/AspNetCore - b08577342dc39bc8e6051a66311bfc40f623fccc + f7f80fdbaaa0283e8e2e89ceed7abf7fe413b17c https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 0ff325611..2e50a2c17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19306.1 - 3.0.0-preview7.19306.1 - 3.0.0-preview7.19306.1 - 3.0.0-preview7.19306.1 - 3.0.0-preview7.19306.1 - 3.0.0-preview7.19306.1 + 3.0.0-preview7.19306.7 + 3.0.0-preview7.19306.7 + 3.0.0-preview7.19306.7 + 3.0.0-preview7.19306.7 + 3.0.0-preview7.19306.7 + 3.0.0-preview7.19306.7 From 20684ce82845e3af5ef8b07dbaa30a52fc9f3759 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Fri, 7 Jun 2019 12:09:40 +0000 Subject: [PATCH 079/471] Update dependencies from https://github.com/dotnet/arcade build 20190606.12 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19306.12 --- eng/Version.Details.xml | 4 ++-- eng/common/cross/armel/tizen-fetch.sh | 6 +++--- eng/common/tools.sh | 4 ++-- global.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4538a9e4d..5452052ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - d05c046913964e880be08b804e7249f297617c2f + a1805103791e43031355e11c0d037bca803a9593 diff --git a/eng/common/cross/armel/tizen-fetch.sh b/eng/common/cross/armel/tizen-fetch.sh index ba16e991c..ed70e0a86 100644 --- a/eng/common/cross/armel/tizen-fetch.sh +++ b/eng/common/cross/armel/tizen-fetch.sh @@ -157,15 +157,15 @@ 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 +fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel libatomic fetch_tizen_pkgs noarch linux-glibc-devel Inform "fetch coreclr packages" -fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel tizen-release lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu +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 Inform "Initialize standard unified" fetch_tizen_pkgs_init standard unified Inform "fetch corefx packages" -fetch_tizen_pkgs armv7l gssdp gssdp-devel +fetch_tizen_pkgs armv7l gssdp gssdp-devel tizen-release diff --git a/eng/common/tools.sh b/eng/common/tools.sh index fd26f6fbb..a8dffd345 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -221,7 +221,7 @@ function InitializeDotNetCli { 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 + # Make Sure that our bootstrapped dotnet cli is available 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" @@ -460,4 +460,4 @@ mkdir -p "$log_dir" if [[ $ci == true ]]; then export TEMP="$temp_dir" export TMP="$temp_dir" -fi \ No newline at end of file +fi diff --git a/global.json b/global.json index 314f38d60..bbc265388 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19305.13" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19306.12" } } From 20c496d6e6c8dc59308c6bc23ab6962a346090ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Jun 2019 12:29:46 +0000 Subject: [PATCH 080/471] [master] Update dependencies from dotnet/templating (#2336) * Update dependencies from https://github.com/dotnet/templating build 20190605.1 - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19305.1 * Update dependencies from https://github.com/dotnet/templating build 20190606.1 - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19306.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b2250f10..581028e60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore f7f80fdbaaa0283e8e2e89ceed7abf7fe413b17c - + https://github.com/dotnet/templating - 778af19c2c7f99320fe33d38b18003483ebed559 + bfe390329cbacd6e4911f234d0bb0f75a4986544 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 2e50a2c17..e0388b42c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19305.4 - 1.0.2-beta5.19304.1 + 1.0.2-beta5.19306.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From e261e1d4d2180524c761feae054da18030740b1a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Jun 2019 12:39:12 +0000 Subject: [PATCH 081/471] Update dependencies from https://github.com/dotnet/toolset build 20190607.1 (#2350) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19307.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 581028e60..2903e5b3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating bfe390329cbacd6e4911f234d0bb0f75a4986544 - + https://github.com/dotnet/toolset - 99b14de4e8ee45b435ad0c68210fcd59c4987795 + 290b61b18c274e9d982fcdc56fd0aae93a30cf48 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e0388b42c..8d1a65cd3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19306.8 + 3.0.100-preview7.19307.1 From 2202b769a594a25976436b0a51e64e7eff960243 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Jun 2019 13:25:10 +0000 Subject: [PATCH 082/471] [master] Update dependencies from dotnet/cli (#2340) * Update dependencies from https://github.com/dotnet/cli build 20190606.1 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19306.1 * Update dependencies from https://github.com/dotnet/cli build 20190606.2 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19306.2 * Update dependencies from https://github.com/dotnet/cli build 20190607.1 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19307.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2903e5b3e..2bf7ea897 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk de72490d26acee011e22f40113209323976980e0 - + https://github.com/dotnet/cli - 72e57ebcc2dd86feec253d596af23a44a97961d9 + 3491adb3d3090b9b88d265b514c01009050a9db9 diff --git a/eng/Versions.props b/eng/Versions.props index 8d1a65cd3..0a941c935 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19305.4 + 3.0.100-preview7.19307.1 1.0.2-beta5.19306.1 From 2060846dad1e973fa839a10e6cb139725c145501 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Jun 2019 13:45:53 +0000 Subject: [PATCH 083/471] [master] Update dependencies from dotnet/cli (#2352) * Update dependencies from https://github.com/dotnet/cli build 20190607.3 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19307.3 * Update dependencies from https://github.com/dotnet/cli build 20190607.2 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19307.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2bf7ea897..4301cccd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk de72490d26acee011e22f40113209323976980e0 - + https://github.com/dotnet/cli - 3491adb3d3090b9b88d265b514c01009050a9db9 + 7e3c0cf26975250b467cf884892f09b252acf907 diff --git a/eng/Versions.props b/eng/Versions.props index 0a941c935..6569c0b9f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19307.1 + 3.0.100-preview7.19307.2 1.0.2-beta5.19306.1 From 436bf1e3c02631841e0d5d4100bf743cf9453747 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Jun 2019 17:19:37 +0000 Subject: [PATCH 084/471] [master] Update dependencies from dotnet/core-setup (#2347) * Update dependencies from https://github.com/dotnet/core-setup build 20190523.07 - Microsoft.NETCore.App - 3.0.0-preview6-27723-07 - Microsoft.WindowsDesktop.App - 3.0.0-preview6-27723-07 - NETStandard.Library.Ref - 2.1.0-preview6-27723-07 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview6.19258.6 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview6.19258.4 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190606.03 - Microsoft.NETCore.App - 3.0.0-preview7-27806-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27806-03 - NETStandard.Library.Ref - 2.1.0-preview7-27806-03 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4301cccd9..46706ceca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 90a101062a687dc1ac02e02d18c3356feb5e9a09 + 451922936e2ae806ec03275051806145d630cc80 - + https://github.com/dotnet/core-setup - 90a101062a687dc1ac02e02d18c3356feb5e9a09 + 451922936e2ae806ec03275051806145d630cc80 - + https://github.com/dotnet/core-setup - 90a101062a687dc1ac02e02d18c3356feb5e9a09 + 451922936e2ae806ec03275051806145d630cc80 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 7e3c0cf26975250b467cf884892f09b252acf907 - + https://github.com/dotnet/winforms - f59e9a9dde144098bb58365f210dfdf4acc9e693 + ee51a187ba1d2174233dacb6e2056e5403f9d36e - + https://github.com/dotnet/wpf - d1280eb9093b0dd1424777278b93d90adddda5f5 + 7551f19f92c1fd734ea77a689786c53e57ac47b5 diff --git a/eng/Versions.props b/eng/Versions.props index 6569c0b9f..14c132afb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19304.2 + 4.8.0-preview6.19258.6 - 3.0.0-preview7.19305.1 + 3.0.0-preview6.19258.4 @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27806-02 + 3.0.0-preview7-27806-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27806-02 + 2.1.0-preview7-27806-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27806-02 + 3.0.0-preview7-27806-03 $(MicrosoftWindowsDesktopAppPackageVersion) From f950cff44fc4baf8decc214ee6012813e9972ab9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Jun 2019 18:05:58 +0000 Subject: [PATCH 085/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190607.1 (#2353) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19307.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19307.1 - dotnet-watch - 3.0.0-preview7.19307.1 - dotnet-user-secrets - 3.0.0-preview7.19307.1 - dotnet-dev-certs - 3.0.0-preview7.19307.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19307.1 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19304.2 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19305.1 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46706ceca..3edd413f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 451922936e2ae806ec03275051806145d630cc80 - + https://github.com/aspnet/AspNetCore - f7f80fdbaaa0283e8e2e89ceed7abf7fe413b17c + b34acc9e86b186aa7fbe64bb2651f82116433ec7 - + https://github.com/aspnet/AspNetCore - f7f80fdbaaa0283e8e2e89ceed7abf7fe413b17c + b34acc9e86b186aa7fbe64bb2651f82116433ec7 - + https://github.com/aspnet/AspNetCore - f7f80fdbaaa0283e8e2e89ceed7abf7fe413b17c + b34acc9e86b186aa7fbe64bb2651f82116433ec7 - + https://github.com/aspnet/AspNetCore - f7f80fdbaaa0283e8e2e89ceed7abf7fe413b17c + b34acc9e86b186aa7fbe64bb2651f82116433ec7 - + https://github.com/aspnet/AspNetCore - f7f80fdbaaa0283e8e2e89ceed7abf7fe413b17c + b34acc9e86b186aa7fbe64bb2651f82116433ec7 - + https://github.com/aspnet/AspNetCore - f7f80fdbaaa0283e8e2e89ceed7abf7fe413b17c + b34acc9e86b186aa7fbe64bb2651f82116433ec7 https://github.com/dotnet/templating @@ -55,13 +55,13 @@ 7e3c0cf26975250b467cf884892f09b252acf907 - + https://github.com/dotnet/winforms - ee51a187ba1d2174233dacb6e2056e5403f9d36e + f59e9a9dde144098bb58365f210dfdf4acc9e693 - + https://github.com/dotnet/wpf - 7551f19f92c1fd734ea77a689786c53e57ac47b5 + d1280eb9093b0dd1424777278b93d90adddda5f5 diff --git a/eng/Versions.props b/eng/Versions.props index 14c132afb..4d5e64320 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,20 +16,20 @@ - 4.8.0-preview6.19258.6 + 4.8.0-preview7.19304.2 - 3.0.0-preview6.19258.4 + 3.0.0-preview7.19305.1 - 3.0.0-preview7.19306.7 - 3.0.0-preview7.19306.7 - 3.0.0-preview7.19306.7 - 3.0.0-preview7.19306.7 - 3.0.0-preview7.19306.7 - 3.0.0-preview7.19306.7 + 3.0.0-preview7.19307.1 + 3.0.0-preview7.19307.1 + 3.0.0-preview7.19307.1 + 3.0.0-preview7.19307.1 + 3.0.0-preview7.19307.1 + 3.0.0-preview7.19307.1 From 3e9f707f52bf5f17ba64d2b31d29ac8fe84c4366 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Jun 2019 20:00:56 +0000 Subject: [PATCH 086/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190607.3 (#2355) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19307.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19307.3 - dotnet-watch - 3.0.0-preview7.19307.3 - dotnet-user-secrets - 3.0.0-preview7.19307.3 - dotnet-dev-certs - 3.0.0-preview7.19307.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19307.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3edd413f7..228afa2bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 451922936e2ae806ec03275051806145d630cc80 - + https://github.com/aspnet/AspNetCore - b34acc9e86b186aa7fbe64bb2651f82116433ec7 + d058e0f4956c28d3dccad772049de14bf686be6e - + https://github.com/aspnet/AspNetCore - b34acc9e86b186aa7fbe64bb2651f82116433ec7 + d058e0f4956c28d3dccad772049de14bf686be6e - + https://github.com/aspnet/AspNetCore - b34acc9e86b186aa7fbe64bb2651f82116433ec7 + d058e0f4956c28d3dccad772049de14bf686be6e - + https://github.com/aspnet/AspNetCore - b34acc9e86b186aa7fbe64bb2651f82116433ec7 + d058e0f4956c28d3dccad772049de14bf686be6e - + https://github.com/aspnet/AspNetCore - b34acc9e86b186aa7fbe64bb2651f82116433ec7 + d058e0f4956c28d3dccad772049de14bf686be6e - + https://github.com/aspnet/AspNetCore - b34acc9e86b186aa7fbe64bb2651f82116433ec7 + d058e0f4956c28d3dccad772049de14bf686be6e https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 4d5e64320..b3460f807 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19307.1 - 3.0.0-preview7.19307.1 - 3.0.0-preview7.19307.1 - 3.0.0-preview7.19307.1 - 3.0.0-preview7.19307.1 - 3.0.0-preview7.19307.1 + 3.0.0-preview7.19307.3 + 3.0.0-preview7.19307.3 + 3.0.0-preview7.19307.3 + 3.0.0-preview7.19307.3 + 3.0.0-preview7.19307.3 + 3.0.0-preview7.19307.3 From 00e9a4f06ef6736245d92d32fb4bae0e090d2177 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Jun 2019 21:58:24 +0000 Subject: [PATCH 087/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190607.4 (#2358) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19307.4 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19307.4 - dotnet-watch - 3.0.0-preview7.19307.4 - dotnet-user-secrets - 3.0.0-preview7.19307.4 - dotnet-dev-certs - 3.0.0-preview7.19307.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19307.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 228afa2bb..c02868c8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 451922936e2ae806ec03275051806145d630cc80 - + https://github.com/aspnet/AspNetCore - d058e0f4956c28d3dccad772049de14bf686be6e + 1b5db12d3f849fed5195007e8eae1ebee80f0542 - + https://github.com/aspnet/AspNetCore - d058e0f4956c28d3dccad772049de14bf686be6e + 1b5db12d3f849fed5195007e8eae1ebee80f0542 - + https://github.com/aspnet/AspNetCore - d058e0f4956c28d3dccad772049de14bf686be6e + 1b5db12d3f849fed5195007e8eae1ebee80f0542 - + https://github.com/aspnet/AspNetCore - d058e0f4956c28d3dccad772049de14bf686be6e + 1b5db12d3f849fed5195007e8eae1ebee80f0542 - + https://github.com/aspnet/AspNetCore - d058e0f4956c28d3dccad772049de14bf686be6e + 1b5db12d3f849fed5195007e8eae1ebee80f0542 - + https://github.com/aspnet/AspNetCore - d058e0f4956c28d3dccad772049de14bf686be6e + 1b5db12d3f849fed5195007e8eae1ebee80f0542 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index b3460f807..b9cb906e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19307.3 - 3.0.0-preview7.19307.3 - 3.0.0-preview7.19307.3 - 3.0.0-preview7.19307.3 - 3.0.0-preview7.19307.3 - 3.0.0-preview7.19307.3 + 3.0.0-preview7.19307.4 + 3.0.0-preview7.19307.4 + 3.0.0-preview7.19307.4 + 3.0.0-preview7.19307.4 + 3.0.0-preview7.19307.4 + 3.0.0-preview7.19307.4 From 2720112b3e154ec0539a84263c7950546cc5c648 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 00:38:42 +0000 Subject: [PATCH 088/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190607.6 (#2360) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19307.6 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19307.6 - dotnet-watch - 3.0.0-preview7.19307.6 - dotnet-user-secrets - 3.0.0-preview7.19307.6 - dotnet-dev-certs - 3.0.0-preview7.19307.6 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19307.6 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c02868c8b..eec13aaf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 451922936e2ae806ec03275051806145d630cc80 - + https://github.com/aspnet/AspNetCore - 1b5db12d3f849fed5195007e8eae1ebee80f0542 + f10680a37ab34c2b92829bc5135dde253260614a - + https://github.com/aspnet/AspNetCore - 1b5db12d3f849fed5195007e8eae1ebee80f0542 + f10680a37ab34c2b92829bc5135dde253260614a - + https://github.com/aspnet/AspNetCore - 1b5db12d3f849fed5195007e8eae1ebee80f0542 + f10680a37ab34c2b92829bc5135dde253260614a - + https://github.com/aspnet/AspNetCore - 1b5db12d3f849fed5195007e8eae1ebee80f0542 + f10680a37ab34c2b92829bc5135dde253260614a - + https://github.com/aspnet/AspNetCore - 1b5db12d3f849fed5195007e8eae1ebee80f0542 + f10680a37ab34c2b92829bc5135dde253260614a - + https://github.com/aspnet/AspNetCore - 1b5db12d3f849fed5195007e8eae1ebee80f0542 + f10680a37ab34c2b92829bc5135dde253260614a https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index b9cb906e0..ef6bac3ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19307.4 - 3.0.0-preview7.19307.4 - 3.0.0-preview7.19307.4 - 3.0.0-preview7.19307.4 - 3.0.0-preview7.19307.4 - 3.0.0-preview7.19307.4 + 3.0.0-preview7.19307.6 + 3.0.0-preview7.19307.6 + 3.0.0-preview7.19307.6 + 3.0.0-preview7.19307.6 + 3.0.0-preview7.19307.6 + 3.0.0-preview7.19307.6 From b23b9ffe77efee4d0d1d175ff441a352799e27bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 02:52:52 +0000 Subject: [PATCH 089/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190607.8 (#2361) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19307.8 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19307.8 - dotnet-watch - 3.0.0-preview7.19307.8 - dotnet-user-secrets - 3.0.0-preview7.19307.8 - dotnet-dev-certs - 3.0.0-preview7.19307.8 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19307.8 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eec13aaf3..45ee2155e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 451922936e2ae806ec03275051806145d630cc80 - + https://github.com/aspnet/AspNetCore - f10680a37ab34c2b92829bc5135dde253260614a + b5adc6b156ba8e08d95e0dc5585973deb09f0993 - + https://github.com/aspnet/AspNetCore - f10680a37ab34c2b92829bc5135dde253260614a + b5adc6b156ba8e08d95e0dc5585973deb09f0993 - + https://github.com/aspnet/AspNetCore - f10680a37ab34c2b92829bc5135dde253260614a + b5adc6b156ba8e08d95e0dc5585973deb09f0993 - + https://github.com/aspnet/AspNetCore - f10680a37ab34c2b92829bc5135dde253260614a + b5adc6b156ba8e08d95e0dc5585973deb09f0993 - + https://github.com/aspnet/AspNetCore - f10680a37ab34c2b92829bc5135dde253260614a + b5adc6b156ba8e08d95e0dc5585973deb09f0993 - + https://github.com/aspnet/AspNetCore - f10680a37ab34c2b92829bc5135dde253260614a + b5adc6b156ba8e08d95e0dc5585973deb09f0993 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index ef6bac3ef..3d7d14b82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19307.6 - 3.0.0-preview7.19307.6 - 3.0.0-preview7.19307.6 - 3.0.0-preview7.19307.6 - 3.0.0-preview7.19307.6 - 3.0.0-preview7.19307.6 + 3.0.0-preview7.19307.8 + 3.0.0-preview7.19307.8 + 3.0.0-preview7.19307.8 + 3.0.0-preview7.19307.8 + 3.0.0-preview7.19307.8 + 3.0.0-preview7.19307.8 From 8e1de5e89ca8846bd76759ffb325a1605fb5637c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 07:20:04 +0000 Subject: [PATCH 090/471] Update dependencies from https://github.com/dotnet/core-setup build 20190607.12 (#2362) - NETStandard.Library.Ref - 2.1.0-preview7-27807-12 - Microsoft.NETCore.App - 3.0.0-preview7-27807-12 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27807-12 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19306.1 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45ee2155e..82df8ab93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 451922936e2ae806ec03275051806145d630cc80 + eedf1157a6fd800c228455998658579979ac1c18 - + https://github.com/dotnet/core-setup - 451922936e2ae806ec03275051806145d630cc80 + eedf1157a6fd800c228455998658579979ac1c18 - + https://github.com/dotnet/core-setup - 451922936e2ae806ec03275051806145d630cc80 + eedf1157a6fd800c228455998658579979ac1c18 https://github.com/aspnet/AspNetCore @@ -59,9 +59,9 @@ https://github.com/dotnet/winforms f59e9a9dde144098bb58365f210dfdf4acc9e693 - + https://github.com/dotnet/wpf - d1280eb9093b0dd1424777278b93d90adddda5f5 + 1798ea52f6f12049cb2be6a55132741638bb68b4 diff --git a/eng/Versions.props b/eng/Versions.props index 3d7d14b82..a69fef946 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.0-preview7.19305.1 + 3.0.0-preview7.19306.1 @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27806-03 + 3.0.0-preview7-27807-12 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27806-03 + 2.1.0-preview7-27807-12 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27806-03 + 3.0.0-preview7-27807-12 $(MicrosoftWindowsDesktopAppPackageVersion) From 3c2fb990558e50cd8129c74994234c50a7189006 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 09:54:15 +0000 Subject: [PATCH 091/471] Update dependencies from https://github.com/dotnet/core-setup build 20190608.01 (#2363) - NETStandard.Library.Ref - 2.1.0-preview7-27808-01 - Microsoft.NETCore.App - 3.0.0-preview7-27808-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27808-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82df8ab93..88dfb1854 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - eedf1157a6fd800c228455998658579979ac1c18 + f5041cb31251f48f5f1edccb326c25fe7f4ee43a - + https://github.com/dotnet/core-setup - eedf1157a6fd800c228455998658579979ac1c18 + f5041cb31251f48f5f1edccb326c25fe7f4ee43a - + https://github.com/dotnet/core-setup - eedf1157a6fd800c228455998658579979ac1c18 + f5041cb31251f48f5f1edccb326c25fe7f4ee43a https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index a69fef946..39e2d407e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27807-12 + 3.0.0-preview7-27808-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27807-12 + 2.1.0-preview7-27808-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27807-12 + 3.0.0-preview7-27808-01 $(MicrosoftWindowsDesktopAppPackageVersion) From daa1c48021708f212d3305b74b6f48db3b1803be Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Sat, 8 Jun 2019 12:08:27 +0000 Subject: [PATCH 092/471] Update dependencies from https://github.com/dotnet/arcade build 20190607.62 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19307.62 --- eng/Version.Details.xml | 4 +-- eng/common/darc-init.ps1 | 8 ++--- eng/common/generate-graph-files.ps1 | 20 ++++++------ eng/common/init-tools-native.ps1 | 21 ++++++------- eng/common/native/CommonLibrary.psm1 | 2 +- eng/common/tools.ps1 | 46 +++++++++++++++------------- global.json | 2 +- 7 files changed, 52 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5452052ee..b7e48a028 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - a1805103791e43031355e11c0d037bca803a9593 + 29999b2846623e2d96733577165968d09bc2bcc1 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index dea7cdd90..8854d979f 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -11,10 +11,10 @@ function InstallDarcCli ($darcVersion) { $dotnetRoot = InitializeDotNetCli -install:$true $dotnet = "$dotnetRoot\dotnet.exe" - $toolList = Invoke-Expression "& `"$dotnet`" tool list -g" + $toolList = & "$dotnet" tool list -g if ($toolList -like "*$darcCliPackageName*") { - Invoke-Expression "& `"$dotnet`" tool uninstall $darcCliPackageName -g" + & "$dotnet" tool uninstall $darcCliPackageName -g } # If the user didn't explicitly specify the darc version, @@ -22,12 +22,12 @@ function InstallDarcCli ($darcVersion) { if (-not $darcVersion) { $darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content } - + $arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json' Write-Host "Installing Darc CLI version $darcVersion..." Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - Invoke-Expression "& `"$dotnet`" tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g" + & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g } InstallDarcCli $darcVersion diff --git a/eng/common/generate-graph-files.ps1 b/eng/common/generate-graph-files.ps1 index a05b84f79..b056e4c1a 100644 --- a/eng/common/generate-graph-files.ps1 +++ b/eng/common/generate-graph-files.ps1 @@ -25,7 +25,7 @@ function CheckExitCode ([string]$stage) try { Push-Location $PSScriptRoot - + Write-Host "Installing darc..." . .\darc-init.ps1 -darcVersion $darcVersion CheckExitCode "Running darc-init" @@ -40,9 +40,9 @@ try { $darcExe = "$env:USERPROFILE\.dotnet\tools" $darcExe = Resolve-Path "$darcExe\darc.exe" - + Create-Directory $outputFolder - + # Generate 3 graph descriptions: # 1. Flat with coherency information # 2. Graphviz (dot) file @@ -51,26 +51,26 @@ try { $graphVizImageFilePath = "$outputFolder\graph.png" $normalGraphFilePath = "$outputFolder\graph-full.txt" $flatGraphFilePath = "$outputFolder\graph-flat.txt" - $baseOptions = "get-dependency-graph --github-pat $gitHubPat --azdev-pat $azdoPat --password $barToken" - + $baseOptions = @( "--github-pat", "$gitHubPat", "--azdev-pat", "$azdoPat", "--password", "$barToken" ) + if ($includeToolset) { Write-Host "Toolsets will be included in the graph..." - $baseOptions += " --include-toolset" + $baseOptions += @( "--include-toolset" ) } Write-Host "Generating standard dependency graph..." - Invoke-Expression "& `"$darcExe`" $baseOptions --output-file $normalGraphFilePath" + & "$darcExe" get-dependency-graph @baseOptions --output-file $normalGraphFilePath CheckExitCode "Generating normal dependency graph" Write-Host "Generating flat dependency graph and graphviz file..." - Invoke-Expression "& `"$darcExe`" $baseOptions --flat --coherency --graphviz $graphVizFilePath --output-file $flatGraphFilePath" + & "$darcExe" get-dependency-graph @baseOptions --flat --coherency --graphviz $graphVizFilePath --output-file $flatGraphFilePath CheckExitCode "Generating flat and graphviz dependency graph" Write-Host "Generating graph image $graphVizFilePath" $dotFilePath = Join-Path $installBin "graphviz\$graphvizVersion\release\bin\dot.exe" - Invoke-Expression "& `"$dotFilePath`" -Tpng -o'$graphVizImageFilePath' `"$graphVizFilePath`"" + & "$dotFilePath" -Tpng -o"$graphVizImageFilePath" "$graphVizFilePath" CheckExitCode "Generating graphviz image" - + Write-Host "'$graphVizFilePath', '$flatGraphFilePath', '$normalGraphFilePath' and '$graphVizImageFilePath' created!" } catch { diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index a4306bd37..9d18645f4 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -79,28 +79,27 @@ try { $NativeTools.PSObject.Properties | ForEach-Object { $ToolName = $_.Name $ToolVersion = $_.Value - $LocalInstallerCommand = $InstallerPath - $LocalInstallerCommand += " -ToolName $ToolName" - $LocalInstallerCommand += " -InstallPath $InstallBin" - $LocalInstallerCommand += " -BaseUri $BaseUri" - $LocalInstallerCommand += " -CommonLibraryDirectory $EngCommonBaseDir" - $LocalInstallerCommand += " -Version $ToolVersion" + $LocalInstallerArguments = @{ ToolName = "$ToolName" } + $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } + $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } + $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } + $LocalInstallerArguments += @{ Version = "$ToolVersion" } if ($Verbose) { - $LocalInstallerCommand += " -Verbose" + $LocalInstallerArguments += @{ Verbose = $True } } if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { if($Force) { - $LocalInstallerCommand += " -Force" + $LocalInstallerArguments += @{ Force = $True } } } if ($Clean) { - $LocalInstallerCommand += " -Clean" + $LocalInstallerArguments += @{ Clean = $True } } Write-Verbose "Installing $ToolName version $ToolVersion" - Write-Verbose "Executing '$LocalInstallerCommand'" - Invoke-Expression "$LocalInstallerCommand" + Write-Verbose "Executing '$InstallerPath $LocalInstallerArguments'" + & $InstallerPath @LocalInstallerArguments if ($LASTEXITCODE -Ne "0") { $errMsg = "$ToolName installation failed" if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1 index f286ae0cd..7a34c7e8a 100644 --- a/eng/common/native/CommonLibrary.psm1 +++ b/eng/common/native/CommonLibrary.psm1 @@ -209,7 +209,7 @@ function New-ScriptShim { Remove-Item (Join-Path $ShimDirectory "$ShimName.exe") } - Invoke-Expression "$ShimDirectory\WinShimmer\winshimmer.exe $ShimName $ToolFilePath $ShimDirectory" + & "$ShimDirectory\WinShimmer\winshimmer.exe" $ShimName $ToolFilePath $ShimDirectory return $True } catch { diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 538a0262b..1b9e2cd88 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -35,7 +35,7 @@ # Specifies which msbuild engine to use for build: 'vs', 'dotnet' or unspecified (determined based on presence of tools.vs in global.json). [string]$msbuildEngine = if (Test-Path variable:msbuildEngine) { $msbuildEngine } else { $null } -# True to attempt using .NET Core already that meets requirements specified in global.json +# True to attempt using .NET Core already that meets requirements specified in global.json # installed on the machine instead of downloading one. [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } @@ -76,7 +76,7 @@ function Exec-Process([string]$command, [string]$commandArgs) { $finished = $false try { - while (-not $process.WaitForExit(100)) { + while (-not $process.WaitForExit(100)) { # Non-blocking loop done to allow ctr-c interrupts } @@ -250,7 +250,7 @@ function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $archit } # -# Locates Visual Studio MSBuild installation. +# Locates Visual Studio MSBuild installation. # The preference order for MSBuild to use is as follows: # # 1. MSBuild from an active VS command prompt @@ -267,7 +267,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { "15.9" } - $vsMinVersion = [Version]::new($vsMinVersionStr) + $vsMinVersion = [Version]::new($vsMinVersionStr) # Try msbuild command available in the environment. if ($env:VSINSTALLDIR -ne $null) { @@ -316,7 +316,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) { $env:VSINSTALLDIR = $vsInstallDir Set-Item "env:VS$($vsMajorVersion)0COMNTOOLS" (Join-Path $vsInstallDir "Common7\Tools\") - + $vsSdkInstallDir = Join-Path $vsInstallDir "VSSDK\" if (Test-Path $vsSdkInstallDir) { Set-Item "env:VSSDK$($vsMajorVersion)0Install" $vsSdkInstallDir @@ -351,13 +351,13 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { # Locates Visual Studio instance that meets the minimal requirements specified by tools.vs object in global.json. # # The following properties of tools.vs are recognized: -# "version": "{major}.{minor}" +# "version": "{major}.{minor}" # Two part minimal VS version, e.g. "15.9", "16.0", etc. -# "components": ["componentId1", "componentId2", ...] +# "components": ["componentId1", "componentId2", ...] # Array of ids of workload components that must be available in the VS instance. # See e.g. https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-enterprise?view=vs-2017 # -# Returns JSON describing the located VS instance (same format as returned by vswhere), +# Returns JSON describing the located VS instance (same format as returned by vswhere), # or $null if no instance meeting the requirements is found on the machine. # function LocateVisualStudio([object]$vsRequirements = $null){ @@ -378,7 +378,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @("-latest", "-prerelease", "-format", "json", "-requires", "Microsoft.Component.MSBuild") - + if (Get-Member -InputObject $vsRequirements -Name "version") { $args += "-version" $args += $vsRequirements.version @@ -388,7 +388,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ foreach ($component in $vsRequirements.components) { $args += "-requires" $args += $component - } + } } $vsInfo =& $vsWhereExe $args | ConvertFrom-Json @@ -445,7 +445,7 @@ function GetDefaultMSBuildEngine() { if (Get-Member -InputObject $GlobalJson.tools -Name "vs") { return "vs" } - + if (Get-Member -InputObject $GlobalJson.tools -Name "dotnet") { return "dotnet" } @@ -475,11 +475,13 @@ function GetSdkTaskProject([string]$taskName) { function InitializeNativeTools() { if (Get-Member -InputObject $GlobalJson -Name "native-tools") { - $nativeArgs="" + $nativeArgs= @{} if ($ci) { - $nativeArgs = "-InstallDirectory $ToolsDir" + $nativeArgs = @{ + InstallDirectory = "$ToolsDir" + } } - Invoke-Expression "& `"$PSScriptRoot/init-tools-native.ps1`" $nativeArgs" + & "$PSScriptRoot/init-tools-native.ps1" @nativeArgs } } @@ -573,8 +575,8 @@ function MSBuild-Core() { $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" - if ($warnAsError) { - $cmdArgs += " /warnaserror /p:TreatWarningsAsErrors=true" + if ($warnAsError) { + $cmdArgs += " /warnaserror /p:TreatWarningsAsErrors=true" } foreach ($arg in $args) { @@ -582,29 +584,29 @@ function MSBuild-Core() { $cmdArgs += " `"$arg`"" } } - + $exitCode = Exec-Process $buildTool.Path $cmdArgs if ($exitCode -ne 0) { Write-PipelineTaskError "Build failed." $buildLog = GetMSBuildBinaryLogCommandLineArgument $args - if ($buildLog -ne $null) { - Write-Host "See log: $buildLog" -ForegroundColor DarkGray + if ($buildLog -ne $null) { + Write-Host "See log: $buildLog" -ForegroundColor DarkGray } ExitWithExitCode $exitCode } } -function GetMSBuildBinaryLogCommandLineArgument($arguments) { +function GetMSBuildBinaryLogCommandLineArgument($arguments) { foreach ($argument in $arguments) { if ($argument -ne $null) { $arg = $argument.Trim() if ($arg.StartsWith("/bl:", "OrdinalIgnoreCase")) { return $arg.Substring("/bl:".Length) - } - + } + if ($arg.StartsWith("/binaryLogger:", "OrdinalIgnoreCase")) { return $arg.Substring("/binaryLogger:".Length) } diff --git a/global.json b/global.json index bbc265388..4b6b14dd0 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19306.12" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19307.62" } } From 4b44536325d33efdb63cbaed283dd61078931266 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 12:23:55 +0000 Subject: [PATCH 093/471] Update dependencies from https://github.com/dotnet/templating build 20190607.1 (#2364) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19307.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88dfb1854..83980b902 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore b5adc6b156ba8e08d95e0dc5585973deb09f0993 - + https://github.com/dotnet/templating - bfe390329cbacd6e4911f234d0bb0f75a4986544 + e75673a5cdb9bd131d350c827f0da665e38157ce https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 39e2d407e..c7df6d907 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19307.2 - 1.0.2-beta5.19306.1 + 1.0.2-beta5.19307.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From 87c91b8d58822e2ec5a7f41dda32377190a252e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 12:39:25 +0000 Subject: [PATCH 094/471] [master] Update dependencies from dotnet/toolset (#2351) * Update dependencies from https://github.com/dotnet/toolset build 20190607.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19307.3 * Update dependencies from https://github.com/dotnet/toolset build 20190608.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19308.1 * Update dependencies from https://github.com/dotnet/toolset build 20190608.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19308.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83980b902..3044d3a67 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e75673a5cdb9bd131d350c827f0da665e38157ce - + https://github.com/dotnet/toolset - 290b61b18c274e9d982fcdc56fd0aae93a30cf48 + f29a2924ded7fc90bd5b11a8bfcebd493ae5fec7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c7df6d907..07b60d65c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19307.1 + 3.0.100-preview7.19308.2 From fb6f6b66bfe02cc235c581da92c852debeab3436 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 12:55:35 +0000 Subject: [PATCH 095/471] Update dependencies from https://github.com/dotnet/toolset build 20190608.3 (#2365) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19308.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3044d3a67..576771acd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e75673a5cdb9bd131d350c827f0da665e38157ce - + https://github.com/dotnet/toolset - f29a2924ded7fc90bd5b11a8bfcebd493ae5fec7 + e54fa2fd72af1f228ecd29fdfb916918c267a106 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 07b60d65c..8a028aeba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19308.2 + 3.0.100-preview7.19308.3 From f52b5b6c94df404edba3fc8e285700b72d5b351a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 13:27:23 +0000 Subject: [PATCH 096/471] Update dependencies from https://github.com/dotnet/toolset build 20190608.4 (#2366) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19308.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 576771acd..57a4dd0be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e75673a5cdb9bd131d350c827f0da665e38157ce - + https://github.com/dotnet/toolset - e54fa2fd72af1f228ecd29fdfb916918c267a106 + 29749bc39cbb8a0e9bc5e9ad91b67310eb01c64a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 8a028aeba..79842bd66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19308.3 + 3.0.100-preview7.19308.4 From 90a56f109c4dcd89c00f97e2b1d6346622162c03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 13:33:05 +0000 Subject: [PATCH 097/471] [master] Update dependencies from dotnet/cli (#2357) * Update dependencies from https://github.com/dotnet/cli build 20190607.4 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19307.4 * Update dependencies from https://github.com/dotnet/cli build 20190608.1 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19308.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57a4dd0be..78710dfae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk de72490d26acee011e22f40113209323976980e0 - + https://github.com/dotnet/cli - 7e3c0cf26975250b467cf884892f09b252acf907 + 972082f061d063b85031354d9154711f9127c0db diff --git a/eng/Versions.props b/eng/Versions.props index 79842bd66..e376bcfb8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19307.2 + 3.0.100-preview7.19308.1 1.0.2-beta5.19307.1 From f97c831b9b82bfe8b65f51a9eae09c35e054cd86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 13:44:58 +0000 Subject: [PATCH 098/471] Update dependencies from https://github.com/dotnet/toolset build 20190608.5 (#2367) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19308.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78710dfae..590258724 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e75673a5cdb9bd131d350c827f0da665e38157ce - + https://github.com/dotnet/toolset - 29749bc39cbb8a0e9bc5e9ad91b67310eb01c64a + ed2eba249c109adf2bb232656620149cadbc1155 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e376bcfb8..96b218b2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19308.4 + 3.0.100-preview7.19308.5 From 806cea7d069cc9fdb8cfb491b6a29c173af54d4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 14:38:31 +0000 Subject: [PATCH 099/471] Update dependencies from https://github.com/dotnet/core-setup build 20190608.02 (#2368) - NETStandard.Library.Ref - 2.1.0-preview7-27808-02 - Microsoft.NETCore.App - 3.0.0-preview7-27808-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27808-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 590258724..e172c0412 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - f5041cb31251f48f5f1edccb326c25fe7f4ee43a + e2610ad81cf9f1148bcc87fb38050c269008f2c4 - + https://github.com/dotnet/core-setup - f5041cb31251f48f5f1edccb326c25fe7f4ee43a + e2610ad81cf9f1148bcc87fb38050c269008f2c4 - + https://github.com/dotnet/core-setup - f5041cb31251f48f5f1edccb326c25fe7f4ee43a + e2610ad81cf9f1148bcc87fb38050c269008f2c4 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 96b218b2e..61c4bad7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27808-01 + 3.0.0-preview7-27808-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27808-01 + 2.1.0-preview7-27808-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27808-01 + 3.0.0-preview7-27808-02 $(MicrosoftWindowsDesktopAppPackageVersion) From 4a9f8ea83fb2a0f92baef960fc1d7f5219368033 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 16:08:16 +0000 Subject: [PATCH 100/471] Update dependencies from https://github.com/dotnet/core-setup build 20190608.03 (#2369) - NETStandard.Library.Ref - 2.1.0-preview7-27808-03 - Microsoft.NETCore.App - 3.0.0-preview7-27808-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27808-03 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19305.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19307.1 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e172c0412..f1df94be5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - e2610ad81cf9f1148bcc87fb38050c269008f2c4 + 752cb97e1c6ae4ebaec1719b7d657859b852966b - + https://github.com/dotnet/core-setup - e2610ad81cf9f1148bcc87fb38050c269008f2c4 + 752cb97e1c6ae4ebaec1719b7d657859b852966b - + https://github.com/dotnet/core-setup - e2610ad81cf9f1148bcc87fb38050c269008f2c4 + 752cb97e1c6ae4ebaec1719b7d657859b852966b https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 972082f061d063b85031354d9154711f9127c0db - + https://github.com/dotnet/winforms - f59e9a9dde144098bb58365f210dfdf4acc9e693 + e65ecacdf2da06f11c847571b467f632393bd060 - + https://github.com/dotnet/wpf - 1798ea52f6f12049cb2be6a55132741638bb68b4 + b7fca7bba7fa126216709f55577de65c5ea49ca1 diff --git a/eng/Versions.props b/eng/Versions.props index 61c4bad7f..fe160ab51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19304.2 + 4.8.0-preview7.19305.1 - 3.0.0-preview7.19306.1 + 3.0.0-preview7.19307.1 @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27808-02 + 3.0.0-preview7-27808-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27808-02 + 2.1.0-preview7-27808-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27808-02 + 3.0.0-preview7-27808-03 $(MicrosoftWindowsDesktopAppPackageVersion) From f82cca72bea2fac7076fa35a25f7bb7cbe37e8da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 16:23:41 +0000 Subject: [PATCH 101/471] Update dependencies from https://github.com/dotnet/core-setup build 20190608.04 (#2370) - NETStandard.Library.Ref - 2.1.0-preview7-27808-04 - Microsoft.NETCore.App - 3.0.0-preview7-27808-04 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27808-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1df94be5..5b1b6537e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 752cb97e1c6ae4ebaec1719b7d657859b852966b + a706b4834f912f1140005f345fe5a65802bb5411 - + https://github.com/dotnet/core-setup - 752cb97e1c6ae4ebaec1719b7d657859b852966b + a706b4834f912f1140005f345fe5a65802bb5411 - + https://github.com/dotnet/core-setup - 752cb97e1c6ae4ebaec1719b7d657859b852966b + a706b4834f912f1140005f345fe5a65802bb5411 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index fe160ab51..d99d44b3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27808-03 + 3.0.0-preview7-27808-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27808-03 + 2.1.0-preview7-27808-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27808-03 + 3.0.0-preview7-27808-04 $(MicrosoftWindowsDesktopAppPackageVersion) From f47abdc0e8b5271a522b7dd6fce130a0e750eedb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 17:28:54 +0000 Subject: [PATCH 102/471] Update dependencies from https://github.com/dotnet/core-setup build 20190608.05 (#2371) - NETStandard.Library.Ref - 2.1.0-preview7-27808-05 - Microsoft.NETCore.App - 3.0.0-preview7-27808-05 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27808-05 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b1b6537e..2906a7dfe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup a706b4834f912f1140005f345fe5a65802bb5411 - + https://github.com/dotnet/core-setup a706b4834f912f1140005f345fe5a65802bb5411 - + https://github.com/dotnet/core-setup a706b4834f912f1140005f345fe5a65802bb5411 diff --git a/eng/Versions.props b/eng/Versions.props index d99d44b3e..60918e01c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27808-04 + 3.0.0-preview7-27808-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27808-04 + 2.1.0-preview7-27808-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27808-04 + 3.0.0-preview7-27808-05 $(MicrosoftWindowsDesktopAppPackageVersion) From 6246eeed5f75b22cb48ab7f5717946d2645e984a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 19:11:49 +0000 Subject: [PATCH 103/471] Update dependencies from https://github.com/dotnet/core-setup build 20190608.06 (#2372) - NETStandard.Library.Ref - 2.1.0-preview7-27808-06 - Microsoft.NETCore.App - 3.0.0-preview7-27808-06 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27808-06 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2906a7dfe..10bc8112b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - a706b4834f912f1140005f345fe5a65802bb5411 + ebd5a91dfa49404b7aca24b1ab84a9b080c06675 - + https://github.com/dotnet/core-setup - a706b4834f912f1140005f345fe5a65802bb5411 + ebd5a91dfa49404b7aca24b1ab84a9b080c06675 - + https://github.com/dotnet/core-setup - a706b4834f912f1140005f345fe5a65802bb5411 + ebd5a91dfa49404b7aca24b1ab84a9b080c06675 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 60918e01c..4dd57d377 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27808-05 + 3.0.0-preview7-27808-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27808-05 + 2.1.0-preview7-27808-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27808-05 + 3.0.0-preview7-27808-06 $(MicrosoftWindowsDesktopAppPackageVersion) From ca86b4ad72c4bb15cce4eb8fd7024af6629f8125 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Jun 2019 20:51:29 +0000 Subject: [PATCH 104/471] Update dependencies from https://github.com/dotnet/core-setup build 20190608.07 (#2373) - NETStandard.Library.Ref - 2.1.0-preview7-27808-07 - Microsoft.NETCore.App - 3.0.0-preview7-27808-07 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27808-07 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10bc8112b..814cda9cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - ebd5a91dfa49404b7aca24b1ab84a9b080c06675 + 73a849be10dd3d5840c3cbcecb88ef414ed25419 - + https://github.com/dotnet/core-setup - ebd5a91dfa49404b7aca24b1ab84a9b080c06675 + 73a849be10dd3d5840c3cbcecb88ef414ed25419 - + https://github.com/dotnet/core-setup - ebd5a91dfa49404b7aca24b1ab84a9b080c06675 + 73a849be10dd3d5840c3cbcecb88ef414ed25419 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 4dd57d377..8ce1b0bb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27808-06 + 3.0.0-preview7-27808-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27808-06 + 2.1.0-preview7-27808-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27808-06 + 3.0.0-preview7-27808-07 $(MicrosoftWindowsDesktopAppPackageVersion) From 472a490b2a3cd791b6673656f2246de152e755a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 9 Jun 2019 04:58:43 +0000 Subject: [PATCH 105/471] [master] Update dependencies from dotnet/core-setup (#2374) * Update dependencies from https://github.com/dotnet/core-setup build 20190608.08 - NETStandard.Library.Ref - 2.1.0-preview7-27808-08 - Microsoft.NETCore.App - 3.0.0-preview7-27808-08 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27808-08 * Update dependencies from https://github.com/dotnet/core-setup build 20190608.09 - NETStandard.Library.Ref - 2.1.0-preview7-27808-09 - Microsoft.NETCore.App - 3.0.0-preview7-27808-09 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27808-09 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 814cda9cf..980054952 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 73a849be10dd3d5840c3cbcecb88ef414ed25419 + 3bf60e3db01a141cb8141d4092c077f7efa25b31 - + https://github.com/dotnet/core-setup - 73a849be10dd3d5840c3cbcecb88ef414ed25419 + 3bf60e3db01a141cb8141d4092c077f7efa25b31 - + https://github.com/dotnet/core-setup - 73a849be10dd3d5840c3cbcecb88ef414ed25419 + 3bf60e3db01a141cb8141d4092c077f7efa25b31 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 8ce1b0bb5..76a52f93c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27808-07 + 3.0.0-preview7-27808-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27808-07 + 2.1.0-preview7-27808-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27808-07 + 3.0.0-preview7-27808-09 $(MicrosoftWindowsDesktopAppPackageVersion) From 73a8addff34ac77dcfff3825f21340a9ba9d2e09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 9 Jun 2019 07:18:36 +0000 Subject: [PATCH 106/471] [master] Update dependencies from dotnet/core-setup (#2375) * Update dependencies from https://github.com/dotnet/core-setup build 20190608.10 - NETStandard.Library.Ref - 2.1.0-preview7-27808-10 - Microsoft.NETCore.App - 3.0.0-preview7-27808-10 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27808-10 * Update dependencies from https://github.com/dotnet/core-setup build 20190608.11 - NETStandard.Library.Ref - 2.1.0-preview7-27808-11 - Microsoft.NETCore.App - 3.0.0-preview7-27808-11 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27808-11 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 980054952..f5cfd09cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 3bf60e3db01a141cb8141d4092c077f7efa25b31 + a97c2faf6398fea785e9f043758ebc35aac0a656 - + https://github.com/dotnet/core-setup - 3bf60e3db01a141cb8141d4092c077f7efa25b31 + a97c2faf6398fea785e9f043758ebc35aac0a656 - + https://github.com/dotnet/core-setup - 3bf60e3db01a141cb8141d4092c077f7efa25b31 + a97c2faf6398fea785e9f043758ebc35aac0a656 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 76a52f93c..450baed4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27808-09 + 3.0.0-preview7-27808-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27808-09 + 2.1.0-preview7-27808-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27808-09 + 3.0.0-preview7-27808-11 $(MicrosoftWindowsDesktopAppPackageVersion) From 79247ab2ba6c699633f2b37842612bd99d64628f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 9 Jun 2019 10:49:03 +0000 Subject: [PATCH 107/471] Update dependencies from https://github.com/dotnet/core-setup build 20190609.01 (#2376) - NETStandard.Library.Ref - 2.1.0-preview7-27809-01 - Microsoft.NETCore.App - 3.0.0-preview7-27809-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27809-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5cfd09cb..c57dc7640 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - a97c2faf6398fea785e9f043758ebc35aac0a656 + 12922ef55548c99ee8df29d8bf106fb3eb07295e - + https://github.com/dotnet/core-setup - a97c2faf6398fea785e9f043758ebc35aac0a656 + 12922ef55548c99ee8df29d8bf106fb3eb07295e - + https://github.com/dotnet/core-setup - a97c2faf6398fea785e9f043758ebc35aac0a656 + 12922ef55548c99ee8df29d8bf106fb3eb07295e https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 450baed4e..a5bc13a8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27808-11 + 3.0.0-preview7-27809-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27808-11 + 2.1.0-preview7-27809-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27808-11 + 3.0.0-preview7-27809-01 $(MicrosoftWindowsDesktopAppPackageVersion) From 5d8fbe81382e4e2098eb182b25e1b2c6f64038b1 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Sun, 9 Jun 2019 12:08:40 +0000 Subject: [PATCH 108/471] Update dependencies from https://github.com/dotnet/arcade build 20190608.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19308.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7e48a028..376a1e7a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 29999b2846623e2d96733577165968d09bc2bcc1 + 747a1bdf2a74a486fb075045cb2384fa89a7983c diff --git a/global.json b/global.json index 4b6b14dd0..638bb1793 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19307.62" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19308.1" } } From 0774fee7c9b2a7bea1b64a93401a54203090ef11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 9 Jun 2019 12:38:12 +0000 Subject: [PATCH 109/471] Update dependencies from https://github.com/dotnet/toolset build 20190609.1 (#2378) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19309.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c57dc7640..0a0b77099 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e75673a5cdb9bd131d350c827f0da665e38157ce - + https://github.com/dotnet/toolset - ed2eba249c109adf2bb232656620149cadbc1155 + ad5a435737bf74dc5c1884b2226a28631a85f299 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a5bc13a8b..82f4f4dad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19308.5 + 3.0.100-preview7.19309.1 From 058d74ce27bc0554e907676d59e678aad187a896 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 9 Jun 2019 12:54:48 +0000 Subject: [PATCH 110/471] [master] Update dependencies from dotnet/toolset (#2379) * Update dependencies from https://github.com/dotnet/toolset build 20190609.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19309.2 * Update dependencies from https://github.com/dotnet/toolset build 20190609.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19309.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a0b77099..595803ebe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e75673a5cdb9bd131d350c827f0da665e38157ce - + https://github.com/dotnet/toolset - ad5a435737bf74dc5c1884b2226a28631a85f299 + b75872a6a14e9f358f71941d7b525a91a2b4d81e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 82f4f4dad..5e1c4b9fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19309.1 + 3.0.100-preview7.19309.3 From 0cc743e87f1ff29f49bb9030f0c358d3549a341c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 9 Jun 2019 13:26:50 +0000 Subject: [PATCH 111/471] Update dependencies from https://github.com/dotnet/toolset build 20190609.4 (#2380) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19309.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 595803ebe..cfa735865 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e75673a5cdb9bd131d350c827f0da665e38157ce - + https://github.com/dotnet/toolset - b75872a6a14e9f358f71941d7b525a91a2b4d81e + c62cf143a467e1789271f0accfa8be77a92893b6 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5e1c4b9fa..c169a2db8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19309.3 + 3.0.100-preview7.19309.4 From 2a083f767f816e0de5e0a9f9fb47803bbf64a4bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 9 Jun 2019 13:30:33 +0000 Subject: [PATCH 112/471] Update dependencies from https://github.com/dotnet/cli build 20190609.1 (#2381) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19309.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfa735865..04cd7cf75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk de72490d26acee011e22f40113209323976980e0 - + https://github.com/dotnet/cli - 972082f061d063b85031354d9154711f9127c0db + a5a97e70701e0deaa4fed5b0537320be31127e91 diff --git a/eng/Versions.props b/eng/Versions.props index c169a2db8..dcc9679da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19308.1 + 3.0.100-preview7.19309.1 1.0.2-beta5.19307.1 From 579e28dc9100c2e5efbc87149fe40dc787e4845b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 9 Jun 2019 13:37:54 +0000 Subject: [PATCH 113/471] Update dependencies from https://github.com/dotnet/core-setup build 20190609.02 (#2382) - NETStandard.Library.Ref - 2.1.0-preview7-27809-02 - Microsoft.NETCore.App - 3.0.0-preview7-27809-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27809-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04cd7cf75..f02e5e6cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 12922ef55548c99ee8df29d8bf106fb3eb07295e + f28fca3c8337b5dbc2249d3f66370d8973100e6f - + https://github.com/dotnet/core-setup - 12922ef55548c99ee8df29d8bf106fb3eb07295e + f28fca3c8337b5dbc2249d3f66370d8973100e6f - + https://github.com/dotnet/core-setup - 12922ef55548c99ee8df29d8bf106fb3eb07295e + f28fca3c8337b5dbc2249d3f66370d8973100e6f https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index dcc9679da..99f4c6d60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27809-01 + 3.0.0-preview7-27809-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27809-01 + 2.1.0-preview7-27809-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27809-01 + 3.0.0-preview7-27809-02 $(MicrosoftWindowsDesktopAppPackageVersion) From c74b604cb642b6f373067788feb7d6d7b1c30c3b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 9 Jun 2019 13:44:44 +0000 Subject: [PATCH 114/471] [master] Update dependencies from dotnet/toolset (#2383) * Update dependencies from https://github.com/dotnet/toolset build 20190609.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19309.5 * Update dependencies from https://github.com/dotnet/toolset build 20190609.6 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19309.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f02e5e6cb..fa84d01bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e75673a5cdb9bd131d350c827f0da665e38157ce - + https://github.com/dotnet/toolset - c62cf143a467e1789271f0accfa8be77a92893b6 + 9cce245ae684722eb41d1bd35a487469682fe47a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 99f4c6d60..7dde21e74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19309.4 + 3.0.100-preview7.19309.6 From c55876b77652cd2a5df5867f644dc1c43dc897fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 9 Jun 2019 16:18:49 +0000 Subject: [PATCH 115/471] Update dependencies from https://github.com/dotnet/core-setup build 20190609.05 (#2384) - NETStandard.Library.Ref - 2.1.0-preview7-27809-05 - Microsoft.NETCore.App - 3.0.0-preview7-27809-05 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27809-05 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19306.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19308.1 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa84d01bd..90b37b25d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - f28fca3c8337b5dbc2249d3f66370d8973100e6f + f317bba30a63a6daf157c57dc14b024ab12c007b - + https://github.com/dotnet/core-setup - f28fca3c8337b5dbc2249d3f66370d8973100e6f + f317bba30a63a6daf157c57dc14b024ab12c007b - + https://github.com/dotnet/core-setup - f28fca3c8337b5dbc2249d3f66370d8973100e6f + f317bba30a63a6daf157c57dc14b024ab12c007b https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ a5a97e70701e0deaa4fed5b0537320be31127e91 - + https://github.com/dotnet/winforms - e65ecacdf2da06f11c847571b467f632393bd060 + bec5f97141d8de75e373d9e58c662a614a5f3c63 - + https://github.com/dotnet/wpf - b7fca7bba7fa126216709f55577de65c5ea49ca1 + 7129d5a2179a4568167f9d1f8efaa103e29f550e diff --git a/eng/Versions.props b/eng/Versions.props index 7dde21e74..02ae72a79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19305.1 + 4.8.0-preview7.19306.1 - 3.0.0-preview7.19307.1 + 3.0.0-preview7.19308.1 @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27809-02 + 3.0.0-preview7-27809-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27809-02 + 2.1.0-preview7-27809-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27809-02 + 3.0.0-preview7-27809-05 $(MicrosoftWindowsDesktopAppPackageVersion) From 7fa20e231d8f95b9e9308bd0c0db8ed370eabd41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 9 Jun 2019 16:41:07 +0000 Subject: [PATCH 116/471] Update dependencies from https://github.com/dotnet/core-setup build 20190609.06 (#2385) - NETStandard.Library.Ref - 2.1.0-preview7-27809-06 - Microsoft.NETCore.App - 3.0.0-preview7-27809-06 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27809-06 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90b37b25d..a5c3a4603 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup f317bba30a63a6daf157c57dc14b024ab12c007b - + https://github.com/dotnet/core-setup f317bba30a63a6daf157c57dc14b024ab12c007b - + https://github.com/dotnet/core-setup f317bba30a63a6daf157c57dc14b024ab12c007b diff --git a/eng/Versions.props b/eng/Versions.props index 02ae72a79..6e553f8ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27809-05 + 3.0.0-preview7-27809-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27809-05 + 2.1.0-preview7-27809-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27809-05 + 3.0.0-preview7-27809-06 $(MicrosoftWindowsDesktopAppPackageVersion) From 46c493282285afd0462683fe991e04349514adfc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 9 Jun 2019 18:58:50 +0000 Subject: [PATCH 117/471] Update dependencies from https://github.com/dotnet/core-setup build 20190609.07 (#2386) - NETStandard.Library.Ref - 2.1.0-preview7-27809-07 - Microsoft.NETCore.App - 3.0.0-preview7-27809-07 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27809-07 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5c3a4603..58d455440 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - f317bba30a63a6daf157c57dc14b024ab12c007b + 1b45119cea1d0698832bc3016e194987d105b736 - + https://github.com/dotnet/core-setup - f317bba30a63a6daf157c57dc14b024ab12c007b + 1b45119cea1d0698832bc3016e194987d105b736 - + https://github.com/dotnet/core-setup - f317bba30a63a6daf157c57dc14b024ab12c007b + 1b45119cea1d0698832bc3016e194987d105b736 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 6e553f8ff..bd7c12fb1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27809-06 + 3.0.0-preview7-27809-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27809-06 + 2.1.0-preview7-27809-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27809-06 + 3.0.0-preview7-27809-07 $(MicrosoftWindowsDesktopAppPackageVersion) From 47d944eaf096f7037dc6de395922c2fea524e6dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 9 Jun 2019 20:38:15 +0000 Subject: [PATCH 118/471] Update dependencies from https://github.com/dotnet/core-setup build 20190609.08 (#2387) - NETStandard.Library.Ref - 2.1.0-preview7-27809-08 - Microsoft.NETCore.App - 3.0.0-preview7-27809-08 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27809-08 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58d455440..80f8edee4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 1b45119cea1d0698832bc3016e194987d105b736 + 77fa4a1a04367dedd148389cbf2d9ffe64c5ac0f - + https://github.com/dotnet/core-setup - 1b45119cea1d0698832bc3016e194987d105b736 + 77fa4a1a04367dedd148389cbf2d9ffe64c5ac0f - + https://github.com/dotnet/core-setup - 1b45119cea1d0698832bc3016e194987d105b736 + 77fa4a1a04367dedd148389cbf2d9ffe64c5ac0f https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index bd7c12fb1..ed50f4103 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27809-07 + 3.0.0-preview7-27809-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27809-07 + 2.1.0-preview7-27809-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27809-07 + 3.0.0-preview7-27809-08 $(MicrosoftWindowsDesktopAppPackageVersion) From 14ef025b605495491e572e6aceb0a75084f2a5f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jun 2019 02:35:12 +0000 Subject: [PATCH 119/471] Update dependencies from https://github.com/dotnet/core-setup build 20190609.09 (#2389) - NETStandard.Library.Ref - 2.1.0-preview7-27809-09 - Microsoft.NETCore.App - 3.0.0-preview7-27809-09 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27809-09 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80f8edee4..3c5d4e08c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 77fa4a1a04367dedd148389cbf2d9ffe64c5ac0f + b2a369fb5316c1696b60b1571356582366b77874 - + https://github.com/dotnet/core-setup - 77fa4a1a04367dedd148389cbf2d9ffe64c5ac0f + b2a369fb5316c1696b60b1571356582366b77874 - + https://github.com/dotnet/core-setup - 77fa4a1a04367dedd148389cbf2d9ffe64c5ac0f + b2a369fb5316c1696b60b1571356582366b77874 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index ed50f4103..f983a3f3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27809-08 + 3.0.0-preview7-27809-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27809-08 + 2.1.0-preview7-27809-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27809-08 + 3.0.0-preview7-27809-09 $(MicrosoftWindowsDesktopAppPackageVersion) From 76038a9d979417be32350cce69372bf7f8fc784f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jun 2019 04:47:51 +0000 Subject: [PATCH 120/471] Update dependencies from https://github.com/dotnet/core-setup build 20190609.10 (#2390) - NETStandard.Library.Ref - 2.1.0-preview7-27809-10 - Microsoft.NETCore.App - 3.0.0-preview7-27809-10 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27809-10 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c5d4e08c..486145c03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup b2a369fb5316c1696b60b1571356582366b77874 - + https://github.com/dotnet/core-setup b2a369fb5316c1696b60b1571356582366b77874 - + https://github.com/dotnet/core-setup b2a369fb5316c1696b60b1571356582366b77874 diff --git a/eng/Versions.props b/eng/Versions.props index f983a3f3e..dd98adf7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27809-09 + 3.0.0-preview7-27809-10 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27809-09 + 2.1.0-preview7-27809-10 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27809-09 + 3.0.0-preview7-27809-10 $(MicrosoftWindowsDesktopAppPackageVersion) From 3b4e7f52b2c9b868894b8b42f1bec23209f3f407 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jun 2019 11:00:48 +0000 Subject: [PATCH 121/471] [master] Update dependencies from dotnet/core-setup (#2391) * Update dependencies from https://github.com/dotnet/core-setup build 20190610.01 - NETStandard.Library.Ref - 2.1.0-preview7-27810-01 - Microsoft.NETCore.App - 3.0.0-preview7-27810-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27810-01 * Update dependencies from https://github.com/dotnet/core-setup build 20190610.02 - NETStandard.Library.Ref - 2.1.0-preview7-27810-02 - Microsoft.NETCore.App - 3.0.0-preview7-27810-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27810-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 486145c03..cd8a9a1d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - b2a369fb5316c1696b60b1571356582366b77874 + 3f9156d5d9b5ae4b100baeaa75011aaee88a3f4b - + https://github.com/dotnet/core-setup - b2a369fb5316c1696b60b1571356582366b77874 + 3f9156d5d9b5ae4b100baeaa75011aaee88a3f4b - + https://github.com/dotnet/core-setup - b2a369fb5316c1696b60b1571356582366b77874 + 3f9156d5d9b5ae4b100baeaa75011aaee88a3f4b https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index dd98adf7a..39637c453 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27809-10 + 3.0.0-preview7-27810-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27809-10 + 2.1.0-preview7-27810-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27809-10 + 3.0.0-preview7-27810-02 $(MicrosoftWindowsDesktopAppPackageVersion) From afd0eb97b3b812ea6815a10330fc0f46f05f0718 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Mon, 10 Jun 2019 12:08:57 +0000 Subject: [PATCH 122/471] Update dependencies from https://github.com/dotnet/arcade build 20190609.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19309.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 376a1e7a3..db89aeb72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 747a1bdf2a74a486fb075045cb2384fa89a7983c + 45361625125cdd3119050a852bd73163ca4b73f4 diff --git a/global.json b/global.json index 638bb1793..c8b4124ab 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19308.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19309.1" } } From 46c11c35d35d4c4d850939d6a8bcecda39e0c892 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jun 2019 12:25:49 +0000 Subject: [PATCH 123/471] [master] Update dependencies from dotnet/templating (#2377) * Update dependencies from https://github.com/dotnet/templating build 20190608.1 - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19308.1 * Update dependencies from https://github.com/dotnet/templating build 20190609.1 - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19309.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd8a9a1d0..1e7b7b6f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore b5adc6b156ba8e08d95e0dc5585973deb09f0993 - + https://github.com/dotnet/templating - e75673a5cdb9bd131d350c827f0da665e38157ce + b4a3c0ac00cb996590ce71edca4755202ec4a3c7 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 39637c453..4ebbdbd13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19309.1 - 1.0.2-beta5.19307.1 + 1.0.2-beta5.19309.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From fbb98511733e27e0049ef5a3653282fa61b902b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jun 2019 12:53:49 +0000 Subject: [PATCH 124/471] [master] Update dependencies from dotnet/toolset (#2392) * Update dependencies from https://github.com/dotnet/toolset build 20190610.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19310.1 * Update dependencies from https://github.com/dotnet/toolset build 20190610.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19310.2 * Update dependencies from https://github.com/dotnet/toolset build 20190610.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19310.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e7b7b6f2..31d6f59e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating b4a3c0ac00cb996590ce71edca4755202ec4a3c7 - + https://github.com/dotnet/toolset - 9cce245ae684722eb41d1bd35a487469682fe47a + 81e7072d817e88d90d5c8aa35a93b6d5c8711454 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 4ebbdbd13..d9a51b88f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19309.6 + 3.0.100-preview7.19310.3 From 58049d08f889229d9788d2469568180202aa287d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jun 2019 13:32:27 +0000 Subject: [PATCH 125/471] Update dependencies from https://github.com/dotnet/toolset build 20190610.4 (#2393) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19310.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31d6f59e6..76dc44420 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating b4a3c0ac00cb996590ce71edca4755202ec4a3c7 - + https://github.com/dotnet/toolset - 81e7072d817e88d90d5c8aa35a93b6d5c8711454 + a5e39a0c3acbd03a6880ea1efe700d0775ec3fa8 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d9a51b88f..6ea4308c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19310.3 + 3.0.100-preview7.19310.4 From 96df875d39589dbc1d71bdb956c9e2cd01b897b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jun 2019 13:40:36 +0000 Subject: [PATCH 126/471] Update dependencies from https://github.com/dotnet/cli build 20190610.1 (#2394) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19310.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76dc44420..336652db6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk de72490d26acee011e22f40113209323976980e0 - + https://github.com/dotnet/cli - a5a97e70701e0deaa4fed5b0537320be31127e91 + de56e42bf44be4e7b8efa19e6d22602caf928062 diff --git a/eng/Versions.props b/eng/Versions.props index 6ea4308c6..22ac71014 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19309.1 + 3.0.100-preview7.19310.1 1.0.2-beta5.19309.1 From 6eb23eb06695c2bd2ff62e6bbd3c4ec9fd41219e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jun 2019 17:12:24 +0000 Subject: [PATCH 127/471] [master] Update dependencies from dotnet/core-setup (#2396) * Update dependencies from https://github.com/dotnet/core-setup build 20190610.03 - NETStandard.Library.Ref - 2.1.0-preview7-27810-03 - Microsoft.NETCore.App - 3.0.0-preview7-27810-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27810-03 * Update dependencies from https://github.com/dotnet/core-setup build 20190610.04 - NETStandard.Library.Ref - 2.1.0-preview7-27810-04 - Microsoft.NETCore.App - 3.0.0-preview7-27810-04 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27810-04 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19308.5 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190610.05 - NETStandard.Library.Ref - 2.1.0-preview7-27810-05 - Microsoft.NETCore.App - 3.0.0-preview7-27810-05 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27810-05 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19308.5 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 336652db6..0a7ccce92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 3f9156d5d9b5ae4b100baeaa75011aaee88a3f4b + 622dbb13938389d57fdd1fbe86972add723c95d6 - + https://github.com/dotnet/core-setup - 3f9156d5d9b5ae4b100baeaa75011aaee88a3f4b + 622dbb13938389d57fdd1fbe86972add723c95d6 - + https://github.com/dotnet/core-setup - 3f9156d5d9b5ae4b100baeaa75011aaee88a3f4b + 622dbb13938389d57fdd1fbe86972add723c95d6 https://github.com/aspnet/AspNetCore @@ -59,9 +59,9 @@ https://github.com/dotnet/winforms bec5f97141d8de75e373d9e58c662a614a5f3c63 - + https://github.com/dotnet/wpf - 7129d5a2179a4568167f9d1f8efaa103e29f550e + 947a656105649897d46218d2b03b6ca5b946ca68 diff --git a/eng/Versions.props b/eng/Versions.props index 22ac71014..970c798fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.0-preview7.19308.1 + 3.0.0-preview7.19308.5 @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27810-02 + 3.0.0-preview7-27810-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27810-02 + 2.1.0-preview7-27810-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27810-02 + 3.0.0-preview7-27810-05 $(MicrosoftWindowsDesktopAppPackageVersion) From 540a52186f625c0e1109d2993951920dba1e98c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jun 2019 18:35:37 +0000 Subject: [PATCH 128/471] [master] Update dependencies from dotnet/toolset (#2395) * Update dependencies from https://github.com/dotnet/toolset build 20190610.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19310.5 * Update dependencies from https://github.com/dotnet/toolset build 20190610.6 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19310.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a7ccce92..676e6c9e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating b4a3c0ac00cb996590ce71edca4755202ec4a3c7 - + https://github.com/dotnet/toolset - a5e39a0c3acbd03a6880ea1efe700d0775ec3fa8 + c51c66aadd9282ab384f629c704578e99574305e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 970c798fa..67db1ee62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19310.4 + 3.0.100-preview7.19310.6 From 48e304ca420566af4075e1d7808d1e6d5afee4e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jun 2019 21:08:57 +0000 Subject: [PATCH 129/471] Update dependencies from https://github.com/dotnet/toolset build 20190610.7 (#2399) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19310.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 676e6c9e3..4c0e0839f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating b4a3c0ac00cb996590ce71edca4755202ec4a3c7 - + https://github.com/dotnet/toolset - c51c66aadd9282ab384f629c704578e99574305e + 58ef8d5579f1acef69d84e94bdbfb21d07bcb506 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 67db1ee62..8af624373 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19310.6 + 3.0.100-preview7.19310.7 From ec74a573b8639ace09a7d926d0a749edad43aacc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jun 2019 21:27:00 +0000 Subject: [PATCH 130/471] [master] Update dependencies from dotnet/cli (#2397) * Update dependencies from https://github.com/dotnet/cli build 20190610.3 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19310.3 * Update dependencies from https://github.com/dotnet/cli build 20190610.4 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19310.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c0e0839f..300ae8f39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk de72490d26acee011e22f40113209323976980e0 - + https://github.com/dotnet/cli - de56e42bf44be4e7b8efa19e6d22602caf928062 + 9c210180db802fd867f059af94c6a92a0a851762 diff --git a/eng/Versions.props b/eng/Versions.props index 8af624373..29e94c581 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19310.1 + 3.0.100-preview7.19310.4 1.0.2-beta5.19309.1 From 5b42a9598802af24026002c23cf0f43df66b5ddc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Jun 2019 21:43:16 +0000 Subject: [PATCH 131/471] Update dependencies from https://github.com/dotnet/core-setup build 20190610.06 (#2400) - NETStandard.Library.Ref - 2.1.0-preview7-27810-06 - Microsoft.NETCore.App - 3.0.0-preview7-27810-06 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27810-06 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 300ae8f39..b4db81559 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 622dbb13938389d57fdd1fbe86972add723c95d6 + 0f96bbdcd4ac27227a0b30015dd7e509f71185d9 - + https://github.com/dotnet/core-setup - 622dbb13938389d57fdd1fbe86972add723c95d6 + 0f96bbdcd4ac27227a0b30015dd7e509f71185d9 - + https://github.com/dotnet/core-setup - 622dbb13938389d57fdd1fbe86972add723c95d6 + 0f96bbdcd4ac27227a0b30015dd7e509f71185d9 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 29e94c581..18a7b8f5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27810-05 + 3.0.0-preview7-27810-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27810-05 + 2.1.0-preview7-27810-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27810-05 + 3.0.0-preview7-27810-06 $(MicrosoftWindowsDesktopAppPackageVersion) From 8aff01947a77abe41f000a3cb6005dc11831c351 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 10 Jun 2019 15:32:28 -0700 Subject: [PATCH 132/471] Update runtime pack names --- src/redist/targets/GenerateBundledVersions.targets | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index a2f854bdc..d04825e04 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -189,7 +189,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackVersion="$(NetCoreAppTargetingPackVersion)" AppHostPackNamePattern="runtime.**RID**.Microsoft.NETCore.DotNetAppHost" AppHostRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')" - RuntimePackNamePatterns="runtime.**RID**.Microsoft.NETCore.App%3Bruntime.**RID**.Microsoft.NETCore.DotNetHostResolver%3Bruntime.**RID**.Microsoft.NETCore.DotNetHostPolicy" + RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')" PackagesToReference="Microsoft.NETCore.App/$(NetCoreAppTargetingPackVersion)" IsTrimmable="true" @@ -209,7 +209,7 @@ Copyright (c) .NET Foundation. All rights reserved. LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)" TargetingPackName="Microsoft.WindowsDesktop.App.Ref" TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)" - RuntimePackNamePatterns="runtime.**RID**.Microsoft.WindowsDesktop.App" + RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')" IsWindowsOnly="true" /> @@ -221,7 +221,7 @@ Copyright (c) .NET Foundation. All rights reserved. LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)" TargetingPackName="Microsoft.WindowsDesktop.App.Ref" TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)" - RuntimePackNamePatterns="runtime.**RID**.Microsoft.WindowsDesktop.App" + RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')" IsWindowsOnly="true" Profile="WPF" @@ -234,7 +234,7 @@ Copyright (c) .NET Foundation. All rights reserved. LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)" TargetingPackName="Microsoft.WindowsDesktop.App.Ref" TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)" - RuntimePackNamePatterns="runtime.**RID**.Microsoft.WindowsDesktop.App" + RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')" IsWindowsOnly="true" Profile="WindowsForms" From 1e7815b2dd2e0c1e03f9e87474820063def64f09 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 10 Jun 2019 16:00:53 -0700 Subject: [PATCH 133/471] Produce Toolset MSI NuPkgs for insertion into VS (#2359) * Produce Toolset MSI NuPkgs for insertion into VS; stop producing SDK bundle NuPkgs. --- src/redist/targets/GenerateMSIs.targets | 56 ++++++++++--------- ...mmon.Net.Core.SDK.MSBuildExtensions.nuspec | 4 +- .../VS.Redist.Common.Net.Core.SDK.x86.nuspec | 18 ------ ... VS.Redist.Common.Net.Core.Toolset.nuspec} | 9 +-- .../VS.Tools.Net.Core.SDK.Resolver.nuspec | 4 +- ...86.nuspec => VS.Tools.Net.Core.SDK.nuspec} | 8 +-- .../windows/clisdk/generatenupkg.ps1 | 13 +++-- 7 files changed, 52 insertions(+), 60 deletions(-) delete mode 100644 src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec rename src/redist/targets/packaging/windows/clisdk/{VS.Redist.Common.Net.Core.SDK.x64.nuspec => VS.Redist.Common.Net.Core.Toolset.nuspec} (63%) rename src/redist/targets/packaging/windows/clisdk/{VS.Tools.Net.Core.SDK.x86.nuspec => VS.Tools.Net.Core.SDK.nuspec} (70%) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index e3f643963..ba8c556c1 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -17,11 +17,11 @@ $(MSBuildThisFileDirectory)packaging/windows/clisdk/generatemsi.ps1 $(MSBuildThisFileDirectory)packaging/windows/clisdk/stablefileidforapphosttransform.xslt $(MSBuildThisFileDirectory)packaging/windows/clisdk/generatebundle.ps1 - $(MSBuildThisFileDirectory)packaging/windows/clisdk/generatenupkg.ps1 + $(MSBuildThisFileDirectory)packaging/windows/clisdk/generatenupkg.ps1 - $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).nuspec - $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg - $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Tools.Net.Core.SDK.$(Architecture).nuspec + $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.Net.Core.Toolset.nuspec + $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.Toolset.$(Architecture).$(FullNugetVersion).nupkg + $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec $(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg $(ArtifactsDir)bin/SdkResolver/$(Configuration) @@ -35,6 +35,7 @@ $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension) + $(ArtifactsShippingPackagesDir)d$(Architecture)-1.cab $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension) $(ProductBandCombinedHostHostFxrFrameworkSdkName) @@ -158,45 +159,48 @@ -InformationAction Continue " /> - + Inputs="$(SdkMSIInstallerFile); + $(ToolsetInstallerNuspecFile); + $(GenerateNupkgPowershellScript)" + Outputs="$(ToolsetInstallerNupkgFile)"> - + '$(ToolsetInstallerNuspecFile)' ^ + '$(ToolsetInstallerNupkgFile)' ^ + '$(Architecture)' ^ + '$(SdkMSICabFile)'" /> - + '$(VSToolsNupkgFile)' ^ + '$(Architecture)'" /> - - - + https://github.com/dotnet/core-setup - 0f96bbdcd4ac27227a0b30015dd7e509f71185d9 + c0ffa47d85b0011226940c715afecdaaabb952bf - + https://github.com/dotnet/core-setup - 0f96bbdcd4ac27227a0b30015dd7e509f71185d9 + c0ffa47d85b0011226940c715afecdaaabb952bf - + https://github.com/dotnet/core-setup - 0f96bbdcd4ac27227a0b30015dd7e509f71185d9 + c0ffa47d85b0011226940c715afecdaaabb952bf https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 18a7b8f5f..1f6595754 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27810-06 + 3.0.0-preview7-27810-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27810-06 + 2.1.0-preview7-27810-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27810-06 + 3.0.0-preview7-27810-07 $(MicrosoftWindowsDesktopAppPackageVersion) From da3a92ae63799731426d169d6e97067f1d81c39a Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 10 Jun 2019 17:29:39 -0700 Subject: [PATCH 135/471] Remove unused apphost metadata from KnownFrameworkReference --- src/redist/targets/GenerateBundledVersions.targets | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index d04825e04..80c5dff92 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -187,8 +187,6 @@ Copyright (c) .NET Foundation. All rights reserved. LatestRuntimeFrameworkVersion="$(_NETCoreAppPackageVersion)" TargetingPackName="Microsoft.NETCore.App.Ref" TargetingPackVersion="$(NetCoreAppTargetingPackVersion)" - AppHostPackNamePattern="runtime.**RID**.Microsoft.NETCore.DotNetAppHost" - AppHostRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')" RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')" PackagesToReference="Microsoft.NETCore.App/$(NetCoreAppTargetingPackVersion)" From ae1c39dda3462bfc728c5a0713e299e57c1125b3 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 11 Jun 2019 02:36:03 +0000 Subject: [PATCH 136/471] Update dependencies from https://github.com/dotnet/sdk build 20190610.1 - Microsoft.NET.Sdk - 3.0.100-preview7.19310.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9f5a797c..a29f78dcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 58ef8d5579f1acef69d84e94bdbfb21d07bcb506 - + https://github.com/dotnet/sdk - de72490d26acee011e22f40113209323976980e0 + cb95988d8aba8f6a383feb2a7dc9890e5bce550c https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 1f6595754..43f7a820f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19306.2 + 3.0.100-preview7.19310.1 3.0.0-preview7-27810-07 From 2968562504f9a003bf40a5c2644ca31af9a86804 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2019 04:46:12 +0000 Subject: [PATCH 137/471] Update dependencies from https://github.com/dotnet/core-setup build 20190610.10 (#2405) - NETStandard.Library.Ref - 2.1.0-preview7-27810-10 - Microsoft.NETCore.App - 3.0.0-preview7-27810-10 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27810-10 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9f5a797c..239aa09d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - c0ffa47d85b0011226940c715afecdaaabb952bf + 46b9a81e7492405bed621d4f4b9911b848d81f3c - + https://github.com/dotnet/core-setup - c0ffa47d85b0011226940c715afecdaaabb952bf + 46b9a81e7492405bed621d4f4b9911b848d81f3c - + https://github.com/dotnet/core-setup - c0ffa47d85b0011226940c715afecdaaabb952bf + 46b9a81e7492405bed621d4f4b9911b848d81f3c https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 1f6595754..6cc454969 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27810-07 + 3.0.0-preview7-27810-10 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27810-07 + 2.1.0-preview7-27810-10 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27810-07 + 3.0.0-preview7-27810-10 $(MicrosoftWindowsDesktopAppPackageVersion) From e1b3cc85f865e28b163d8f9ddd58708f17f16af8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2019 05:01:37 +0000 Subject: [PATCH 138/471] Update dependencies from https://github.com/dotnet/core-setup build 20190610.09 (#2406) - NETStandard.Library.Ref - 2.1.0-preview7-27810-09 - Microsoft.NETCore.App - 3.0.0-preview7-27810-09 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27810-09 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 239aa09d8..e6f595a37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup 46b9a81e7492405bed621d4f4b9911b848d81f3c - + https://github.com/dotnet/core-setup 46b9a81e7492405bed621d4f4b9911b848d81f3c - + https://github.com/dotnet/core-setup 46b9a81e7492405bed621d4f4b9911b848d81f3c diff --git a/eng/Versions.props b/eng/Versions.props index 6cc454969..478ffcf77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27810-10 + 3.0.0-preview7-27810-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27810-10 + 2.1.0-preview7-27810-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27810-10 + 3.0.0-preview7-27810-09 $(MicrosoftWindowsDesktopAppPackageVersion) From d521191898f607f7282f1537c2d8649453ae9f3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2019 10:53:52 +0000 Subject: [PATCH 139/471] [master] Update dependencies from dotnet/core-setup (#2407) * Update dependencies from https://github.com/dotnet/core-setup build 20190610.11 - NETStandard.Library.Ref - 2.1.0-preview7-27810-11 - Microsoft.NETCore.App - 3.0.0-preview7-27810-11 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27810-11 * Update dependencies from https://github.com/dotnet/core-setup build 20190610.12 - NETStandard.Library.Ref - 2.1.0-preview7-27810-12 - Microsoft.NETCore.App - 3.0.0-preview7-27810-12 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27810-12 * Update dependencies from https://github.com/dotnet/core-setup build 20190611.01 - NETStandard.Library.Ref - 2.1.0-preview7-27811-01 - Microsoft.NETCore.App - 3.0.0-preview7-27811-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27811-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6f595a37..68143c818 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 46b9a81e7492405bed621d4f4b9911b848d81f3c + bba327461e7521b640be91127309760a18f12416 - + https://github.com/dotnet/core-setup - 46b9a81e7492405bed621d4f4b9911b848d81f3c + bba327461e7521b640be91127309760a18f12416 - + https://github.com/dotnet/core-setup - 46b9a81e7492405bed621d4f4b9911b848d81f3c + bba327461e7521b640be91127309760a18f12416 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 478ffcf77..98656d5ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27810-09 + 3.0.0-preview7-27811-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27810-09 + 2.1.0-preview7-27811-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27810-09 + 3.0.0-preview7-27811-01 $(MicrosoftWindowsDesktopAppPackageVersion) From c96ae5384d1de90c5626e28d526e4e788cbe66cc Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 11 Jun 2019 12:10:51 +0000 Subject: [PATCH 140/471] Update dependencies from https://github.com/dotnet/arcade build 20190610.24 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19310.24 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db89aeb72..e33301195 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 45361625125cdd3119050a852bd73163ca4b73f4 + f268510de7a7bcf800a6966830f8d11ff8d24e0d diff --git a/global.json b/global.json index c8b4124ab..abeff2ea7 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19309.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19310.24" } } From e715f1efc586971813df01e13b1e315ab846f047 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2019 12:26:21 +0000 Subject: [PATCH 141/471] Update dependencies from https://github.com/dotnet/templating build 20190610.1 (#2408) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19310.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68143c818..e0afc9f96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore b5adc6b156ba8e08d95e0dc5585973deb09f0993 - + https://github.com/dotnet/templating - b4a3c0ac00cb996590ce71edca4755202ec4a3c7 + e56d4e9a911ea00445bfcf242d10fa135d68deb2 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 98656d5ed..3249df230 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19310.4 - 1.0.2-beta5.19309.1 + 1.0.2-beta5.19310.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From b688cd75f1879616a92cb47302df5a4e739b3efd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2019 12:33:29 +0000 Subject: [PATCH 142/471] Update dependencies from https://github.com/dotnet/core-setup build 20190611.02 (#2409) - NETStandard.Library.Ref - 2.1.0-preview7-27811-02 - Microsoft.NETCore.App - 3.0.0-preview7-27811-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27811-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e0afc9f96..42dfde820 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - bba327461e7521b640be91127309760a18f12416 + b47b19c8e4acfa500d93d59257288072398b054e - + https://github.com/dotnet/core-setup - bba327461e7521b640be91127309760a18f12416 + b47b19c8e4acfa500d93d59257288072398b054e - + https://github.com/dotnet/core-setup - bba327461e7521b640be91127309760a18f12416 + b47b19c8e4acfa500d93d59257288072398b054e https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 3249df230..be03ed042 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27811-01 + 3.0.0-preview7-27811-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27811-01 + 2.1.0-preview7-27811-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27811-01 + 3.0.0-preview7-27811-02 $(MicrosoftWindowsDesktopAppPackageVersion) From 819389f7d3605d532d61e4eb2447110ee0e21e52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2019 12:40:31 +0000 Subject: [PATCH 143/471] Update dependencies from https://github.com/dotnet/toolset build 20190611.1 (#2410) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19311.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42dfde820..7427f7fdd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e56d4e9a911ea00445bfcf242d10fa135d68deb2 - + https://github.com/dotnet/toolset - 58ef8d5579f1acef69d84e94bdbfb21d07bcb506 + 60cbe3dd1b97b166b95b6ed87dcc42718eb383f2 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index be03ed042..552ea1b4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19310.7 + 3.0.100-preview7.19311.1 From 21be8fff3d9befd56c8ba45357fb4e1cdb5c2c8a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2019 12:56:56 +0000 Subject: [PATCH 144/471] [master] Update dependencies from dotnet/toolset (#2411) * Update dependencies from https://github.com/dotnet/toolset build 20190611.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19311.2 * Update dependencies from https://github.com/dotnet/toolset build 20190611.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19311.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7427f7fdd..48d3f5fad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e56d4e9a911ea00445bfcf242d10fa135d68deb2 - + https://github.com/dotnet/toolset - 60cbe3dd1b97b166b95b6ed87dcc42718eb383f2 + 9e0a0d6dba9901dbc085a9a5acb8078dcd0014df https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 552ea1b4c..e7b1d1c24 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19311.1 + 3.0.100-preview7.19311.3 From 6e0429a90a6bff239afcb499dbb5e37607fd233f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2019 13:35:36 +0000 Subject: [PATCH 145/471] Update dependencies from https://github.com/dotnet/cli build 20190611.1 (#2412) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19311.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48d3f5fad..9cabb02f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk de72490d26acee011e22f40113209323976980e0 - + https://github.com/dotnet/cli - 9c210180db802fd867f059af94c6a92a0a851762 + a63219e3c2589eb7c6b5b81775a0f6eb2a515457 diff --git a/eng/Versions.props b/eng/Versions.props index e7b1d1c24..11023b02b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19310.4 + 3.0.100-preview7.19311.1 1.0.2-beta5.19310.1 From 6e65065d1970bdafc9b0e2f7af69d31458628266 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2019 13:36:22 +0000 Subject: [PATCH 146/471] Update dependencies from https://github.com/dotnet/toolset build 20190611.4 (#2413) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19311.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cabb02f3..0a9f97eab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e56d4e9a911ea00445bfcf242d10fa135d68deb2 - + https://github.com/dotnet/toolset - 9e0a0d6dba9901dbc085a9a5acb8078dcd0014df + d72d60057949e9a76dec17066791b2593c55137f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 11023b02b..9641eb58e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19311.3 + 3.0.100-preview7.19311.4 From 52472f939768fda9f57e06b729da94907498b17d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2019 13:55:05 +0000 Subject: [PATCH 147/471] Update dependencies from https://github.com/dotnet/toolset build 20190611.5 (#2414) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19311.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a9f97eab..1a3659de4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e56d4e9a911ea00445bfcf242d10fa135d68deb2 - + https://github.com/dotnet/toolset - d72d60057949e9a76dec17066791b2593c55137f + 1fd6dbdc6919f7d59e5d7665f2e66a595b3b4b3a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9641eb58e..5167940f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19311.4 + 3.0.100-preview7.19311.5 From 6a9e2a9d015b9dccc0dca630750cb68cdcf8ee5d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2019 15:22:33 +0000 Subject: [PATCH 148/471] Update dependencies from https://github.com/dotnet/core-setup build 20190611.04 (#2415) - NETStandard.Library.Ref - 2.1.0-preview7-27811-04 - Microsoft.NETCore.App - 3.0.0-preview7-27811-04 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27811-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a3659de4..f6a8fb6e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - b47b19c8e4acfa500d93d59257288072398b054e + 422081dc0d63a088e21af98a1fd4fd28d82a1493 - + https://github.com/dotnet/core-setup - b47b19c8e4acfa500d93d59257288072398b054e + 422081dc0d63a088e21af98a1fd4fd28d82a1493 - + https://github.com/dotnet/core-setup - b47b19c8e4acfa500d93d59257288072398b054e + 422081dc0d63a088e21af98a1fd4fd28d82a1493 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 5167940f0..14d0208b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27811-02 + 3.0.0-preview7-27811-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27811-02 + 2.1.0-preview7-27811-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27811-02 + 3.0.0-preview7-27811-04 $(MicrosoftWindowsDesktopAppPackageVersion) From 3cd27edfa1363d00401560fa4d26cac138899a2d Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 11 Jun 2019 16:03:45 +0000 Subject: [PATCH 149/471] Update dependencies from https://github.com/dotnet/core-setup build 20190611.05 - NETStandard.Library.Ref - 2.1.0-preview7-27811-05 - Microsoft.NETCore.App - 3.0.0-preview7-27811-05 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27811-05 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19308.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19309.5 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6a8fb6e1..3b3ea45c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 422081dc0d63a088e21af98a1fd4fd28d82a1493 + a93fe37d1cc99118bc4db0617441e9da57a12a24 - + https://github.com/dotnet/core-setup - 422081dc0d63a088e21af98a1fd4fd28d82a1493 + a93fe37d1cc99118bc4db0617441e9da57a12a24 - + https://github.com/dotnet/core-setup - 422081dc0d63a088e21af98a1fd4fd28d82a1493 + a93fe37d1cc99118bc4db0617441e9da57a12a24 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ a63219e3c2589eb7c6b5b81775a0f6eb2a515457 - + https://github.com/dotnet/winforms - bec5f97141d8de75e373d9e58c662a614a5f3c63 + 3c9d886bcb0c203baa0955f73fe530e98388ce59 - + https://github.com/dotnet/wpf - 947a656105649897d46218d2b03b6ca5b946ca68 + acaba9cc1e55a1b386e09a3e0d705280d64b18f2 diff --git a/eng/Versions.props b/eng/Versions.props index 14d0208b2..44906b09b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19306.1 + 4.8.0-preview7.19308.1 - 3.0.0-preview7.19308.5 + 3.0.0-preview7.19309.5 @@ -47,7 +47,7 @@ 3.0.100-preview7.19306.2 - 3.0.0-preview7-27811-04 + 3.0.0-preview7-27811-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27811-04 + 2.1.0-preview7-27811-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27811-04 + 3.0.0-preview7-27811-05 $(MicrosoftWindowsDesktopAppPackageVersion) From a95ba7a427e8ca77eb9abeb81b555c983094cd19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2019 17:46:19 +0000 Subject: [PATCH 150/471] [master] Update dependencies from dotnet/cli (#2417) * Update dependencies from https://github.com/dotnet/cli build 20190611.4 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19311.4 * Update dependencies from https://github.com/dotnet/cli build 20190611.5 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19311.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fbbad939d..a4a610ef2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk cb95988d8aba8f6a383feb2a7dc9890e5bce550c - + https://github.com/dotnet/cli - a63219e3c2589eb7c6b5b81775a0f6eb2a515457 + 60f8f6c4b616bc6d5b0cf5ee5d625261ac90750f diff --git a/eng/Versions.props b/eng/Versions.props index 62196a68b..b2fbc2f4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19311.1 + 3.0.100-preview7.19311.5 1.0.2-beta5.19310.1 From 00008f4e43f1090de4c70d0b9ff71b31a8af76a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2019 18:22:45 +0000 Subject: [PATCH 151/471] Update dependencies from https://github.com/dotnet/core-setup build 20190611.07 (#2419) - NETStandard.Library.Ref - 2.1.0-preview7-27811-07 - Microsoft.NETCore.App - 3.0.0-preview7-27811-07 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27811-07 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4a610ef2..868755698 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - a93fe37d1cc99118bc4db0617441e9da57a12a24 + 3f692b82905b83e775d49984b3e8507e6afeb5de - + https://github.com/dotnet/core-setup - a93fe37d1cc99118bc4db0617441e9da57a12a24 + 3f692b82905b83e775d49984b3e8507e6afeb5de - + https://github.com/dotnet/core-setup - a93fe37d1cc99118bc4db0617441e9da57a12a24 + 3f692b82905b83e775d49984b3e8507e6afeb5de https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index b2fbc2f4f..cf40758c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19310.1 - 3.0.0-preview7-27811-05 + 3.0.0-preview7-27811-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27811-05 + 2.1.0-preview7-27811-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27811-05 + 3.0.0-preview7-27811-07 $(MicrosoftWindowsDesktopAppPackageVersion) From 87eb3b60769dcce969d8f05ed7162a15887ac8ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2019 20:07:53 +0000 Subject: [PATCH 152/471] Update dependencies from https://github.com/dotnet/core-setup build 20190611.08 (#2420) - NETStandard.Library.Ref - 2.1.0-preview7-27811-08 - Microsoft.NETCore.App - 3.0.0-preview7-27811-08 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27811-08 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 868755698..8d4132996 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 3f692b82905b83e775d49984b3e8507e6afeb5de + 1fd0ca915d84e8f8a87adeac15c740dd5329f0ea - + https://github.com/dotnet/core-setup - 3f692b82905b83e775d49984b3e8507e6afeb5de + 1fd0ca915d84e8f8a87adeac15c740dd5329f0ea - + https://github.com/dotnet/core-setup - 3f692b82905b83e775d49984b3e8507e6afeb5de + 1fd0ca915d84e8f8a87adeac15c740dd5329f0ea https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index cf40758c9..ac8026560 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19310.1 - 3.0.0-preview7-27811-07 + 3.0.0-preview7-27811-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27811-07 + 2.1.0-preview7-27811-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27811-07 + 3.0.0-preview7-27811-08 $(MicrosoftWindowsDesktopAppPackageVersion) From 4c3683314b4f128b5b073cab71e90f5ef8161384 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 11 Jun 2019 13:16:26 -0700 Subject: [PATCH 153/471] Rename: "VS.Redist.Common.Net.Core.Toolset" -> "VS.Redist.Common.NetCore.Toolset" (#2403) --- src/redist/targets/GenerateMSIs.targets | 4 ++-- ...Toolset.nuspec => VS.Redist.Common.NetCore.Toolset.nuspec} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/redist/targets/packaging/windows/clisdk/{VS.Redist.Common.Net.Core.Toolset.nuspec => VS.Redist.Common.NetCore.Toolset.nuspec} (87%) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index ba8c556c1..dffddf82c 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -19,8 +19,8 @@ $(MSBuildThisFileDirectory)packaging/windows/clisdk/generatebundle.ps1 $(MSBuildThisFileDirectory)packaging/windows/clisdk/generatenupkg.ps1 - $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.Net.Core.Toolset.nuspec - $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.Toolset.$(Architecture).$(FullNugetVersion).nupkg + $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec + $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Toolset.$(Architecture).$(FullNugetVersion).nupkg $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec $(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.Toolset.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec similarity index 87% rename from src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.Toolset.nuspec rename to src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec index c5054904e..ba0555841 100644 --- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.Toolset.nuspec +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec @@ -1,9 +1,9 @@  - VS.Redist.Common.Net.Core.Toolset.$ARCH$ + VS.Redist.Common.NetCore.Toolset.$ARCH$ 1.0.0 - VS.Redist.Common.Net.Core.Toolset.$ARCH$ + VS.Redist.Common.NetCore.Toolset.$ARCH$ Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm From ae1c52b486fc50de141d04b3992f2992d753fd65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Jun 2019 21:00:33 +0000 Subject: [PATCH 154/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190611.2 (#2421) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19311.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19311.2 - dotnet-watch - 3.0.0-preview7.19311.2 - dotnet-user-secrets - 3.0.0-preview7.19311.2 - dotnet-dev-certs - 3.0.0-preview7.19311.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19311.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d4132996..ba155feef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 1fd0ca915d84e8f8a87adeac15c740dd5329f0ea - + https://github.com/aspnet/AspNetCore - b5adc6b156ba8e08d95e0dc5585973deb09f0993 + eeaba9252f6d253b8c28f95e76b5de5ab5245bb1 - + https://github.com/aspnet/AspNetCore - b5adc6b156ba8e08d95e0dc5585973deb09f0993 + eeaba9252f6d253b8c28f95e76b5de5ab5245bb1 - + https://github.com/aspnet/AspNetCore - b5adc6b156ba8e08d95e0dc5585973deb09f0993 + eeaba9252f6d253b8c28f95e76b5de5ab5245bb1 - + https://github.com/aspnet/AspNetCore - b5adc6b156ba8e08d95e0dc5585973deb09f0993 + eeaba9252f6d253b8c28f95e76b5de5ab5245bb1 - + https://github.com/aspnet/AspNetCore - b5adc6b156ba8e08d95e0dc5585973deb09f0993 + eeaba9252f6d253b8c28f95e76b5de5ab5245bb1 - + https://github.com/aspnet/AspNetCore - b5adc6b156ba8e08d95e0dc5585973deb09f0993 + eeaba9252f6d253b8c28f95e76b5de5ab5245bb1 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index ac8026560..0b1a2e354 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19307.8 - 3.0.0-preview7.19307.8 - 3.0.0-preview7.19307.8 - 3.0.0-preview7.19307.8 - 3.0.0-preview7.19307.8 - 3.0.0-preview7.19307.8 + 3.0.0-preview7.19311.2 + 3.0.0-preview7.19311.2 + 3.0.0-preview7.19311.2 + 3.0.0-preview7.19311.2 + 3.0.0-preview7.19311.2 + 3.0.0-preview7.19311.2 From 675986ae4d96ae90f8b249ea1e225a90bb3fb81c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 01:41:15 +0000 Subject: [PATCH 155/471] [master] Update dependencies from aspnet/AspNetCore (#2423) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190611.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19311.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19311.3 - dotnet-watch - 3.0.0-preview7.19311.3 - dotnet-user-secrets - 3.0.0-preview7.19311.3 - dotnet-dev-certs - 3.0.0-preview7.19311.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19311.3 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190611.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19311.4 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19311.4 - dotnet-watch - 3.0.0-preview7.19311.4 - dotnet-user-secrets - 3.0.0-preview7.19311.4 - dotnet-dev-certs - 3.0.0-preview7.19311.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19311.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba155feef..e793008cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 1fd0ca915d84e8f8a87adeac15c740dd5329f0ea - + https://github.com/aspnet/AspNetCore - eeaba9252f6d253b8c28f95e76b5de5ab5245bb1 + f8bd011d8598ac3b5e70f7bf145d96fe28ce97ce - + https://github.com/aspnet/AspNetCore - eeaba9252f6d253b8c28f95e76b5de5ab5245bb1 + f8bd011d8598ac3b5e70f7bf145d96fe28ce97ce - + https://github.com/aspnet/AspNetCore - eeaba9252f6d253b8c28f95e76b5de5ab5245bb1 + f8bd011d8598ac3b5e70f7bf145d96fe28ce97ce - + https://github.com/aspnet/AspNetCore - eeaba9252f6d253b8c28f95e76b5de5ab5245bb1 + f8bd011d8598ac3b5e70f7bf145d96fe28ce97ce - + https://github.com/aspnet/AspNetCore - eeaba9252f6d253b8c28f95e76b5de5ab5245bb1 + f8bd011d8598ac3b5e70f7bf145d96fe28ce97ce - + https://github.com/aspnet/AspNetCore - eeaba9252f6d253b8c28f95e76b5de5ab5245bb1 + f8bd011d8598ac3b5e70f7bf145d96fe28ce97ce https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 0b1a2e354..234fcbe42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19311.2 - 3.0.0-preview7.19311.2 - 3.0.0-preview7.19311.2 - 3.0.0-preview7.19311.2 - 3.0.0-preview7.19311.2 - 3.0.0-preview7.19311.2 + 3.0.0-preview7.19311.4 + 3.0.0-preview7.19311.4 + 3.0.0-preview7.19311.4 + 3.0.0-preview7.19311.4 + 3.0.0-preview7.19311.4 + 3.0.0-preview7.19311.4 From aead954ed0344fee2d10a9c68ef01eba6be21424 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 03:09:28 +0000 Subject: [PATCH 156/471] [master] Update dependencies from dotnet/core-setup (#2422) * Update dependencies from https://github.com/dotnet/core-setup build 20190611.09 - NETStandard.Library.Ref - 2.1.0-preview7-27811-09 - Microsoft.NETCore.App - 3.0.0-preview7-27811-09 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27811-09 * Update dependencies from https://github.com/dotnet/core-setup build 20190611.10 - NETStandard.Library.Ref - 2.1.0-preview7-27811-10 - Microsoft.NETCore.App - 3.0.0-preview7-27811-10 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27811-10 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e793008cd..ef45ebc6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 1fd0ca915d84e8f8a87adeac15c740dd5329f0ea + 02f0cf81614878fe1a991fb8a36b5171046fef43 - + https://github.com/dotnet/core-setup - 1fd0ca915d84e8f8a87adeac15c740dd5329f0ea + 02f0cf81614878fe1a991fb8a36b5171046fef43 - + https://github.com/dotnet/core-setup - 1fd0ca915d84e8f8a87adeac15c740dd5329f0ea + 02f0cf81614878fe1a991fb8a36b5171046fef43 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 234fcbe42..97864e7e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19310.1 - 3.0.0-preview7-27811-08 + 3.0.0-preview7-27811-10 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27811-08 + 2.1.0-preview7-27811-10 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27811-08 + 3.0.0-preview7-27811-10 $(MicrosoftWindowsDesktopAppPackageVersion) From 9486687f7086bb6ac6604e43415a77f20cc649b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 04:39:14 +0000 Subject: [PATCH 157/471] Update dependencies from https://github.com/dotnet/core-setup build 20190611.12 (#2425) - NETStandard.Library.Ref - 2.1.0-preview7-27811-12 - Microsoft.NETCore.App - 3.0.0-preview7-27811-12 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27811-12 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef45ebc6c..a5a5b71d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 02f0cf81614878fe1a991fb8a36b5171046fef43 + 4c267f164b6f7932f3a784ac7e1a959214f4e413 - + https://github.com/dotnet/core-setup - 02f0cf81614878fe1a991fb8a36b5171046fef43 + 4c267f164b6f7932f3a784ac7e1a959214f4e413 - + https://github.com/dotnet/core-setup - 02f0cf81614878fe1a991fb8a36b5171046fef43 + 4c267f164b6f7932f3a784ac7e1a959214f4e413 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 97864e7e9..dced7f867 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19310.1 - 3.0.0-preview7-27811-10 + 3.0.0-preview7-27811-12 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27811-10 + 2.1.0-preview7-27811-12 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27811-10 + 3.0.0-preview7-27811-12 $(MicrosoftWindowsDesktopAppPackageVersion) From 19ecc5e7459e0db5292a561f25175317ab0b0b67 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 04:43:21 +0000 Subject: [PATCH 158/471] Update dependencies from https://github.com/dotnet/sdk build 20190611.2 (#2426) - Microsoft.NET.Sdk - 3.0.100-preview7.19311.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5a5b71d8..be9338953 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 1fd6dbdc6919f7d59e5d7665f2e66a595b3b4b3a - + https://github.com/dotnet/sdk - cb95988d8aba8f6a383feb2a7dc9890e5bce550c + 9d81590302725469b526183a775c2804bfcaed43 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index dced7f867..53068d839 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19310.1 + 3.0.100-preview7.19311.2 3.0.0-preview7-27811-12 From e518048f298c3f098e338a698054079c4c0c836c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 04:55:17 +0000 Subject: [PATCH 159/471] Update dependencies from https://github.com/dotnet/core-setup build 20190611.11 (#2427) - NETStandard.Library.Ref - 2.1.0-preview7-27811-11 - Microsoft.NETCore.App - 3.0.0-preview7-27811-11 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27811-11 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be9338953..e4b0445bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup 4c267f164b6f7932f3a784ac7e1a959214f4e413 - + https://github.com/dotnet/core-setup 4c267f164b6f7932f3a784ac7e1a959214f4e413 - + https://github.com/dotnet/core-setup 4c267f164b6f7932f3a784ac7e1a959214f4e413 diff --git a/eng/Versions.props b/eng/Versions.props index 53068d839..0beeab6da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19311.2 - 3.0.0-preview7-27811-12 + 3.0.0-preview7-27811-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27811-12 + 2.1.0-preview7-27811-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27811-12 + 3.0.0-preview7-27811-11 $(MicrosoftWindowsDesktopAppPackageVersion) From 29f396c227332684e43306a7f03948cbc71d66f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 05:01:14 +0000 Subject: [PATCH 160/471] Update dependencies from https://github.com/dotnet/sdk build 20190611.1 (#2428) - Microsoft.NET.Sdk - 3.0.100-preview7.19311.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4b0445bc..9d94f0821 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 1fd6dbdc6919f7d59e5d7665f2e66a595b3b4b3a - + https://github.com/dotnet/sdk - 9d81590302725469b526183a775c2804bfcaed43 + 8e7f7cf546d26b4dba4bae2b8bbe3ab51beb17a9 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 0beeab6da..0d69d2708 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19311.2 + 3.0.100-preview7.19311.1 3.0.0-preview7-27811-11 From 0fed2227340fc3b039e430200fb1db229e4278d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 10:28:18 +0000 Subject: [PATCH 161/471] [master] Update dependencies from dotnet/core-setup (#2430) * Update dependencies from https://github.com/dotnet/core-setup build 20190611.14 - NETStandard.Library.Ref - 2.1.0-preview7-27811-14 - Microsoft.NETCore.App - 3.0.0-preview7-27811-14 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27811-14 * Update dependencies from https://github.com/dotnet/core-setup build 20190612.01 - NETStandard.Library.Ref - 2.1.0-preview7-27812-01 - Microsoft.NETCore.App - 3.0.0-preview7-27812-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27812-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d94f0821..050c9d726 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 4c267f164b6f7932f3a784ac7e1a959214f4e413 + b114db9944f92786a2f5e321827742ca5b4628bf - + https://github.com/dotnet/core-setup - 4c267f164b6f7932f3a784ac7e1a959214f4e413 + b114db9944f92786a2f5e321827742ca5b4628bf - + https://github.com/dotnet/core-setup - 4c267f164b6f7932f3a784ac7e1a959214f4e413 + b114db9944f92786a2f5e321827742ca5b4628bf https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 0d69d2708..4a317117c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19311.1 - 3.0.0-preview7-27811-11 + 3.0.0-preview7-27812-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27811-11 + 2.1.0-preview7-27812-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27811-11 + 3.0.0-preview7-27812-01 $(MicrosoftWindowsDesktopAppPackageVersion) From 0ff79c52ad6a87770acbda107ba9fe330fb3b69f Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Wed, 12 Jun 2019 12:10:02 +0000 Subject: [PATCH 162/471] Update dependencies from https://github.com/dotnet/arcade build 20190611.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19311.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e33301195..285d73fb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - f268510de7a7bcf800a6966830f8d11ff8d24e0d + dfc41299b9aadb1ca98093d660df81811eca901b diff --git a/global.json b/global.json index abeff2ea7..28745802a 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19310.24" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19311.2" } } From 0b43f17a62abb8916fe53b69c73a346a84be585e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 12:18:27 +0000 Subject: [PATCH 163/471] Update dependencies from https://github.com/dotnet/core-setup build 20190612.02 (#2431) - NETStandard.Library.Ref - 2.1.0-preview7-27812-02 - Microsoft.NETCore.App - 3.0.0-preview7-27812-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27812-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 050c9d726..637bd3faf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - b114db9944f92786a2f5e321827742ca5b4628bf + 7b86247c063ced868c4e19a218e53bb14b14df38 - + https://github.com/dotnet/core-setup - b114db9944f92786a2f5e321827742ca5b4628bf + 7b86247c063ced868c4e19a218e53bb14b14df38 - + https://github.com/dotnet/core-setup - b114db9944f92786a2f5e321827742ca5b4628bf + 7b86247c063ced868c4e19a218e53bb14b14df38 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 4a317117c..3de0b26c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19311.1 - 3.0.0-preview7-27812-01 + 3.0.0-preview7-27812-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27812-01 + 2.1.0-preview7-27812-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27812-01 + 3.0.0-preview7-27812-02 $(MicrosoftWindowsDesktopAppPackageVersion) From 3c9a324f7e18d676e049aa41b71b9679da50e3e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 12:25:34 +0000 Subject: [PATCH 164/471] Update dependencies from https://github.com/dotnet/templating build 20190611.1 (#2432) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19311.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 637bd3faf..36dfeae38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore f8bd011d8598ac3b5e70f7bf145d96fe28ce97ce - + https://github.com/dotnet/templating - e56d4e9a911ea00445bfcf242d10fa135d68deb2 + d285831c74b28e71a8a494e1ec2a02a95861bbb8 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 3de0b26c8..210e62c4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19311.5 - 1.0.2-beta5.19310.1 + 1.0.2-beta5.19311.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From d35108756b1ee6f07ca7137928e1189d4c0201b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 12:39:45 +0000 Subject: [PATCH 165/471] [master] Update dependencies from dotnet/toolset (#2418) * Update dependencies from https://github.com/dotnet/toolset build 20190611.6 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19311.6 * Update dependencies from https://github.com/dotnet/toolset build 20190612.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19312.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36dfeae38..d81c09b15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating d285831c74b28e71a8a494e1ec2a02a95861bbb8 - + https://github.com/dotnet/toolset - 1fd6dbdc6919f7d59e5d7665f2e66a595b3b4b3a + 59df1633db16c9c75303d09a9a437701653015a6 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 210e62c4e..119e240c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19311.5 + 3.0.100-preview7.19312.1 From 828296c455e984010d9d0459ad850d55e389d58b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 12:56:27 +0000 Subject: [PATCH 166/471] [master] Update dependencies from dotnet/toolset (#2433) * Update dependencies from https://github.com/dotnet/toolset build 20190612.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19312.2 * Update dependencies from https://github.com/dotnet/toolset build 20190612.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19312.3 * Update dependencies from https://github.com/dotnet/toolset build 20190612.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19312.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d81c09b15..46b95afbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating d285831c74b28e71a8a494e1ec2a02a95861bbb8 - + https://github.com/dotnet/toolset - 59df1633db16c9c75303d09a9a437701653015a6 + 8182210b96fd70d5e854c7a4fc59c2a1c6dac508 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 119e240c7..d3f9bb74a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19312.1 + 3.0.100-preview7.19312.4 From 5cfa7849f04e49709ec9b64d1236c6173313c2da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 13:33:01 +0000 Subject: [PATCH 167/471] Update dependencies from https://github.com/dotnet/toolset build 20190612.5 (#2434) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19312.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46b95afbb..a49dd8861 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating d285831c74b28e71a8a494e1ec2a02a95861bbb8 - + https://github.com/dotnet/toolset - 8182210b96fd70d5e854c7a4fc59c2a1c6dac508 + e86c548815605026fd57ee4dc4d98517dbcc0e7b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d3f9bb74a..2c1820848 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19312.4 + 3.0.100-preview7.19312.5 From 2091f7389109c80bc93aaf4927ffd9809b077db9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 13:50:30 +0000 Subject: [PATCH 168/471] Update dependencies from https://github.com/dotnet/toolset build 20190612.6 (#2435) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19312.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a49dd8861..521a4d303 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating d285831c74b28e71a8a494e1ec2a02a95861bbb8 - + https://github.com/dotnet/toolset - e86c548815605026fd57ee4dc4d98517dbcc0e7b + ec1bc921e81509e2cae567f3e8601babe403a6a5 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2c1820848..4cc0e0acc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19312.5 + 3.0.100-preview7.19312.6 From 1e91db0ffe175c3bc87713b46a33d7aea58ef421 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 15:06:29 +0000 Subject: [PATCH 169/471] Update dependencies from https://github.com/dotnet/core-setup build 20190612.03 (#2436) - NETStandard.Library.Ref - 2.1.0-preview7-27812-03 - Microsoft.NETCore.App - 3.0.0-preview7-27812-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27812-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 521a4d303..479d92557 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 7b86247c063ced868c4e19a218e53bb14b14df38 + 4b158001d5d7ed504c89ba951d1881d2c9d2db01 - + https://github.com/dotnet/core-setup - 7b86247c063ced868c4e19a218e53bb14b14df38 + 4b158001d5d7ed504c89ba951d1881d2c9d2db01 - + https://github.com/dotnet/core-setup - 7b86247c063ced868c4e19a218e53bb14b14df38 + 4b158001d5d7ed504c89ba951d1881d2c9d2db01 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 4cc0e0acc..b57d7a25c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19311.1 - 3.0.0-preview7-27812-02 + 3.0.0-preview7-27812-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27812-02 + 2.1.0-preview7-27812-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27812-02 + 3.0.0-preview7-27812-03 $(MicrosoftWindowsDesktopAppPackageVersion) From 8c702f6788c91eef5fc7433d7ab08da15aa145a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 15:29:59 +0000 Subject: [PATCH 170/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190611.5 (#2424) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19311.5 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19311.5 - dotnet-watch - 3.0.0-preview7.19311.5 - dotnet-user-secrets - 3.0.0-preview7.19311.5 - dotnet-dev-certs - 3.0.0-preview7.19311.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19311.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 479d92557..0c4534477 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 4b158001d5d7ed504c89ba951d1881d2c9d2db01 - + https://github.com/aspnet/AspNetCore - f8bd011d8598ac3b5e70f7bf145d96fe28ce97ce + dd2e2186db4ae416609135593e54f32f48007092 - + https://github.com/aspnet/AspNetCore - f8bd011d8598ac3b5e70f7bf145d96fe28ce97ce + dd2e2186db4ae416609135593e54f32f48007092 - + https://github.com/aspnet/AspNetCore - f8bd011d8598ac3b5e70f7bf145d96fe28ce97ce + dd2e2186db4ae416609135593e54f32f48007092 - + https://github.com/aspnet/AspNetCore - f8bd011d8598ac3b5e70f7bf145d96fe28ce97ce + dd2e2186db4ae416609135593e54f32f48007092 - + https://github.com/aspnet/AspNetCore - f8bd011d8598ac3b5e70f7bf145d96fe28ce97ce + dd2e2186db4ae416609135593e54f32f48007092 - + https://github.com/aspnet/AspNetCore - f8bd011d8598ac3b5e70f7bf145d96fe28ce97ce + dd2e2186db4ae416609135593e54f32f48007092 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index b57d7a25c..5644ee96e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19311.4 - 3.0.0-preview7.19311.4 - 3.0.0-preview7.19311.4 - 3.0.0-preview7.19311.4 - 3.0.0-preview7.19311.4 - 3.0.0-preview7.19311.4 + 3.0.0-preview7.19311.5 + 3.0.0-preview7.19311.5 + 3.0.0-preview7.19311.5 + 3.0.0-preview7.19311.5 + 3.0.0-preview7.19311.5 + 3.0.0-preview7.19311.5 From b7faf25e2d81251866869f58c14c231bc5e049c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 16:10:17 +0000 Subject: [PATCH 171/471] [master] Update dependencies from dotnet/cli (#2437) * Update dependencies from https://github.com/dotnet/cli build 20190611.7 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19311.7 * Update dependencies from https://github.com/dotnet/cli build 20190612.1 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19312.1 * Update dependencies from https://github.com/dotnet/cli build 20190612.2 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19312.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c4534477..ecc39e1ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 8e7f7cf546d26b4dba4bae2b8bbe3ab51beb17a9 - + https://github.com/dotnet/cli - 60f8f6c4b616bc6d5b0cf5ee5d625261ac90750f + 1d87a633e5c898499ba14823ccf6d2b3e5bb82d0 diff --git a/eng/Versions.props b/eng/Versions.props index 5644ee96e..2e9a23cef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19311.5 + 3.0.100-preview7.19312.2 1.0.2-beta5.19311.1 From bb4b9bf4fd31515d48eb620be9f403c6c1b8ff57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 16:25:49 +0000 Subject: [PATCH 172/471] Update dependencies from https://github.com/dotnet/cli build 20190612.3 (#2438) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19312.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ecc39e1ac..47de322e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 8e7f7cf546d26b4dba4bae2b8bbe3ab51beb17a9 - + https://github.com/dotnet/cli - 1d87a633e5c898499ba14823ccf6d2b3e5bb82d0 + b59a8eb16cdfcc4e48ed2ba94d8ebcbe281711c3 diff --git a/eng/Versions.props b/eng/Versions.props index 2e9a23cef..2cda3e0fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19312.2 + 3.0.100-preview7.19312.3 1.0.2-beta5.19311.1 From 840b31c68b9b09aa09bbf8a75f1b4ceea2a1afeb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 16:30:56 +0000 Subject: [PATCH 173/471] Update dependencies from https://github.com/dotnet/core-setup build 20190612.04 (#2439) - NETStandard.Library.Ref - 2.1.0-preview7-27812-04 - Microsoft.NETCore.App - 3.0.0-preview7-27812-04 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27812-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47de322e2..c6ff22b03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 4b158001d5d7ed504c89ba951d1881d2c9d2db01 + ea4ecae88a942e43aceefd5ba59ee6ef528a52be - + https://github.com/dotnet/core-setup - 4b158001d5d7ed504c89ba951d1881d2c9d2db01 + ea4ecae88a942e43aceefd5ba59ee6ef528a52be - + https://github.com/dotnet/core-setup - 4b158001d5d7ed504c89ba951d1881d2c9d2db01 + ea4ecae88a942e43aceefd5ba59ee6ef528a52be https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 2cda3e0fb..95970daa9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19311.1 - 3.0.0-preview7-27812-03 + 3.0.0-preview7-27812-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27812-03 + 2.1.0-preview7-27812-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27812-03 + 3.0.0-preview7-27812-04 $(MicrosoftWindowsDesktopAppPackageVersion) From 4e5029269bfccdae990b00da67e9468bfde93907 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 18:14:27 +0000 Subject: [PATCH 174/471] Update dependencies from https://github.com/dotnet/core-setup build 20190612.06 (#2440) - NETStandard.Library.Ref - 2.1.0-preview7-27812-06 - Microsoft.NETCore.App - 3.0.0-preview7-27812-06 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27812-06 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6ff22b03..8c23a0d57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - ea4ecae88a942e43aceefd5ba59ee6ef528a52be + c50e5ee0bfede6eefcec85dbb0522246b39deb00 - + https://github.com/dotnet/core-setup - ea4ecae88a942e43aceefd5ba59ee6ef528a52be + c50e5ee0bfede6eefcec85dbb0522246b39deb00 - + https://github.com/dotnet/core-setup - ea4ecae88a942e43aceefd5ba59ee6ef528a52be + c50e5ee0bfede6eefcec85dbb0522246b39deb00 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 95970daa9..7f6074387 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19311.1 - 3.0.0-preview7-27812-04 + 3.0.0-preview7-27812-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27812-04 + 2.1.0-preview7-27812-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27812-04 + 3.0.0-preview7-27812-06 $(MicrosoftWindowsDesktopAppPackageVersion) From c3eb847334072a6eac6c489e73b7442864654ea7 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 12 Jun 2019 13:42:09 -0700 Subject: [PATCH 175/471] Add linux-musl-arm64 to list of supported AspNetCore runtimes (#2441) --- src/redist/targets/GenerateBundledVersions.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 80c5dff92..0c7ef6dc2 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -75,6 +75,7 @@ win-arm; osx-x64; linux-musl-x64; + linux-musl-arm64; linux-x64; linux-arm; linux-arm64" /> From 3b439098651f56096f9cfc65ff8421c94a43eb5b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 20:55:36 +0000 Subject: [PATCH 176/471] Update dependencies from https://github.com/dotnet/cli build 20190612.4 (#2442) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19312.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c23a0d57..f764d0a20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 8e7f7cf546d26b4dba4bae2b8bbe3ab51beb17a9 - + https://github.com/dotnet/cli - b59a8eb16cdfcc4e48ed2ba94d8ebcbe281711c3 + 8c678f74f037aba3600ad490d0fb6772d2811c2d diff --git a/eng/Versions.props b/eng/Versions.props index 7f6074387..fe5396f66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19312.3 + 3.0.100-preview7.19312.4 1.0.2-beta5.19311.1 From 52aeda26d8285f41d34fe9b462004820ced8bb7a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 21:43:39 +0000 Subject: [PATCH 177/471] Update dependencies from https://github.com/dotnet/core-setup build 20190612.07 (#2443) - NETStandard.Library.Ref - 2.1.0-preview7-27812-07 - Microsoft.NETCore.App - 3.0.0-preview7-27812-07 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27812-07 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f764d0a20..35ca624fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - c50e5ee0bfede6eefcec85dbb0522246b39deb00 + ce61f9121c1071958bc66435150b0b05f52ec919 - + https://github.com/dotnet/core-setup - c50e5ee0bfede6eefcec85dbb0522246b39deb00 + ce61f9121c1071958bc66435150b0b05f52ec919 - + https://github.com/dotnet/core-setup - c50e5ee0bfede6eefcec85dbb0522246b39deb00 + ce61f9121c1071958bc66435150b0b05f52ec919 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index fe5396f66..567250f72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19311.1 - 3.0.0-preview7-27812-06 + 3.0.0-preview7-27812-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27812-06 + 2.1.0-preview7-27812-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27812-06 + 3.0.0-preview7-27812-07 $(MicrosoftWindowsDesktopAppPackageVersion) From 28d35b9c3cdb1bad94fa4c89f5270a69ca29a64a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 22:39:17 +0000 Subject: [PATCH 178/471] Update dependencies from https://github.com/dotnet/sdk build 20190612.1 (#2444) - Microsoft.NET.Sdk - 3.0.100-preview7.19312.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35ca624fa..018b71fec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset ec1bc921e81509e2cae567f3e8601babe403a6a5 - + https://github.com/dotnet/sdk - 8e7f7cf546d26b4dba4bae2b8bbe3ab51beb17a9 + fce5096afdec48b54dfd504f2a897933beb640d6 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 567250f72..668a20df7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19311.1 + 3.0.100-preview7.19312.1 3.0.0-preview7-27812-07 From e65549d8c60a94d168f69fe595a1defeefc33840 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 23:15:26 +0000 Subject: [PATCH 179/471] Update dependencies from https://github.com/dotnet/cli build 20190612.7 (#2446) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19312.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 018b71fec..628210cd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk fce5096afdec48b54dfd504f2a897933beb640d6 - + https://github.com/dotnet/cli - 8c678f74f037aba3600ad490d0fb6772d2811c2d + 0728d7ddc3e9008fd97d410189149dd4b0de75c3 diff --git a/eng/Versions.props b/eng/Versions.props index 668a20df7..b0977f802 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19312.4 + 3.0.100-preview7.19312.7 1.0.2-beta5.19311.1 From 23f19c91df8e19cf215f5abd17a783462d62f085 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jun 2019 23:19:22 +0000 Subject: [PATCH 180/471] Update dependencies from https://github.com/dotnet/core-setup build 20190612.08 (#2447) - NETStandard.Library.Ref - 2.1.0-preview7-27812-08 - Microsoft.NETCore.App - 3.0.0-preview7-27812-08 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27812-08 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 628210cd2..c9437afae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - ce61f9121c1071958bc66435150b0b05f52ec919 + 094b6111d3d8c90d1111db4d73fd9faa755d9413 - + https://github.com/dotnet/core-setup - ce61f9121c1071958bc66435150b0b05f52ec919 + 094b6111d3d8c90d1111db4d73fd9faa755d9413 - + https://github.com/dotnet/core-setup - ce61f9121c1071958bc66435150b0b05f52ec919 + 094b6111d3d8c90d1111db4d73fd9faa755d9413 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index b0977f802..8ded86708 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19312.1 - 3.0.0-preview7-27812-07 + 3.0.0-preview7-27812-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27812-07 + 2.1.0-preview7-27812-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27812-07 + 3.0.0-preview7-27812-08 $(MicrosoftWindowsDesktopAppPackageVersion) From 828d18a02110dbd7b32181d800f9554da81c80df Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Thu, 13 Jun 2019 12:10:50 +0000 Subject: [PATCH 181/471] Update dependencies from https://github.com/dotnet/arcade build 20190612.21 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19312.21 --- eng/Version.Details.xml | 4 +- eng/common/post-build/dotnetsymbol-init.ps1 | 29 +++ eng/common/post-build/sourcelink-cli-init.ps1 | 29 +++ .../post-build/sourcelink-validation.ps1 | 224 ++++++++++++++++++ eng/common/post-build/symbols-validation.ps1 | 186 +++++++++++++++ .../templates/job/publish-build-assets.yml | 25 ++ .../channels/public-dev-release.yml | 146 ++++++++++++ .../channels/public-validation-release.yml | 92 +++++++ .../templates/post-build/common-variables.yml | 9 + .../templates/post-build/post-build.yml | 59 +++++ .../templates/post-build/promote-build.yml | 28 +++ .../post-build/setup-maestro-vars.yml | 26 ++ eng/common/tools.ps1 | 5 +- eng/common/tools.sh | 2 +- global.json | 2 +- 15 files changed, 860 insertions(+), 6 deletions(-) create mode 100644 eng/common/post-build/dotnetsymbol-init.ps1 create mode 100644 eng/common/post-build/sourcelink-cli-init.ps1 create mode 100644 eng/common/post-build/sourcelink-validation.ps1 create mode 100644 eng/common/post-build/symbols-validation.ps1 create mode 100644 eng/common/templates/post-build/channels/public-dev-release.yml create mode 100644 eng/common/templates/post-build/channels/public-validation-release.yml create mode 100644 eng/common/templates/post-build/common-variables.yml create mode 100644 eng/common/templates/post-build/post-build.yml create mode 100644 eng/common/templates/post-build/promote-build.yml create mode 100644 eng/common/templates/post-build/setup-maestro-vars.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 285d73fb4..1be0ffa7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - dfc41299b9aadb1ca98093d660df81811eca901b + e5cd71926eaa13aba3138c14cd80def0ccfebb30 diff --git a/eng/common/post-build/dotnetsymbol-init.ps1 b/eng/common/post-build/dotnetsymbol-init.ps1 new file mode 100644 index 000000000..e7659b98c --- /dev/null +++ b/eng/common/post-build/dotnetsymbol-init.ps1 @@ -0,0 +1,29 @@ +param ( + $dotnetsymbolVersion = $null +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\..\tools.ps1 + +$verbosity = "minimal" + +function Installdotnetsymbol ($dotnetsymbolVersion) { + $dotnetsymbolPackageName = "dotnet-symbol" + + $dotnetRoot = InitializeDotNetCli -install:$true + $dotnet = "$dotnetRoot\dotnet.exe" + $toolList = & "$dotnet" tool list --global + + if (($toolList -like "*$dotnetsymbolPackageName*") -and ($toolList -like "*$dotnetsymbolVersion*")) { + Write-Host "dotnet-symbol version $dotnetsymbolVersion is already installed." + } + else { + Write-Host "Installing dotnet-symbol version $dotnetsymbolVersion..." + Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." + & "$dotnet" tool install $dotnetsymbolPackageName --version $dotnetsymbolVersion --verbosity $verbosity --global + } +} + +Installdotnetsymbol $dotnetsymbolVersion diff --git a/eng/common/post-build/sourcelink-cli-init.ps1 b/eng/common/post-build/sourcelink-cli-init.ps1 new file mode 100644 index 000000000..9eaa25b3b --- /dev/null +++ b/eng/common/post-build/sourcelink-cli-init.ps1 @@ -0,0 +1,29 @@ +param ( + $sourcelinkCliVersion = $null +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\..\tools.ps1 + +$verbosity = "minimal" + +function InstallSourcelinkCli ($sourcelinkCliVersion) { + $sourcelinkCliPackageName = "sourcelink" + + $dotnetRoot = InitializeDotNetCli -install:$true + $dotnet = "$dotnetRoot\dotnet.exe" + $toolList = & "$dotnet" tool list --global + + if (($toolList -like "*$sourcelinkCliPackageName*") -and ($toolList -like "*$sourcelinkCliVersion*")) { + Write-Host "SourceLink CLI version $sourcelinkCliVersion is already installed." + } + else { + Write-Host "Installing SourceLink CLI version $sourcelinkCliVersion..." + Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." + & "$dotnet" tool install $sourcelinkCliPackageName --version $sourcelinkCliVersion --verbosity $verbosity --global + } +} + +InstallSourcelinkCli $sourcelinkCliVersion diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 new file mode 100644 index 000000000..8abd684e9 --- /dev/null +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -0,0 +1,224 @@ +param( + [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where Symbols.NuGet packages to be checked are stored + [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation + [Parameter(Mandatory=$true)][string] $GHRepoName, # GitHub name of the repo including the Org. E.g., dotnet/arcade + [Parameter(Mandatory=$true)][string] $GHCommit, # GitHub commit SHA used to build the packages + [Parameter(Mandatory=$true)][string] $SourcelinkCliVersion # Version of SourceLink CLI to use +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\..\tools.ps1 + +# Cache/HashMap (File -> Exist flag) used to consult whether a file exist +# in the repository at a specific commit point. This is populated by inserting +# all files present in the repo at a specific commit point. +$global:RepoFiles = @{} + +$ValidatePackage = { + param( + [string] $PackagePath # Full path to a Symbols.NuGet package + ) + + . $using:PSScriptRoot\..\tools.ps1 + + # Ensure input file exist + if (!(Test-Path $PackagePath)) { + Write-PipelineTaskError "Input file does not exist: $PackagePath" + ExitWithExitCode 1 + } + + # Extensions for which we'll look for SourceLink information + # For now we'll only care about Portable & Embedded PDBs + $RelevantExtensions = @(".dll", ".exe", ".pdb") + + Write-Host -NoNewLine "Validating" ([System.IO.Path]::GetFileName($PackagePath)) "... " + + $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) + $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId + $FailedFiles = 0 + + Add-Type -AssemblyName System.IO.Compression.FileSystem + + [System.IO.Directory]::CreateDirectory($ExtractPath); + + try { + $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) + + $zip.Entries | + Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} | + ForEach-Object { + $FileName = $_.FullName + $Extension = [System.IO.Path]::GetExtension($_.Name) + $FakeName = -Join((New-Guid), $Extension) + $TargetFile = Join-Path -Path $ExtractPath -ChildPath $FakeName + + # We ignore resource DLLs + if ($FileName.EndsWith(".resources.dll")) { + return + } + + [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true) + + $ValidateFile = { + param( + [string] $FullPath, # Full path to the module that has to be checked + [string] $RealPath, + [ref] $FailedFiles + ) + + $sourcelinkExe = "$env:USERPROFILE\.dotnet\tools" + $sourcelinkExe = Resolve-Path "$sourcelinkExe\sourcelink.exe" + $SourceLinkInfos = & $sourcelinkExe print-urls $FullPath | Out-String + + if ($LASTEXITCODE -eq 0 -and -not ([string]::IsNullOrEmpty($SourceLinkInfos))) { + $NumFailedLinks = 0 + + # We only care about Http addresses + $Matches = (Select-String '(http[s]?)(:\/\/)([^\s,]+)' -Input $SourceLinkInfos -AllMatches).Matches + + if ($Matches.Count -ne 0) { + $Matches.Value | + ForEach-Object { + $Link = $_ + $CommitUrl = "https://raw.githubusercontent.com/${using:GHRepoName}/${using:GHCommit}/" + + $FilePath = $Link.Replace($CommitUrl, "") + $Status = 200 + $Cache = $using:RepoFiles + + if ( !($Cache.ContainsKey($FilePath)) ) { + try { + $Uri = $Link -as [System.URI] + + # Only GitHub links are valid + if ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match "github" -or $Uri.Host -match "githubusercontent")) { + $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode + } + else { + $Status = 0 + } + } + catch { + write-host $_ + $Status = 0 + } + } + + if ($Status -ne 200) { + if ($NumFailedLinks -eq 0) { + if ($FailedFiles.Value -eq 0) { + Write-Host + } + + Write-Host "`tFile $RealPath has broken links:" + } + + Write-Host "`t`tFailed to retrieve $Link" + + $NumFailedLinks++ + } + } + } + + if ($NumFailedLinks -ne 0) { + $FailedFiles.value++ + $global:LASTEXITCODE = 1 + } + } + } + + &$ValidateFile $TargetFile $FileName ([ref]$FailedFiles) + } + } + catch { + + } + finally { + $zip.Dispose() + } + + if ($FailedFiles -eq 0) { + Write-Host "Passed." + } + else { + Write-PipelineTaskError "$PackagePath has broken SourceLink links." + } +} + +function ValidateSourceLinkLinks { + if (!($GHRepoName -Match "^[^\s\/]+/[^\s\/]+$")) { + if (!($GHRepoName -Match "^[^\s-]+-[^\s]+$")) { + Write-PipelineTaskError "GHRepoName should be in the format / or -" + ExitWithExitCode 1 + } + else { + $GHRepoName = $GHRepoName -replace '^([^\s-]+)-([^\s]+)$', '$1/$2'; + } + } + + if (!($GHCommit -Match "^[0-9a-fA-F]{40}$")) { + Write-PipelineTaskError "GHCommit should be a 40 chars hexadecimal string" + ExitWithExitCode 1 + } + + $RepoTreeURL = -Join("http://api.github.com/repos/", $GHRepoName, "/git/trees/", $GHCommit, "?recursive=1") + $CodeExtensions = @(".cs", ".vb", ".fs", ".fsi", ".fsx", ".fsscript") + + try { + # Retrieve the list of files in the repo at that particular commit point and store them in the RepoFiles hash + $Data = Invoke-WebRequest $RepoTreeURL -UseBasicParsing | ConvertFrom-Json | Select-Object -ExpandProperty tree + + foreach ($file in $Data) { + $Extension = [System.IO.Path]::GetExtension($file.path) + + if ($CodeExtensions.Contains($Extension)) { + $RepoFiles[$file.path] = 1 + } + } + } + catch { + Write-PipelineTaskError "Problems downloading the list of files from the repo. Url used: $RepoTreeURL" + Write-Host $_ + ExitWithExitCode 1 + } + + if (Test-Path $ExtractPath) { + Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue + } + + # Process each NuGet package in parallel + $Jobs = @() + Get-ChildItem "$InputPath\*.symbols.nupkg" | + ForEach-Object { + $Jobs += Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName + } + + foreach ($Job in $Jobs) { + Wait-Job -Id $Job.Id | Receive-Job + } +} + +function CheckExitCode ([string]$stage) { + $exitCode = $LASTEXITCODE + if ($exitCode -ne 0) { + Write-PipelineTaskError "Something failed while '$stage'. Check for errors above. Exiting now..." + ExitWithExitCode $exitCode + } +} + +try { + Write-Host "Installing SourceLink CLI..." + Get-Location + . $PSScriptRoot\sourcelink-cli-init.ps1 -sourcelinkCliVersion $SourcelinkCliVersion + CheckExitCode "Running sourcelink-cli-init" + + Measure-Command { ValidateSourceLinkLinks } +} +catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 new file mode 100644 index 000000000..69456854e --- /dev/null +++ b/eng/common/post-build/symbols-validation.ps1 @@ -0,0 +1,186 @@ +param( + [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored + [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation + [Parameter(Mandatory=$true)][string] $DotnetSymbolVersion # Version of dotnet symbol to use +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\..\tools.ps1 + +Add-Type -AssemblyName System.IO.Compression.FileSystem + +function FirstMatchingSymbolDescriptionOrDefault { + param( + [string] $FullPath, # Full path to the module that has to be checked + [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols + [string] $SymbolsPath + ) + + $FileName = [System.IO.Path]::GetFileName($FullPath) + $Extension = [System.IO.Path]::GetExtension($FullPath) + + # Those below are potential symbol files that the `dotnet symbol` might + # return. Which one will be returned depend on the type of file we are + # checking and which type of file was uploaded. + + # The file itself is returned + $SymbolPath = $SymbolsPath + "\" + $FileName + + # PDB file for the module + $PdbPath = $SymbolPath.Replace($Extension, ".pdb") + + # PDB file for R2R module (created by crossgen) + $NGenPdb = $SymbolPath.Replace($Extension, ".ni.pdb") + + # DBG file for a .so library + $SODbg = $SymbolPath.Replace($Extension, ".so.dbg") + + # DWARF file for a .dylib + $DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf") + + $dotnetsymbolExe = "$env:USERPROFILE\.dotnet\tools" + $dotnetsymbolExe = Resolve-Path "$dotnetsymbolExe\dotnet-symbol.exe" + + & $dotnetsymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null + + if (Test-Path $PdbPath) { + return "PDB" + } + elseif (Test-Path $NGenPdb) { + return "NGen PDB" + } + elseif (Test-Path $SODbg) { + return "DBG for SO" + } + elseif (Test-Path $DylibDwarf) { + return "Dwarf for Dylib" + } + elseif (Test-Path $SymbolPath) { + return "Module" + } + else { + return $null + } +} + +function CountMissingSymbols { + param( + [string] $PackagePath # Path to a NuGet package + ) + + # Ensure input file exist + if (!(Test-Path $PackagePath)) { + Write-PipelineTaskError "Input file does not exist: $PackagePath" + ExitWithExitCode 1 + } + + # Extensions for which we'll look for symbols + $RelevantExtensions = @(".dll", ".exe", ".so", ".dylib") + + # How many files are missing symbol information + $MissingSymbols = 0 + + $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) + $PackageGuid = New-Guid + $ExtractPath = Join-Path -Path $ExtractPath -ChildPath $PackageGuid + $SymbolsPath = Join-Path -Path $ExtractPath -ChildPath "Symbols" + + [System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath) + + Get-ChildItem -Recurse $ExtractPath | + Where-Object {$RelevantExtensions -contains $_.Extension} | + ForEach-Object { + if ($_.FullName -Match "\\ref\\") { + Write-Host "`t Ignoring reference assembly file" $_.FullName + return + } + + $SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--microsoft-symbol-server" $SymbolsPath + $SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--internal-server" $SymbolsPath + + Write-Host -NoNewLine "`t Checking file" $_.FullName "... " + + if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) { + Write-Host "Symbols found on MSDL (" $SymbolsOnMSDL ") and SymWeb (" $SymbolsOnSymWeb ")" + } + else { + $MissingSymbols++ + + if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) { + Write-Host "No symbols found on MSDL or SymWeb!" + } + else { + if ($SymbolsOnMSDL -eq $null) { + Write-Host "No symbols found on MSDL!" + } + else { + Write-Host "No symbols found on SymWeb!" + } + } + } + } + + Pop-Location + + return $MissingSymbols +} + +function CheckSymbolsAvailable { + if (Test-Path $ExtractPath) { + Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue + } + + Get-ChildItem "$InputPath\*.nupkg" | + ForEach-Object { + $FileName = $_.Name + + # These packages from Arcade-Services include some native libraries that + # our current symbol uploader can't handle. Below is a workaround until + # we get issue: https://github.com/dotnet/arcade/issues/2457 sorted. + if ($FileName -Match "Microsoft\.DotNet\.Darc\.") { + Write-Host "Ignoring Arcade-services file: $FileName" + Write-Host + return + } + elseif ($FileName -Match "Microsoft\.DotNet\.Maestro\.Tasks\.") { + Write-Host "Ignoring Arcade-services file: $FileName" + Write-Host + return + } + + Write-Host "Validating $FileName " + $Status = CountMissingSymbols "$InputPath\$FileName" + + if ($Status -ne 0) { + Write-PipelineTaskError "Missing symbols for $Status modules in the package $FileName" + ExitWithExitCode $exitCode + } + + Write-Host + } +} + +function CheckExitCode ([string]$stage) { + $exitCode = $LASTEXITCODE + if ($exitCode -ne 0) { + Write-PipelineTaskError "Something failed while '$stage'. Check for errors above. Exiting now..." + ExitWithExitCode $exitCode + } +} + +try { + Write-Host "Installing dotnet symbol ..." + Get-Location + . $PSScriptRoot\dotnetsymbol-init.ps1 -dotnetsymbolVersion $DotnetSymbolVersion + CheckExitCode "Running dotnetsymbol-init" + + CheckSymbolsAvailable +} +catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 620bd3c62..619ec68aa 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -57,8 +57,33 @@ jobs: /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) + /v:detailed condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} + - task: powershell@2 + displayName: Create BARBuildId Artifact + inputs: + targetType: inline + script: | + Add-Content -Path "$(Build.StagingDirectory)/BARBuildId.txt" -Value $(BARBuildId) + - task: powershell@2 + displayName: Create Channels Artifact + inputs: + targetType: inline + script: | + Add-Content -Path "$(Build.StagingDirectory)/Channels.txt" -Value "$(DefaultChannels)" + - task: PublishBuildArtifacts@1 + displayName: Publish BAR BuildId to VSTS + inputs: + PathtoPublish: '$(Build.StagingDirectory)/BARBuildId.txt' + PublishLocation: Container + ArtifactName: ReleaseConfigs + - task: PublishBuildArtifacts@1 + displayName: Publish Channels to VSTS + inputs: + PathtoPublish: '$(Build.StagingDirectory)/Channels.txt' + PublishLocation: Container + ArtifactName: ReleaseConfigs - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - task: PublishBuildArtifacts@1 displayName: Publish Logs to VSTS diff --git a/eng/common/templates/post-build/channels/public-dev-release.yml b/eng/common/templates/post-build/channels/public-dev-release.yml new file mode 100644 index 000000000..b332cb517 --- /dev/null +++ b/eng/common/templates/post-build/channels/public-dev-release.yml @@ -0,0 +1,146 @@ +parameters: + enableSymbolValidation: true + +stages: +- stage: Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: Developer Channel + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Symbol Publishing + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) + variables: + - group: DotNet-Symbol-Server-Pats + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download PDB Artifacts + inputs: + buildType: current + artifactName: PDBArtifacts + continueOnError: true + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: PowerShell@2 + displayName: Publish + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet + /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) + /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:Configuration=Release + + - job: + displayName: Publish to Static Feed + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - group: Publish-Build-Assets + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Asset Manifests + inputs: + buildType: current + artifactName: AssetManifests + + - task: PowerShell@2 + displayName: Publish + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishToPackageFeed -restore -msbuildEngine dotnet + /p:AccountKeyToStaticFeed='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' + /p:BuildAssetRegistryToken='$(MaestroAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:ArtifactsCategory='$(_DotNetArtifactsCategory)' + /p:OverrideAssetsWithSameName=true + /p:PassIfExistingItemIdentical=true + /p:Configuration=Release + + +- stage: PublishValidation + displayName: Publish Validation + variables: + - template: ../common-variables.yml + jobs: + - template: ../setup-maestro-vars.yml + + - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: + - job: + displayName: Symbol Availability + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: PowerShell@2 + displayName: Check Symbol Availability + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) + + - job: + displayName: Gather Drop + dependsOn: setupMaestroVars + variables: + BARBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: PowerShell@2 + displayName: Setup Darc CLI + inputs: + targetType: filePath + filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1' + + - task: PowerShell@2 + displayName: Run Darc gather-drop + inputs: + targetType: inline + script: | + darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) + continueOnError: true + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml new file mode 100644 index 000000000..0b9719da8 --- /dev/null +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -0,0 +1,92 @@ +stages: +- stage: PVR_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: Validation Channel + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Publish to Static Feed + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicValidationRelease_30_Channel_Id) + variables: + - group: DotNet-Blob-Feed + - group: Publish-Build-Assets + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Asset Manifests + inputs: + buildType: current + artifactName: AssetManifests + + - task: PowerShell@2 + displayName: Publish + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishToPackageFeed -restore -msbuildEngine dotnet + /p:AccountKeyToStaticFeed='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' + /p:BuildAssetRegistryToken='$(MaestroAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:ArtifactsCategory='$(_DotNetArtifactsCategory)' + /p:OverrideAssetsWithSameName=true + /p:PassIfExistingItemIdentical=true + /p:Configuration=Release + + +- stage: PVR_PublishValidation + displayName: Publish Validation + variables: + - template: ../common-variables.yml + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Gather Drop + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicValidationRelease_30_Channel_Id) + variables: + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - group: Publish-Build-Assets + pool: + vmImage: 'windows-2019' + steps: + - task: PowerShell@2 + displayName: Setup Darc CLI + inputs: + targetType: filePath + filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1' + + - task: PowerShell@2 + displayName: Run Darc gather-drop + inputs: + targetType: inline + script: | + darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com --password $(MaestroAccessToken) + continueOnError: true + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml new file mode 100644 index 000000000..97b48d97f --- /dev/null +++ b/eng/common/templates/post-build/common-variables.yml @@ -0,0 +1,9 @@ +variables: + # .NET Core 3 Dev + PublicDevRelease_30_Channel_Id: 3 + + # .NET Tools - Validation + PublicValidationRelease_30_Channel_Id: 9 + + SourceLinkCLIVersion: 3.0.0 + SymbolToolVersion: 1.0.1 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml new file mode 100644 index 000000000..6b74475a6 --- /dev/null +++ b/eng/common/templates/post-build/post-build.yml @@ -0,0 +1,59 @@ +parameters: + enableSourceLinkValidation: true + enableSigningValidation: true + enableSymbolValidation: true + +stages: +- stage: validate + dependsOn: build + displayName: Validate + jobs: + - ${{ if eq(parameters.enableSigningValidation, 'true') }}: + - job: + displayName: Signing Validation + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine dotnet + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:Configuration=Release + + - ${{ if eq(parameters.enableSourceLinkValidation, 'true') }}: + - job: + displayName: SourceLink Validation + variables: + - template: common-variables.yml + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + +- template: \eng\common\templates\post-build\channels\public-dev-release.yml + parameters: + enableSymbolValidation: ${{ parameters.enableSymbolValidation }} + +- template: \eng\common\templates\post-build\channels\public-validation-release.yml diff --git a/eng/common/templates/post-build/promote-build.yml b/eng/common/templates/post-build/promote-build.yml new file mode 100644 index 000000000..d00317003 --- /dev/null +++ b/eng/common/templates/post-build/promote-build.yml @@ -0,0 +1,28 @@ +parameters: + ChannelId: 0 + +jobs: +- job: + displayName: Promote Build + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], ${{ parameters.ChannelId }}) + variables: + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: ChannelId + value: ${{ parameters.ChannelId }} + - group: Publish-Build-Assets + pool: + vmImage: 'windows-2019' + steps: + - task: PowerShell@2 + displayName: Add Build to Channel + inputs: + targetType: inline + script: | + $headers = @{ + "Accept" = "application/json" + "Authorization" = "Bearer $(MaestroAccessToken)" + } + Invoke-RestMethod -Method Post -Headers $headers -Uri https://maestro-prod.westus2.cloudapp.azure.com/api/channels/$(ChannelId)/builds/$(BARBuildId)?api-version=2019-01-16 + enabled: false diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml new file mode 100644 index 000000000..b40e0260a --- /dev/null +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -0,0 +1,26 @@ +jobs: +- job: setupMaestroVars + displayName: Setup Maestro Vars + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Release Configs + inputs: + buildType: current + artifactName: ReleaseConfigs + + - task: PowerShell@2 + name: setReleaseVars + displayName: Set Release Configs Vars + inputs: + targetType: inline + script: | + . "$(Build.SourcesDirectory)/eng/common/tools.ps1" + + $BarId = Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/BARBuildId.txt" + Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId + + $Channels = "" + Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/Channels.txt" | ForEach-Object { $Channels += "$_ ," } + Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels" diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 1b9e2cd88..9ea85c4f9 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -138,7 +138,8 @@ function Write-PipelineSetVariable { if($ci) { Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $Value -Properties @{ 'variable' = $Name - 'issecret' = $Secret + 'isSecret' = $Secret + 'isOutput' = 'true' } -AsOutput:$AsOutput } } @@ -377,7 +378,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ } if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } - $args = @("-latest", "-prerelease", "-format", "json", "-requires", "Microsoft.Component.MSBuild") + $args = @("-latest", "-prerelease", "-format", "json", "-requires", "Microsoft.Component.MSBuild", "-products", "*") if (Get-Member -InputObject $vsRequirements -Name "version") { $args += "-version" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index a8dffd345..86973b3c2 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -349,7 +349,7 @@ function InitializeToolset { fi if [[ "$restore" != true ]]; then - EmitError "Toolset version $toolsetVersion has not been restored." + EmitError "Toolset version $toolset_version has not been restored." ExitWithExitCode 2 fi diff --git a/global.json b/global.json index 28745802a..6e412bcad 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19311.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19312.21" } } From 5333bf272b5b80d06a6bd88603b85931f06309cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jun 2019 18:58:52 +0000 Subject: [PATCH 182/471] Update dependencies from https://github.com/dotnet/toolset build 20190613.1 (#2450) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19313.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9437afae..546bf7d59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating d285831c74b28e71a8a494e1ec2a02a95861bbb8 - + https://github.com/dotnet/toolset - ec1bc921e81509e2cae567f3e8601babe403a6a5 + 1ec77c7bb503445fe4247ccc22bc795fcaf8316c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 8ded86708..0db511b1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19312.6 + 3.0.100-preview7.19313.1 From f5d18fa787f287d8cbdc2f72ffc02e925a13b4e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jun 2019 19:18:25 +0000 Subject: [PATCH 183/471] [master] Update dependencies from dotnet/core-setup (#2448) * Update dependencies from https://github.com/dotnet/core-setup build 20190612.10 - NETStandard.Library.Ref - 2.1.0-preview7-27812-10 - Microsoft.NETCore.App - 3.0.0-preview7-27812-10 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27812-10 * Update dependencies from https://github.com/dotnet/core-setup build 20190612.11 - NETStandard.Library.Ref - 2.1.0-preview7-27812-11 - Microsoft.NETCore.App - 3.0.0-preview7-27812-11 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27812-11 * Update dependencies from https://github.com/dotnet/core-setup build 20190613.02 - NETStandard.Library.Ref - 2.1.0-preview7-27813-02 - Microsoft.NETCore.App - 3.0.0-preview7-27813-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27813-02 * Update dependencies from https://github.com/dotnet/core-setup build 20190613.04 - NETStandard.Library.Ref - 2.1.0-preview7-27813-04 - Microsoft.NETCore.App - 3.0.0-preview7-27813-04 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27813-04 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19310.2 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19311.4 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190613.05 - NETStandard.Library.Ref - 2.1.0-preview7-27813-05 - Microsoft.NETCore.App - 3.0.0-preview7-27813-05 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27813-05 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19310.2 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19311.4 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 546bf7d59..c560af379 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 094b6111d3d8c90d1111db4d73fd9faa755d9413 + 67955f35945aaf7e8f50e257f80b59f7bead99af - + https://github.com/dotnet/core-setup - 094b6111d3d8c90d1111db4d73fd9faa755d9413 + 67955f35945aaf7e8f50e257f80b59f7bead99af - + https://github.com/dotnet/core-setup - 094b6111d3d8c90d1111db4d73fd9faa755d9413 + 67955f35945aaf7e8f50e257f80b59f7bead99af https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 0728d7ddc3e9008fd97d410189149dd4b0de75c3 - + https://github.com/dotnet/winforms - 3c9d886bcb0c203baa0955f73fe530e98388ce59 + b8fb4ecab72d1a292f75f14222ec867d7ea77341 - + https://github.com/dotnet/wpf - acaba9cc1e55a1b386e09a3e0d705280d64b18f2 + 42f8d28b5d3bda397fbbf4d1f5ef69631601c5ce diff --git a/eng/Versions.props b/eng/Versions.props index 0db511b1f..747a7434f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19308.1 + 4.8.0-preview7.19310.2 - 3.0.0-preview7.19309.5 + 3.0.0-preview7.19311.4 @@ -47,7 +47,7 @@ 3.0.100-preview7.19312.1 - 3.0.0-preview7-27812-08 + 3.0.0-preview7-27813-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27812-08 + 2.1.0-preview7-27813-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27812-08 + 3.0.0-preview7-27813-05 $(MicrosoftWindowsDesktopAppPackageVersion) From ef5a2985a5f74579a7ab5a08d7eba617a3f86029 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jun 2019 19:32:32 +0000 Subject: [PATCH 184/471] Update dependencies from https://github.com/dotnet/toolset build 20190613.2 (#2451) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19313.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c560af379..4c65525a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating d285831c74b28e71a8a494e1ec2a02a95861bbb8 - + https://github.com/dotnet/toolset - 1ec77c7bb503445fe4247ccc22bc795fcaf8316c + 422a2d20aaa01e4d3d24bab14e5a59a4fc90bf76 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 747a7434f..68e248a79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19313.1 + 3.0.100-preview7.19313.2 From 8c7d701e3347bc004843ee3b1c0e187d62821b1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jun 2019 19:35:35 +0000 Subject: [PATCH 185/471] Update dependencies from https://github.com/dotnet/cli build 20190613.1 (#2452) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19313.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c65525a2..b5257770a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk fce5096afdec48b54dfd504f2a897933beb640d6 - + https://github.com/dotnet/cli - 0728d7ddc3e9008fd97d410189149dd4b0de75c3 + 4261e17b68b0ef58cc0d7d5589738a755a64f938 diff --git a/eng/Versions.props b/eng/Versions.props index 68e248a79..583b9f3eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19312.7 + 3.0.100-preview7.19313.1 1.0.2-beta5.19311.1 From 9e8c2e2de74a7bcf5d7dd541565a6c4677aeef79 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jun 2019 20:57:35 +0000 Subject: [PATCH 186/471] Update dependencies from https://github.com/dotnet/core-setup build 20190613.06 (#2456) - NETStandard.Library.Ref - 2.1.0-preview7-27813-06 - Microsoft.NETCore.App - 3.0.0-preview7-27813-06 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27813-06 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5257770a..51e4a34d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 67955f35945aaf7e8f50e257f80b59f7bead99af + 5cfc2cab25bfc431ef89572aa2705725a95aca32 - + https://github.com/dotnet/core-setup - 67955f35945aaf7e8f50e257f80b59f7bead99af + 5cfc2cab25bfc431ef89572aa2705725a95aca32 - + https://github.com/dotnet/core-setup - 67955f35945aaf7e8f50e257f80b59f7bead99af + 5cfc2cab25bfc431ef89572aa2705725a95aca32 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 583b9f3eb..1761e3f55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19312.1 - 3.0.0-preview7-27813-05 + 3.0.0-preview7-27813-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27813-05 + 2.1.0-preview7-27813-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27813-05 + 3.0.0-preview7-27813-06 $(MicrosoftWindowsDesktopAppPackageVersion) From 410fad5c0d05d1b952f3b12add0609f2296cf5b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jun 2019 02:05:14 +0000 Subject: [PATCH 187/471] Update dependencies from https://github.com/dotnet/sdk build 20190613.3 (#2460) - Microsoft.NET.Sdk - 3.0.100-preview7.19313.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51e4a34d0..1b9e3605c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 422a2d20aaa01e4d3d24bab14e5a59a4fc90bf76 - + https://github.com/dotnet/sdk - fce5096afdec48b54dfd504f2a897933beb640d6 + cb8c89e71323d667cac97fcbe6ad6cf95a11068a https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 1761e3f55..797f5be5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19312.1 + 3.0.100-preview7.19313.3 3.0.0-preview7-27813-06 From a21600682f2be031e021b9f952bf13a4e26be12a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jun 2019 03:15:34 +0000 Subject: [PATCH 188/471] [master] Update dependencies from dotnet/cli (#2461) * Update dependencies from https://github.com/dotnet/cli build 20190613.2 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19313.2 * Update dependencies from https://github.com/dotnet/cli build 20190613.3 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19313.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b9e3605c..c2c2482d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk cb8c89e71323d667cac97fcbe6ad6cf95a11068a - + https://github.com/dotnet/cli - 4261e17b68b0ef58cc0d7d5589738a755a64f938 + dc370677a5aeba592234ec9dd0eeb6b3f151db9a diff --git a/eng/Versions.props b/eng/Versions.props index 797f5be5c..f1bbc998e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19313.1 + 3.0.100-preview7.19313.3 1.0.2-beta5.19311.1 From 0495b33441ea310db6ab577386410059da87549d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jun 2019 04:10:24 +0000 Subject: [PATCH 189/471] Update dependencies from https://github.com/dotnet/cli build 20190613.4 (#2462) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19313.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2c2482d8..6b40fce33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk cb8c89e71323d667cac97fcbe6ad6cf95a11068a - + https://github.com/dotnet/cli - dc370677a5aeba592234ec9dd0eeb6b3f151db9a + 19c0b2e072eabd184c0ae1b8718b52ffa6742daf diff --git a/eng/Versions.props b/eng/Versions.props index f1bbc998e..44e7a9911 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19313.3 + 3.0.100-preview7.19313.4 1.0.2-beta5.19311.1 From f49dfbca937762397856ddc96ec874e0506d5ce7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jun 2019 05:35:25 +0000 Subject: [PATCH 190/471] Update dependencies from https://github.com/dotnet/cli build 20190613.7 (#2463) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19313.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b40fce33..c274db2b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk cb8c89e71323d667cac97fcbe6ad6cf95a11068a - + https://github.com/dotnet/cli - 19c0b2e072eabd184c0ae1b8718b52ffa6742daf + 22ab7dac91220a5be69fc44a22ee357fa0bf7a5a diff --git a/eng/Versions.props b/eng/Versions.props index 44e7a9911..4eef4fced 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19313.4 + 3.0.100-preview7.19313.7 1.0.2-beta5.19311.1 From 29e7b407efc5485d9b014792131ba8c2a6e88226 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Fri, 14 Jun 2019 12:10:56 +0000 Subject: [PATCH 191/471] Update dependencies from https://github.com/dotnet/arcade build 20190613.18 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19313.18 --- eng/Version.Details.xml | 4 +- eng/common/build.ps1 | 2 +- ...ons.ps1 => pipeline-logging-functions.ps1} | 89 ++++++++++++++- eng/common/pipeline-logging-functions.sh | 102 ++++++++++++++++++ eng/common/tools.ps1 | 87 +++------------ eng/common/tools.sh | 90 ++-------------- global.json | 2 +- 7 files changed, 217 insertions(+), 159 deletions(-) rename eng/common/{LoggingCommandFunctions.ps1 => pipeline-logging-functions.ps1} (68%) create mode 100644 eng/common/pipeline-logging-functions.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1be0ffa7a..3880fbcbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - e5cd71926eaa13aba3138c14cd80def0ccfebb30 + 8952b877fa6bca387cd4321b33dcdf6778e31240 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 4cb2ce489..feb58d141 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -134,7 +134,7 @@ try { } catch { Write-Host $_.ScriptStackTrace - Write-PipelineTaskError -Message $_ + Write-PipelineTelemetryError -Category "InitializeToolset" -Message $_ ExitWithExitCode 1 } diff --git a/eng/common/LoggingCommandFunctions.ps1 b/eng/common/pipeline-logging-functions.ps1 similarity index 68% rename from eng/common/LoggingCommandFunctions.ps1 rename to eng/common/pipeline-logging-functions.ps1 index c225eaecb..7b61376f8 100644 --- a/eng/common/LoggingCommandFunctions.ps1 +++ b/eng/common/pipeline-logging-functions.ps1 @@ -1,4 +1,4 @@ -# Source for this file was taken from https://github.com/microsoft/azure-pipelines-task-lib/blob/11c9439d4af17e6475d9fe058e6b2e03914d17e6/powershell/VstsTaskSdk/LoggingCommandFunctions.ps1 +# Source for this file was taken from https://github.com/microsoft/azure-pipelines-task-lib/blob/11c9439d4af17e6475d9fe058e6b2e03914d17e6/powershell/VstsTaskSdk/LoggingCommandFunctions.ps1 and modified. # NOTE: You should not be calling these method directly as they are likely to change. Instead you should be calling the Write-Pipeline* functions defined in tools.ps1 @@ -12,6 +12,93 @@ $script:loggingCommandEscapeMappings = @( # TODO: WHAT ABOUT "="? WHAT ABOUT "%" # TODO: BUG: Escape % ??? # TODO: Add test to verify don't need to escape "=". +function Write-PipelineTelemetryError { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Category, + [Parameter(Mandatory = $true)] + [string]$Message, + [Parameter(Mandatory = $false)] + [string]$Type = 'error', + [string]$ErrCode, + [string]$SourcePath, + [string]$LineNumber, + [string]$ColumnNumber, + [switch]$AsOutput) + + $PSBoundParameters.Remove("Category") | Out-Null + + $Message = "(NETCORE_ENGINEERING_TELEMETRY=$Category) $Message" + $PSBoundParameters.Remove("Message") | Out-Null + $PSBoundParameters.Add("Message", $Message) + + Write-PipelineTaskError @PSBoundParameters +} + +function Write-PipelineTaskError { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Message, + [Parameter(Mandatory = $false)] + [string]$Type = 'error', + [string]$ErrCode, + [string]$SourcePath, + [string]$LineNumber, + [string]$ColumnNumber, + [switch]$AsOutput) + + if(!$ci) { + if($Type -eq 'error') { + Write-Host $Message -ForegroundColor Red + return + } + elseif ($Type -eq 'warning') { + Write-Host $Message -ForegroundColor Yellow + return + } + } + + if(($Type -ne 'error') -and ($Type -ne 'warning')) { + Write-Host $Message + return + } + if(-not $PSBoundParameters.ContainsKey('Type')) { + $PSBoundParameters.Add('Type', 'error') + } + Write-LogIssue @PSBoundParameters + } + + function Write-PipelineSetVariable { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Name, + [string]$Value, + [switch]$Secret, + [switch]$AsOutput) + + if($ci) { + Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $Value -Properties @{ + 'variable' = $Name + 'isSecret' = $Secret + 'isOutput' = 'true' + } -AsOutput:$AsOutput + } + } + + function Write-PipelinePrependPath { + [CmdletBinding()] + param( + [Parameter(Mandatory=$true)] + [string]$Path, + [switch]$AsOutput) + if($ci) { + Write-LoggingCommand -Area 'task' -Event 'prependpath' -Data $Path -AsOutput:$AsOutput + } + } + <######################################## # Private functions. ########################################> diff --git a/eng/common/pipeline-logging-functions.sh b/eng/common/pipeline-logging-functions.sh new file mode 100644 index 000000000..6098f9a54 --- /dev/null +++ b/eng/common/pipeline-logging-functions.sh @@ -0,0 +1,102 @@ +#!/usr/bin/env bash + +function Write-PipelineTelemetryError { + local telemetry_category='' + local function_args=() + local message='' + while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" + case "$opt" in + -category|-c) + telemetry_category=$2 + shift + ;; + -*) + function_args+=("$1 $2") + shift + ;; + *) + message=$* + ;; + esac + shift + done + + if [[ "$ci" != true ]]; then + echo "$message" >&2 + return + fi + + message="(NETCORE_ENGINEERING_TELEMETRY=$telemetry_category) $message" + function_args+=("$message") + + Write-PipelineTaskError $function_args +} + +function Write-PipelineTaskError { + if [[ "$ci" != true ]]; then + echo "$@" >&2 + return + fi + + message_type="error" + sourcepath='' + linenumber='' + columnnumber='' + error_code='' + + while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" + case "$opt" in + -type|-t) + message_type=$2 + shift + ;; + -sourcepath|-s) + sourcepath=$2 + shift + ;; + -linenumber|-ln) + linenumber=$2 + shift + ;; + -columnnumber|-cn) + columnnumber=$2 + shift + ;; + -errcode|-e) + error_code=$2 + shift + ;; + *) + break + ;; + esac + + shift + done + + message="##vso[task.logissue" + + message="$message type=$message_type" + + if [ -n "$sourcepath" ]; then + message="$message;sourcepath=$sourcepath" + fi + + if [ -n "$linenumber" ]; then + message="$message;linenumber=$linenumber" + fi + + if [ -n "$columnnumber" ]; then + message="$message;columnnumber=$columnnumber" + fi + + if [ -n "$error_code" ]; then + message="$message;code=$error_code" + fi + + message="$message]$*" + echo "$message" +} + diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9ea85c4f9..60741f039 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -92,69 +92,6 @@ function Exec-Process([string]$command, [string]$commandArgs) { } } -function Write-PipelineTaskError { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Message, - [Parameter(Mandatory = $false)] - [string]$Type = 'error', - [string]$ErrCode, - [string]$SourcePath, - [string]$LineNumber, - [string]$ColumnNumber, - [switch]$AsOutput) - - if(!$ci) { - if($Type -eq 'error') { - Write-Host $Message -ForegroundColor Red - return - } - elseif ($Type -eq 'warning') { - Write-Host $Message -ForegroundColor Yellow - return - } - } - - if(($Type -ne 'error') -and ($Type -ne 'warning')) { - Write-Host $Message - return - } - if(-not $PSBoundParameters.ContainsKey('Type')) { - $PSBoundParameters.Add('Type', 'error') - } - Write-LogIssue @PSBoundParameters -} - -function Write-PipelineSetVariable { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Name, - [string]$Value, - [switch]$Secret, - [switch]$AsOutput) - - if($ci) { - Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $Value -Properties @{ - 'variable' = $Name - 'isSecret' = $Secret - 'isOutput' = 'true' - } -AsOutput:$AsOutput - } -} - -function Write-PipelinePrependPath { - [CmdletBinding()] - param( - [Parameter(Mandatory=$true)] - [string]$Path, - [switch]$AsOutput) - if($ci) { - Write-LoggingCommand -Area 'task' -Event 'prependpath' -Data $Path -AsOutput:$AsOutput - } -} - function InitializeDotNetCli([bool]$install) { if (Test-Path variable:global:_DotNetInstallDir) { return $global:_DotNetInstallDir @@ -197,7 +134,7 @@ function InitializeDotNetCli([bool]$install) { if ($install) { InstallDotNetSdk $dotnetRoot $dotnetSdkVersion } else { - Write-PipelineTaskError "Unable to find dotnet with SDK version '$dotnetSdkVersion'" + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Unable to find dotnet with SDK version '$dotnetSdkVersion'" ExitWithExitCode 1 } } @@ -245,7 +182,7 @@ function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $archit & $installScript @installParameters if ($lastExitCode -ne 0) { - Write-PipelineTaskError -Message "Failed to install dotnet cli (exit code '$lastExitCode')." + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet cli (exit code '$lastExitCode')." ExitWithExitCode $lastExitCode } } @@ -419,7 +356,7 @@ function InitializeBuildTool() { if ($msbuildEngine -eq "dotnet") { if (!$dotnetRoot) { - Write-PipelineTaskError "/global.json must specify 'tools.dotnet'." + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "/global.json must specify 'tools.dotnet'." ExitWithExitCode 1 } @@ -428,13 +365,13 @@ function InitializeBuildTool() { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore } catch { - Write-PipelineTaskError $_ + Write-PipelineTelemetryError -Category "InitializeToolset" -Message $_ ExitWithExitCode 1 } $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472" } } else { - Write-PipelineTaskError "Unexpected value of -msbuildEngine: '$msbuildEngine'." + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Unexpected value of -msbuildEngine: '$msbuildEngine'." ExitWithExitCode 1 } @@ -451,7 +388,7 @@ function GetDefaultMSBuildEngine() { return "dotnet" } - Write-PipelineTaskError "-msbuildEngine must be specified, or /global.json must specify 'tools.dotnet' or 'tools.vs'." + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "-msbuildEngine must be specified, or /global.json must specify 'tools.dotnet' or 'tools.vs'." ExitWithExitCode 1 } @@ -504,7 +441,7 @@ function InitializeToolset() { } if (-not $restore) { - Write-PipelineTaskError "Toolset version $toolsetVersion has not been restored." + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Toolset version $toolsetVersion has not been restored." ExitWithExitCode 1 } @@ -564,11 +501,13 @@ function MSBuild() { function MSBuild-Core() { if ($ci) { if (!$binaryLog) { - throw "Binary log must be enabled in CI build." + Write-PipelineTaskError -Message "Binary log must be enabled in CI build." + ExitWithExitCode 1 } if ($nodeReuse) { - throw "Node reuse must be disabled in CI build." + Write-PipelineTaskError -Message "Node reuse must be disabled in CI build." + ExitWithExitCode 1 } } @@ -589,7 +528,7 @@ function MSBuild-Core() { $exitCode = Exec-Process $buildTool.Path $cmdArgs if ($exitCode -ne 0) { - Write-PipelineTaskError "Build failed." + Write-PipelineTaskError -Message "Build failed." $buildLog = GetMSBuildBinaryLogCommandLineArgument $args if ($buildLog -ne $null) { @@ -617,7 +556,7 @@ function GetMSBuildBinaryLogCommandLineArgument($arguments) { return $null } -. $PSScriptRoot\LoggingCommandFunctions.ps1 +. $PSScriptRoot\pipeline-logging-functions.ps1 $RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "..\..") $EngRoot = Resolve-Path (Join-Path $PSScriptRoot "..") diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 86973b3c2..f39aab57b 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -52,78 +52,6 @@ else use_global_nuget_cache=${use_global_nuget_cache:-true} fi -function EmitError { - if [[ "$ci" != true ]]; then - echo "$@" >&2 - return - fi - - message_type="error" - sourcepath='' - linenumber='' - columnnumber='' - error_code='' - - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" - case "$opt" in - -type|-t) - message_type=$2 - shift - ;; - -sourcepath|-s) - sourcepath=$2 - shift - ;; - -linenumber|-l) - linenumber=$2 - shift - ;; - -columnnumber|-col) - columnnumber=$2 - shift - ;; - -code|-c) - error_code=$2 - shift - ;; - *) - break - ;; - esac - - shift - done - - message='##vso[task.logissue' - - message="$message type=$message_type" - - if [ -n "$sourcepath" ]; then - message="$message;sourcepath=$sourcepath" - else - message="$message;sourcepath=${BASH_SOURCE[1]}" - fi - - if [ -n "$linenumber" ]; then - message="$message;linenumber=$linenumber" - else - message="$message;linenumber=${BASH_LINENO[0]}" - fi - - if [ -n "$columnnumber" ]; then - message="$message;columnnumber=$columnnumber" - fi - - if [ -n "$error_code" ]; then - message="$message;code=$error_code" - fi - - message="$message]$*" - - echo "$message" -} - # Resolve any symlinks in the given path. function ResolvePath { local path=$1 @@ -149,7 +77,7 @@ function ReadGlobalVersion { local pattern="\"$key\" *: *\"(.*)\"" if [[ ! $line =~ $pattern ]]; then - EmitError "Error: Cannot find \"$key\" in $global_json_file" + Write-PipelineTelemetryError -category 'InitializeTools' "Error: Cannot find \"$key\" in $global_json_file" ExitWithExitCode 1 fi @@ -210,7 +138,7 @@ function InitializeDotNetCli { if [[ "$install" == true ]]; then InstallDotNetSdk "$dotnet_root" "$dotnet_sdk_version" else - EmitError "Unable to find dotnet with SDK version '$dotnet_sdk_version'" + Write-PipelineTelemetryError -category 'InitializeToolset' "Unable to find dotnet with SDK version '$dotnet_sdk_version'" ExitWithExitCode 1 fi fi @@ -263,7 +191,7 @@ function InstallDotNet { fi bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { local exit_code=$? - EmitError "Failed to install dotnet SDK (exit code '$exit_code')." + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK (exit code '$exit_code')." ExitWithExitCode $exit_code } } @@ -349,7 +277,7 @@ function InitializeToolset { fi if [[ "$restore" != true ]]; then - EmitError "Toolset version $toolset_version has not been restored." + Write-PipelineTelemetryError -category 'InitializeToolset' "Toolset version $toolset_version has not been restored." ExitWithExitCode 2 fi @@ -366,7 +294,7 @@ function InitializeToolset { local toolset_build_proj=`cat "$toolset_location_file"` if [[ ! -a "$toolset_build_proj" ]]; then - EmitError "Invalid toolset path: $toolset_build_proj" + Write-PipelineTelemetryError -category 'InitializeToolset' "Invalid toolset path: $toolset_build_proj" ExitWithExitCode 3 fi @@ -404,12 +332,12 @@ function MSBuild { function MSBuild-Core { if [[ "$ci" == true ]]; then if [[ "$binary_log" != true ]]; then - EmitError "Binary log must be enabled in CI build." + Write-PipelineTaskError "Binary log must be enabled in CI build." ExitWithExitCode 1 fi if [[ "$node_reuse" == true ]]; then - EmitError "Node reuse must be disabled in CI build." + Write-PipelineTaskError "Node reuse must be disabled in CI build." ExitWithExitCode 1 fi fi @@ -423,11 +351,13 @@ function MSBuild-Core { "$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" || { local exit_code=$? - EmitError "Build failed (exit code '$exit_code')." + Write-PipelineTaskError "Build failed (exit code '$exit_code')." ExitWithExitCode $exit_code } } +. "$scriptroot/pipeline-logging-functions.sh" + ResolvePath "${BASH_SOURCE[0]}" _script_dir=`dirname "$_ResolvePath"` diff --git a/global.json b/global.json index 6e412bcad..a1fa7e76e 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19312.21" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19313.18" } } From 3c008a779090b88ea567277548a5e86bb21746ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jun 2019 12:11:05 +0000 Subject: [PATCH 192/471] Update dependencies from https://github.com/dotnet/templating build 20190612.1 (#2449) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19312.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c274db2b2..9a02ed304 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore dd2e2186db4ae416609135593e54f32f48007092 - + https://github.com/dotnet/templating - d285831c74b28e71a8a494e1ec2a02a95861bbb8 + 757a60649f8a929f11b178301e2cbf2c6dc82c46 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 4eef4fced..1852866a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19313.7 - 1.0.2-beta5.19311.1 + 1.0.2-beta5.19312.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From 94ce7ebcb7ae3932ab3626b95a409dbc68f0739c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jun 2019 12:41:39 +0000 Subject: [PATCH 193/471] Update dependencies from https://github.com/dotnet/templating build 20190613.1 (#2464) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19313.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a02ed304..e590000b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore dd2e2186db4ae416609135593e54f32f48007092 - + https://github.com/dotnet/templating - 757a60649f8a929f11b178301e2cbf2c6dc82c46 + 4f65a5662b1ce832c946f4120744b4da46f20d39 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 1852866a5..ab6c392a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19313.7 - 1.0.2-beta5.19312.1 + 1.0.2-beta5.19313.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From 028dd7635a8b69e452a0761c63ebcbe947ef2523 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jun 2019 13:18:00 +0000 Subject: [PATCH 194/471] [master] Update dependencies from dotnet/toolset (#2465) * Update dependencies from https://github.com/dotnet/toolset build 20190614.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19314.1 * Update dependencies from https://github.com/dotnet/toolset build 20190614.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19314.2 * Update dependencies from https://github.com/dotnet/toolset build 20190614.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19314.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e590000b9..0c40d3998 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 4f65a5662b1ce832c946f4120744b4da46f20d39 - + https://github.com/dotnet/toolset - 422a2d20aaa01e4d3d24bab14e5a59a4fc90bf76 + 1cec40a89dd080748867d0bc2d9ff67e5611c543 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index ab6c392a8..5116210ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19313.2 + 3.0.100-preview7.19314.3 From 387a9f61514949843211f52fea895658d5acfee2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jun 2019 13:40:14 +0000 Subject: [PATCH 195/471] Update dependencies from https://github.com/dotnet/cli build 20190614.1 (#2466) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19314.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c40d3998..efca7118c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk cb8c89e71323d667cac97fcbe6ad6cf95a11068a - + https://github.com/dotnet/cli - 22ab7dac91220a5be69fc44a22ee357fa0bf7a5a + e01e492d8a67385811a69772814b04a2e28ad145 diff --git a/eng/Versions.props b/eng/Versions.props index 5116210ee..e56bb36ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19313.7 + 3.0.100-preview7.19314.1 1.0.2-beta5.19313.1 From d9b759ee7d8ab0530ddbae31d7b149cf190f0025 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jun 2019 13:43:44 +0000 Subject: [PATCH 196/471] [master] Update dependencies from dotnet/toolset (#2467) * Update dependencies from https://github.com/dotnet/toolset build 20190614.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19314.4 * Update dependencies from https://github.com/dotnet/toolset build 20190614.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19314.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efca7118c..a74d7c359 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 4f65a5662b1ce832c946f4120744b4da46f20d39 - + https://github.com/dotnet/toolset - 1cec40a89dd080748867d0bc2d9ff67e5611c543 + 30e5883e6d56df0f1a4908cd89a061e35f058677 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e56bb36ae..605e5e563 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19314.3 + 3.0.100-preview7.19314.5 From 81e9bf8e5eaa21c8f6730ba477f6a74683449b59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jun 2019 14:20:57 +0000 Subject: [PATCH 197/471] Update dependencies from https://github.com/dotnet/cli build 20190614.2 (#2468) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19314.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a74d7c359..fa682bdb9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk cb8c89e71323d667cac97fcbe6ad6cf95a11068a - + https://github.com/dotnet/cli - e01e492d8a67385811a69772814b04a2e28ad145 + af5da509050bc95b8ca7c36c1abeab1b3da43adb diff --git a/eng/Versions.props b/eng/Versions.props index 605e5e563..5b0c0042c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19314.1 + 3.0.100-preview7.19314.2 1.0.2-beta5.19313.1 From 12874f0ab16143bbfa9a0ae438ff2989125c404c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jun 2019 16:04:24 +0000 Subject: [PATCH 198/471] [master] Update dependencies from dotnet/core-setup (#2458) * Update dependencies from https://github.com/dotnet/core-setup build 20190613.08 - NETStandard.Library.Ref - 2.1.0-preview7-27813-08 - Microsoft.NETCore.App - 3.0.0-preview7-27813-08 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27813-08 * Update dependencies from https://github.com/dotnet/core-setup build 20190614.01 - NETStandard.Library.Ref - 2.1.0-preview7-27814-01 - Microsoft.NETCore.App - 3.0.0-preview7-27814-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27814-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa682bdb9..14135c357 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 5cfc2cab25bfc431ef89572aa2705725a95aca32 + cd5b695d619d0a7b4126e7ff34fd7937cffbb0c3 - + https://github.com/dotnet/core-setup - 5cfc2cab25bfc431ef89572aa2705725a95aca32 + cd5b695d619d0a7b4126e7ff34fd7937cffbb0c3 - + https://github.com/dotnet/core-setup - 5cfc2cab25bfc431ef89572aa2705725a95aca32 + cd5b695d619d0a7b4126e7ff34fd7937cffbb0c3 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 5b0c0042c..b8a10d230 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19313.3 - 3.0.0-preview7-27813-06 + 3.0.0-preview7-27814-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27813-06 + 2.1.0-preview7-27814-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27813-06 + 3.0.0-preview7-27814-01 $(MicrosoftWindowsDesktopAppPackageVersion) From f0892747af5ffc24df6c79b9104f58b44805899e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jun 2019 16:41:22 +0000 Subject: [PATCH 199/471] [master] Update dependencies from dotnet/core-setup (#2469) * Update dependencies from https://github.com/dotnet/core-setup build 20190614.02 - NETStandard.Library.Ref - 2.1.0-preview7-27814-02 - Microsoft.NETCore.App - 3.0.0-preview7-27814-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27814-02 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19311.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19313.1 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190614.03 - NETStandard.Library.Ref - 2.1.0-preview7-27814-03 - Microsoft.NETCore.App - 3.0.0-preview7-27814-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27814-03 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19311.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19313.1 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14135c357..d5aed4259 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - cd5b695d619d0a7b4126e7ff34fd7937cffbb0c3 + da6c56ca21034650ac99b27ddfdcd28ce6e20547 - + https://github.com/dotnet/core-setup - cd5b695d619d0a7b4126e7ff34fd7937cffbb0c3 + da6c56ca21034650ac99b27ddfdcd28ce6e20547 - + https://github.com/dotnet/core-setup - cd5b695d619d0a7b4126e7ff34fd7937cffbb0c3 + da6c56ca21034650ac99b27ddfdcd28ce6e20547 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ af5da509050bc95b8ca7c36c1abeab1b3da43adb - + https://github.com/dotnet/winforms - b8fb4ecab72d1a292f75f14222ec867d7ea77341 + 222cadfaec73af00b08bb4fa9cd36c829135ce15 - + https://github.com/dotnet/wpf - 42f8d28b5d3bda397fbbf4d1f5ef69631601c5ce + 9afa976db6618e4cd9a944d68149d70e0cbeea58 diff --git a/eng/Versions.props b/eng/Versions.props index b8a10d230..336b094d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19310.2 + 4.8.0-preview7.19311.1 - 3.0.0-preview7.19311.4 + 3.0.0-preview7.19313.1 @@ -47,7 +47,7 @@ 3.0.100-preview7.19313.3 - 3.0.0-preview7-27814-01 + 3.0.0-preview7-27814-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27814-01 + 2.1.0-preview7-27814-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27814-01 + 3.0.0-preview7-27814-03 $(MicrosoftWindowsDesktopAppPackageVersion) From 3218db38dcc55476ff3765a0498c04ddd7e42428 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jun 2019 18:10:26 +0000 Subject: [PATCH 200/471] Update dependencies from https://github.com/dotnet/core-setup build 20190614.04 (#2470) - NETStandard.Library.Ref - 2.1.0-preview7-27814-04 - Microsoft.NETCore.App - 3.0.0-preview7-27814-04 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27814-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5aed4259..c8712830b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - da6c56ca21034650ac99b27ddfdcd28ce6e20547 + ff7bf431e5aa5091fbae6a43f6cfb0a9f44b5d80 - + https://github.com/dotnet/core-setup - da6c56ca21034650ac99b27ddfdcd28ce6e20547 + ff7bf431e5aa5091fbae6a43f6cfb0a9f44b5d80 - + https://github.com/dotnet/core-setup - da6c56ca21034650ac99b27ddfdcd28ce6e20547 + ff7bf431e5aa5091fbae6a43f6cfb0a9f44b5d80 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 336b094d1..a19d26926 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19313.3 - 3.0.0-preview7-27814-03 + 3.0.0-preview7-27814-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27814-03 + 2.1.0-preview7-27814-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27814-03 + 3.0.0-preview7-27814-04 $(MicrosoftWindowsDesktopAppPackageVersion) From 50a0122c8960e8fccf70b43a2234b63b8af46fe0 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Sat, 15 Jun 2019 12:09:31 +0000 Subject: [PATCH 201/471] Update dependencies from https://github.com/dotnet/arcade build 20190614.27 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19314.27 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3880fbcbb..a01f76a7c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 8952b877fa6bca387cd4321b33dcdf6778e31240 + 372249cafc24384ae3488aab4e815e54c2ff3938 diff --git a/global.json b/global.json index a1fa7e76e..0901f5d25 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19313.18" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19314.27" } } From 9e1e96a9a90d1bd6843db89d9583fa68a645d31e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Jun 2019 12:24:59 +0000 Subject: [PATCH 202/471] Update dependencies from https://github.com/dotnet/templating build 20190614.1 (#2474) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19314.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8712830b..3fcfe4303 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore dd2e2186db4ae416609135593e54f32f48007092 - + https://github.com/dotnet/templating - 4f65a5662b1ce832c946f4120744b4da46f20d39 + 15694b8f9d762edfe94551c45cb5a3d9b73ca3f6 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index a19d26926..e07325635 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19314.2 - 1.0.2-beta5.19313.1 + 1.0.2-beta5.19314.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From 7c5ca822542557011590942c1c13e924e8218517 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Jun 2019 12:39:07 +0000 Subject: [PATCH 203/471] Update dependencies from https://github.com/dotnet/toolset build 20190615.1 (#2475) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19315.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3fcfe4303..b90cb82b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 15694b8f9d762edfe94551c45cb5a3d9b73ca3f6 - + https://github.com/dotnet/toolset - 30e5883e6d56df0f1a4908cd89a061e35f058677 + 4f5ecb7af05af2dc8d94eadad01cdb717e14fbe4 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e07325635..c5153ee8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19314.5 + 3.0.100-preview7.19315.1 From aa8d5dabcd861bc1b20b3ccba57c7f39bf970877 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Jun 2019 12:56:01 +0000 Subject: [PATCH 204/471] [master] Update dependencies from dotnet/toolset (#2476) * Update dependencies from https://github.com/dotnet/toolset build 20190615.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19315.2 * Update dependencies from https://github.com/dotnet/toolset build 20190615.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19315.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b90cb82b7..ba9dd05ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 15694b8f9d762edfe94551c45cb5a3d9b73ca3f6 - + https://github.com/dotnet/toolset - 4f5ecb7af05af2dc8d94eadad01cdb717e14fbe4 + be3ee29b7d7b447e582ceddb4f7fc9d674625fb6 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c5153ee8f..cbca4a9d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19315.1 + 3.0.100-preview7.19315.3 From b4f3fa793c2562af4c51097265a47132a75d9a91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Jun 2019 13:30:27 +0000 Subject: [PATCH 205/471] [master] Update dependencies from dotnet/cli (#2471) * Update dependencies from https://github.com/dotnet/cli build 20190614.3 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19314.3 * Update dependencies from https://github.com/dotnet/cli build 20190615.2 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19315.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba9dd05ef..1464e1743 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk cb8c89e71323d667cac97fcbe6ad6cf95a11068a - + https://github.com/dotnet/cli - af5da509050bc95b8ca7c36c1abeab1b3da43adb + cdca2409c8317f6c5f270ae89d1b643df4357bee diff --git a/eng/Versions.props b/eng/Versions.props index cbca4a9d3..1f04ceb99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19314.2 + 3.0.100-preview7.19315.2 1.0.2-beta5.19314.1 From 3bbb6ffbe97bef33ca69ce4b9574fe31c00932da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Jun 2019 13:55:23 +0000 Subject: [PATCH 206/471] Update dependencies from https://github.com/dotnet/cli build 20190615.1 (#2478) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19315.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1464e1743..558ded30f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk cb8c89e71323d667cac97fcbe6ad6cf95a11068a - + https://github.com/dotnet/cli - cdca2409c8317f6c5f270ae89d1b643df4357bee + e516c305e662055e615f92c85dc32d86d63f05a0 diff --git a/eng/Versions.props b/eng/Versions.props index 1f04ceb99..17a55306b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19315.2 + 3.0.100-preview7.19315.1 1.0.2-beta5.19314.1 From 02fb04fe3ce9449bdb7505070d1be85890cb5489 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Jun 2019 14:50:44 +0000 Subject: [PATCH 207/471] [master] Update dependencies from dotnet/core-setup (#2473) * Update dependencies from https://github.com/dotnet/core-setup build 20190614.05 - NETStandard.Library.Ref - 2.1.0-preview7-27814-05 - Microsoft.NETCore.App - 3.0.0-preview7-27814-05 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27814-05 * Update dependencies from https://github.com/dotnet/core-setup build 20190615.01 - NETStandard.Library.Ref - 2.1.0-preview7-27815-01 - Microsoft.NETCore.App - 3.0.0-preview7-27815-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27815-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 558ded30f..114f818d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - ff7bf431e5aa5091fbae6a43f6cfb0a9f44b5d80 + 3731573d7fa120b219bf46c251a968630cd6d0a2 - + https://github.com/dotnet/core-setup - ff7bf431e5aa5091fbae6a43f6cfb0a9f44b5d80 + 3731573d7fa120b219bf46c251a968630cd6d0a2 - + https://github.com/dotnet/core-setup - ff7bf431e5aa5091fbae6a43f6cfb0a9f44b5d80 + 3731573d7fa120b219bf46c251a968630cd6d0a2 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 17a55306b..89e003424 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19313.3 - 3.0.0-preview7-27814-04 + 3.0.0-preview7-27815-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27814-04 + 2.1.0-preview7-27815-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27814-04 + 3.0.0-preview7-27815-01 $(MicrosoftWindowsDesktopAppPackageVersion) From a3201149bb210aaa0470a64067e801ed3d1247cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Jun 2019 16:25:22 +0000 Subject: [PATCH 208/471] Update dependencies from https://github.com/dotnet/core-setup build 20190615.03 (#2479) - NETStandard.Library.Ref - 2.1.0-preview7-27815-03 - Microsoft.NETCore.App - 3.0.0-preview7-27815-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27815-03 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19314.1 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 114f818d9..213a8410f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 3731573d7fa120b219bf46c251a968630cd6d0a2 + 5bfe8af80b4c286350f892586ba4fbdabfdad8a2 - + https://github.com/dotnet/core-setup - 3731573d7fa120b219bf46c251a968630cd6d0a2 + 5bfe8af80b4c286350f892586ba4fbdabfdad8a2 - + https://github.com/dotnet/core-setup - 3731573d7fa120b219bf46c251a968630cd6d0a2 + 5bfe8af80b4c286350f892586ba4fbdabfdad8a2 https://github.com/aspnet/AspNetCore @@ -59,9 +59,9 @@ https://github.com/dotnet/winforms 222cadfaec73af00b08bb4fa9cd36c829135ce15 - + https://github.com/dotnet/wpf - 9afa976db6618e4cd9a944d68149d70e0cbeea58 + cf0bed3f96531e505ee0edc2fad6774deb2804bc diff --git a/eng/Versions.props b/eng/Versions.props index 89e003424..baa8ebd27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.0-preview7.19313.1 + 3.0.0-preview7.19314.1 @@ -47,7 +47,7 @@ 3.0.100-preview7.19313.3 - 3.0.0-preview7-27815-01 + 3.0.0-preview7-27815-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27815-01 + 2.1.0-preview7-27815-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27815-01 + 3.0.0-preview7-27815-03 $(MicrosoftWindowsDesktopAppPackageVersion) From 1bdbca5a17884cebc4e61a9cb029b36c8806ba4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Jun 2019 02:20:07 +0000 Subject: [PATCH 209/471] Update dependencies from https://github.com/dotnet/core-setup build 20190615.04 (#2480) - NETStandard.Library.Ref - 2.1.0-preview7-27815-04 - Microsoft.NETCore.App - 3.0.0-preview7-27815-04 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27815-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 213a8410f..b123e428f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 5bfe8af80b4c286350f892586ba4fbdabfdad8a2 + f1c72ba8603d2b13484f37f62b5987564a48be12 - + https://github.com/dotnet/core-setup - 5bfe8af80b4c286350f892586ba4fbdabfdad8a2 + f1c72ba8603d2b13484f37f62b5987564a48be12 - + https://github.com/dotnet/core-setup - 5bfe8af80b4c286350f892586ba4fbdabfdad8a2 + f1c72ba8603d2b13484f37f62b5987564a48be12 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index baa8ebd27..c07590551 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19313.3 - 3.0.0-preview7-27815-03 + 3.0.0-preview7-27815-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27815-03 + 2.1.0-preview7-27815-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27815-03 + 3.0.0-preview7-27815-04 $(MicrosoftWindowsDesktopAppPackageVersion) From 380d686b70cfa841c97ddd13c49d16104464afbd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Jun 2019 04:47:55 +0000 Subject: [PATCH 210/471] [master] Update dependencies from aspnet/AspNetCore (#2445) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190612.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19312.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19312.3 - dotnet-dev-certs - 3.0.0-preview7.19312.3 - dotnet-user-secrets - 3.0.0-preview7.19312.3 - dotnet-watch - 3.0.0-preview7.19312.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19312.3 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190612.4 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19312.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19312.4 - dotnet-dev-certs - 3.0.0-preview7.19312.4 - dotnet-user-secrets - 3.0.0-preview7.19312.4 - dotnet-watch - 3.0.0-preview7.19312.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19312.4 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190612.5 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19312.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19312.5 - dotnet-dev-certs - 3.0.0-preview7.19312.5 - dotnet-user-secrets - 3.0.0-preview7.19312.5 - dotnet-watch - 3.0.0-preview7.19312.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19312.5 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190612.7 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19312.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19312.7 - dotnet-dev-certs - 3.0.0-preview7.19312.7 - dotnet-user-secrets - 3.0.0-preview7.19312.7 - dotnet-watch - 3.0.0-preview7.19312.7 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19312.7 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190612.6 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19312.6 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19312.6 - dotnet-dev-certs - 3.0.0-preview7.19312.6 - dotnet-user-secrets - 3.0.0-preview7.19312.6 - dotnet-watch - 3.0.0-preview7.19312.6 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19312.6 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190613.5 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19313.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19313.5 - dotnet-dev-certs - 3.0.0-preview7.19313.5 - dotnet-user-secrets - 3.0.0-preview7.19313.5 - dotnet-watch - 3.0.0-preview7.19313.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19313.5 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190613.10 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19313.10 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19313.10 - dotnet-dev-certs - 3.0.0-preview7.19313.10 - dotnet-user-secrets - 3.0.0-preview7.19313.10 - dotnet-watch - 3.0.0-preview7.19313.10 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19313.10 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190613.16 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19313.16 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19313.16 - dotnet-dev-certs - 3.0.0-preview7.19313.16 - dotnet-user-secrets - 3.0.0-preview7.19313.16 - dotnet-watch - 3.0.0-preview7.19313.16 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19313.16 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190614.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19314.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19314.2 - dotnet-dev-certs - 3.0.0-preview7.19314.2 - dotnet-user-secrets - 3.0.0-preview7.19314.2 - dotnet-watch - 3.0.0-preview7.19314.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19314.2 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190614.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19314.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19314.3 - dotnet-dev-certs - 3.0.0-preview7.19314.3 - dotnet-user-secrets - 3.0.0-preview7.19314.3 - dotnet-watch - 3.0.0-preview7.19314.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19314.3 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190614.4 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19314.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19314.4 - dotnet-dev-certs - 3.0.0-preview7.19314.4 - dotnet-user-secrets - 3.0.0-preview7.19314.4 - dotnet-watch - 3.0.0-preview7.19314.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19314.4 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190614.5 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19314.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19314.5 - dotnet-dev-certs - 3.0.0-preview7.19314.5 - dotnet-user-secrets - 3.0.0-preview7.19314.5 - dotnet-watch - 3.0.0-preview7.19314.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19314.5 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190615.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19315.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19315.2 - dotnet-dev-certs - 3.0.0-preview7.19315.2 - dotnet-user-secrets - 3.0.0-preview7.19315.2 - dotnet-watch - 3.0.0-preview7.19315.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19315.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b123e428f..49f530f46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup f1c72ba8603d2b13484f37f62b5987564a48be12 - + https://github.com/aspnet/AspNetCore - dd2e2186db4ae416609135593e54f32f48007092 + 1521e6fa727370ad9d25478b1c32172ef6942cb3 - + https://github.com/aspnet/AspNetCore - dd2e2186db4ae416609135593e54f32f48007092 + 1521e6fa727370ad9d25478b1c32172ef6942cb3 - + https://github.com/aspnet/AspNetCore - dd2e2186db4ae416609135593e54f32f48007092 + 1521e6fa727370ad9d25478b1c32172ef6942cb3 - + https://github.com/aspnet/AspNetCore - dd2e2186db4ae416609135593e54f32f48007092 + 1521e6fa727370ad9d25478b1c32172ef6942cb3 - + https://github.com/aspnet/AspNetCore - dd2e2186db4ae416609135593e54f32f48007092 + 1521e6fa727370ad9d25478b1c32172ef6942cb3 - + https://github.com/aspnet/AspNetCore - dd2e2186db4ae416609135593e54f32f48007092 + 1521e6fa727370ad9d25478b1c32172ef6942cb3 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index c07590551..0c4229526 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19311.5 - 3.0.0-preview7.19311.5 - 3.0.0-preview7.19311.5 - 3.0.0-preview7.19311.5 - 3.0.0-preview7.19311.5 - 3.0.0-preview7.19311.5 + 3.0.0-preview7.19315.2 + 3.0.0-preview7.19315.2 + 3.0.0-preview7.19315.2 + 3.0.0-preview7.19315.2 + 3.0.0-preview7.19315.2 + 3.0.0-preview7.19315.2 From 2829565760d23888865cdaf25eeb91edee400e52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Jun 2019 04:58:31 +0000 Subject: [PATCH 211/471] Update dependencies from https://github.com/dotnet/core-setup build 20190615.05 (#2481) - NETStandard.Library.Ref - 2.1.0-preview7-27815-05 - Microsoft.NETCore.App - 3.0.0-preview7-27815-05 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27815-05 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49f530f46..5de070e84 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup f1c72ba8603d2b13484f37f62b5987564a48be12 - + https://github.com/dotnet/core-setup f1c72ba8603d2b13484f37f62b5987564a48be12 - + https://github.com/dotnet/core-setup f1c72ba8603d2b13484f37f62b5987564a48be12 diff --git a/eng/Versions.props b/eng/Versions.props index 0c4229526..2a8c687f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19313.3 - 3.0.0-preview7-27815-04 + 3.0.0-preview7-27815-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27815-04 + 2.1.0-preview7-27815-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27815-04 + 3.0.0-preview7-27815-05 $(MicrosoftWindowsDesktopAppPackageVersion) From 2407d2f33d9add056029ff87541713fdfa924c9e Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Sun, 16 Jun 2019 12:08:29 +0000 Subject: [PATCH 212/471] Update dependencies from https://github.com/dotnet/arcade build 20190615.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19315.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a01f76a7c..5d1dc5085 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - 372249cafc24384ae3488aab4e815e54c2ff3938 + aa4285be7fab64e2b6e62e4d5688ea50931c407c diff --git a/global.json b/global.json index 0901f5d25..c2cbb5898 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19314.27" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19315.2" } } From 400873b9895d87048a4052d64e078a9e0c6cb332 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Jun 2019 12:23:58 +0000 Subject: [PATCH 213/471] Update dependencies from https://github.com/dotnet/templating build 20190615.1 (#2482) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19315.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5de070e84..905b92a76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore 1521e6fa727370ad9d25478b1c32172ef6942cb3 - + https://github.com/dotnet/templating - 15694b8f9d762edfe94551c45cb5a3d9b73ca3f6 + c561d7deb8e1a7ff7a73d0fd5abec8556dae922b https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 2a8c687f7..3ee59f35e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19315.1 - 1.0.2-beta5.19314.1 + 1.0.2-beta5.19315.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From 1efb12e998ee2e1d2588cac56728e0c8c21fa997 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Jun 2019 12:39:01 +0000 Subject: [PATCH 214/471] [master] Update dependencies from dotnet/toolset (#2477) * Update dependencies from https://github.com/dotnet/toolset build 20190615.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19315.4 * Update dependencies from https://github.com/dotnet/toolset build 20190615.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19315.5 * Update dependencies from https://github.com/dotnet/toolset build 20190616.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19316.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 905b92a76..d799c85c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating c561d7deb8e1a7ff7a73d0fd5abec8556dae922b - + https://github.com/dotnet/toolset - be3ee29b7d7b447e582ceddb4f7fc9d674625fb6 + 726ad56afcf38246617b16ec78a3740288a76306 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 3ee59f35e..55f61d75e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19315.3 + 3.0.100-preview7.19316.1 From f6d71b136c124e7d58937043162bc7c09565bbaa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Jun 2019 12:54:37 +0000 Subject: [PATCH 215/471] [master] Update dependencies from dotnet/toolset (#2483) * Update dependencies from https://github.com/dotnet/toolset build 20190616.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19316.2 * Update dependencies from https://github.com/dotnet/toolset build 20190616.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19316.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d799c85c9..3be5ba71f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating c561d7deb8e1a7ff7a73d0fd5abec8556dae922b - + https://github.com/dotnet/toolset - 726ad56afcf38246617b16ec78a3740288a76306 + 2dc229a66e2800d7e6da43912c0eba506a067de5 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 55f61d75e..f01ee4840 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19316.1 + 3.0.100-preview7.19316.3 From cc9c63fcdf5598f697ebc8db05f52eafaeb0df0c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Jun 2019 13:19:51 +0000 Subject: [PATCH 216/471] Update dependencies from https://github.com/dotnet/toolset build 20190616.4 (#2484) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19316.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3be5ba71f..c64658afd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating c561d7deb8e1a7ff7a73d0fd5abec8556dae922b - + https://github.com/dotnet/toolset - 2dc229a66e2800d7e6da43912c0eba506a067de5 + 058ec2b18be50af0e55b8a2b5803c3d640b88fcc https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f01ee4840..26621d654 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19316.3 + 3.0.100-preview7.19316.4 From e5c641e62324dd5a03352f237285d2093010c8ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Jun 2019 13:35:24 +0000 Subject: [PATCH 217/471] Update dependencies from https://github.com/dotnet/cli build 20190616.1 (#2485) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19316.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c64658afd..30e862787 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk cb8c89e71323d667cac97fcbe6ad6cf95a11068a - + https://github.com/dotnet/cli - e516c305e662055e615f92c85dc32d86d63f05a0 + 4a953af0146b0b4aa0f4de174958e97de2124713 diff --git a/eng/Versions.props b/eng/Versions.props index 26621d654..fa042e4be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19315.1 + 3.0.100-preview7.19316.1 1.0.2-beta5.19315.1 From 9d799a8b9279c9294b1574e633438b499b35e0a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Jun 2019 13:36:56 +0000 Subject: [PATCH 218/471] Update dependencies from https://github.com/dotnet/toolset build 20190616.5 (#2486) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19316.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30e862787..01c54004f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating c561d7deb8e1a7ff7a73d0fd5abec8556dae922b - + https://github.com/dotnet/toolset - 058ec2b18be50af0e55b8a2b5803c3d640b88fcc + 8a84e3ee39504e4db0eab76ed994d3825a23614f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index fa042e4be..b46fbc9a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19316.4 + 3.0.100-preview7.19316.5 From fac7d323ccaa5c4822f3da8928cc3d86455416a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Jun 2019 16:24:01 +0000 Subject: [PATCH 219/471] [master] Update dependencies from dotnet/core-setup (#2487) * Update dependencies from https://github.com/dotnet/core-setup build 20190616.01 - NETStandard.Library.Ref - 2.1.0-preview7-27816-01 - Microsoft.NETCore.App - 3.0.0-preview7-27816-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27816-01 * Update dependencies from https://github.com/dotnet/core-setup build 20190616.02 - NETStandard.Library.Ref - 2.1.0-preview7-27816-02 - Microsoft.NETCore.App - 3.0.0-preview7-27816-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27816-02 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19313.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19314.11 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01c54004f..421f2fe8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - f1c72ba8603d2b13484f37f62b5987564a48be12 + c36106d9b5fdcd198041b1c77dac0bd8cd485f98 - + https://github.com/dotnet/core-setup - f1c72ba8603d2b13484f37f62b5987564a48be12 + c36106d9b5fdcd198041b1c77dac0bd8cd485f98 - + https://github.com/dotnet/core-setup - f1c72ba8603d2b13484f37f62b5987564a48be12 + c36106d9b5fdcd198041b1c77dac0bd8cd485f98 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 4a953af0146b0b4aa0f4de174958e97de2124713 - + https://github.com/dotnet/winforms - 222cadfaec73af00b08bb4fa9cd36c829135ce15 + 23e72e7957ec6b24943ab82a78bfee5b6531a55b - + https://github.com/dotnet/wpf - cf0bed3f96531e505ee0edc2fad6774deb2804bc + 6491806e6bf1bff3483b1eb36cd26b53a2a8eab0 diff --git a/eng/Versions.props b/eng/Versions.props index b46fbc9a6..cd88464f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19311.1 + 4.8.0-preview7.19313.1 - 3.0.0-preview7.19314.1 + 3.0.0-preview7.19314.11 @@ -47,7 +47,7 @@ 3.0.100-preview7.19313.3 - 3.0.0-preview7-27815-05 + 3.0.0-preview7-27816-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27815-05 + 2.1.0-preview7-27816-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27815-05 + 3.0.0-preview7-27816-02 $(MicrosoftWindowsDesktopAppPackageVersion) From 20c80526056aaf88f154044ef0e87cd46704b6b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 16 Jun 2019 20:13:51 +0000 Subject: [PATCH 220/471] [master] Update dependencies from dotnet/sdk (#2472) * Update dependencies from https://github.com/dotnet/sdk build 20190614.1 - Microsoft.NET.Sdk - 3.0.100-preview7.19314.1 * Update dependencies from https://github.com/dotnet/sdk build 20190616.1 - Microsoft.NET.Sdk - 3.0.100-preview7.19316.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 421f2fe8a..0250627ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 8a84e3ee39504e4db0eab76ed994d3825a23614f - + https://github.com/dotnet/sdk - cb8c89e71323d667cac97fcbe6ad6cf95a11068a + 77d6311a5dd7e519e6b496e97e93085bf2d3beb4 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index cd88464f4..c5557c02d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19313.3 + 3.0.100-preview7.19316.1 3.0.0-preview7-27816-02 From 79f8090f3d493cb745c39d119623780408c78802 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2019 04:32:09 +0000 Subject: [PATCH 221/471] Update dependencies from https://github.com/dotnet/core-setup build 20190616.03 (#2488) - NETStandard.Library.Ref - 2.1.0-preview7-27816-03 - Microsoft.NETCore.App - 3.0.0-preview7-27816-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27816-03 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0250627ab..08be3c53b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup c36106d9b5fdcd198041b1c77dac0bd8cd485f98 - + https://github.com/dotnet/core-setup c36106d9b5fdcd198041b1c77dac0bd8cd485f98 - + https://github.com/dotnet/core-setup c36106d9b5fdcd198041b1c77dac0bd8cd485f98 diff --git a/eng/Versions.props b/eng/Versions.props index c5557c02d..12f7bc2ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19316.1 - 3.0.0-preview7-27816-02 + 3.0.0-preview7-27816-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27816-02 + 2.1.0-preview7-27816-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27816-02 + 3.0.0-preview7-27816-03 $(MicrosoftWindowsDesktopAppPackageVersion) From aafcce302b000e6213d5bdca7c103bd21d164293 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2019 04:47:34 +0000 Subject: [PATCH 222/471] Update dependencies from https://github.com/dotnet/core-setup build 20190616.04 (#2489) - NETStandard.Library.Ref - 2.1.0-preview7-27816-04 - Microsoft.NETCore.App - 3.0.0-preview7-27816-04 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27816-04 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08be3c53b..3b2a5c0f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup c36106d9b5fdcd198041b1c77dac0bd8cd485f98 - + https://github.com/dotnet/core-setup c36106d9b5fdcd198041b1c77dac0bd8cd485f98 - + https://github.com/dotnet/core-setup c36106d9b5fdcd198041b1c77dac0bd8cd485f98 diff --git a/eng/Versions.props b/eng/Versions.props index 12f7bc2ac..3b761f23e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19316.1 - 3.0.0-preview7-27816-03 + 3.0.0-preview7-27816-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27816-03 + 2.1.0-preview7-27816-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27816-03 + 3.0.0-preview7-27816-04 $(MicrosoftWindowsDesktopAppPackageVersion) From 259d07f645d1aa322db05a66448468de4b18fd57 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Mon, 17 Jun 2019 12:07:20 +0000 Subject: [PATCH 223/471] Update dependencies from https://github.com/dotnet/templating build 20190616.1 - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19316.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b2a5c0f1..4612e0d67 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore 1521e6fa727370ad9d25478b1c32172ef6942cb3 - + https://github.com/dotnet/templating - c561d7deb8e1a7ff7a73d0fd5abec8556dae922b + 88feb5983d2b7bce61bcf8dff10ba74231f876f6 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 3b761f23e..83dc48259 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19316.1 - 1.0.2-beta5.19315.1 + 1.0.2-beta5.19316.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From b716d3b52a214f8c0673c6e4c5ee79b552590e22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2019 14:08:36 +0000 Subject: [PATCH 224/471] Update dependencies from https://github.com/dotnet/toolset build 20190617.1 (#2492) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19317.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b2a5c0f1..ffa518c0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating c561d7deb8e1a7ff7a73d0fd5abec8556dae922b - + https://github.com/dotnet/toolset - 8a84e3ee39504e4db0eab76ed994d3825a23614f + 2d4a067b374c97dba1d45896b5e7aae709384f74 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 3b761f23e..610225f10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19316.5 + 3.0.100-preview7.19317.1 From d0ebbcc1e41b0aaa6226e969ff8f7bd8f5921b11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2019 16:36:02 +0000 Subject: [PATCH 225/471] [master] Update dependencies from dotnet/core-setup (#2490) * Update dependencies from https://github.com/dotnet/core-setup build 20190617.01 - NETStandard.Library.Ref - 2.1.0-preview7-27817-01 - Microsoft.NETCore.App - 3.0.0-preview7-27817-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27817-01 * Update dependencies from https://github.com/dotnet/core-setup build 20190617.02 - NETStandard.Library.Ref - 2.1.0-preview7-27817-02 - Microsoft.NETCore.App - 3.0.0-preview7-27817-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27817-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffa518c0a..a7af78b50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - c36106d9b5fdcd198041b1c77dac0bd8cd485f98 + 74e62c50dbf559ba0dc8e2b1d5893309c2f058a4 - + https://github.com/dotnet/core-setup - c36106d9b5fdcd198041b1c77dac0bd8cd485f98 + 74e62c50dbf559ba0dc8e2b1d5893309c2f058a4 - + https://github.com/dotnet/core-setup - c36106d9b5fdcd198041b1c77dac0bd8cd485f98 + 74e62c50dbf559ba0dc8e2b1d5893309c2f058a4 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 610225f10..eed0d3dc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19316.1 - 3.0.0-preview7-27816-04 + 3.0.0-preview7-27817-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27816-04 + 2.1.0-preview7-27817-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27816-04 + 3.0.0-preview7-27817-02 $(MicrosoftWindowsDesktopAppPackageVersion) From e3e62f92953d8808009a5481805d82399563a91a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2019 17:36:22 +0000 Subject: [PATCH 226/471] Update dependencies from https://github.com/dotnet/toolset build 20190617.2 (#2493) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19317.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7af78b50..a44fe7890 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating c561d7deb8e1a7ff7a73d0fd5abec8556dae922b - + https://github.com/dotnet/toolset - 2d4a067b374c97dba1d45896b5e7aae709384f74 + d47f458e31fce51bb9cf06490702c98d88042984 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index eed0d3dc2..ca0502f12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19317.1 + 3.0.100-preview7.19317.2 From 290ab83e1b640ccb6acc957801efbd56889f0ab6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2019 18:17:56 +0000 Subject: [PATCH 227/471] Update dependencies from https://github.com/dotnet/core-setup build 20190617.03 (#2494) - NETStandard.Library.Ref - 2.1.0-preview7-27817-03 - Microsoft.NETCore.App - 3.0.0-preview7-27817-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27817-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a44fe7890..69fda2511 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 74e62c50dbf559ba0dc8e2b1d5893309c2f058a4 + 499b95322ae3a8e29af2a2aacdfb332c4e25dfcf - + https://github.com/dotnet/core-setup - 74e62c50dbf559ba0dc8e2b1d5893309c2f058a4 + 499b95322ae3a8e29af2a2aacdfb332c4e25dfcf - + https://github.com/dotnet/core-setup - 74e62c50dbf559ba0dc8e2b1d5893309c2f058a4 + 499b95322ae3a8e29af2a2aacdfb332c4e25dfcf https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index ca0502f12..93c1fb05e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19316.1 - 3.0.0-preview7-27817-02 + 3.0.0-preview7-27817-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27817-02 + 2.1.0-preview7-27817-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27817-02 + 3.0.0-preview7-27817-03 $(MicrosoftWindowsDesktopAppPackageVersion) From e4026bb5e294b2a2a83be10b01fe4f296824f3b6 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Mon, 17 Jun 2019 20:03:05 +0000 Subject: [PATCH 228/471] Update dependencies from https://github.com/dotnet/sdk build 20190617.2 - Microsoft.NET.Sdk - 3.0.100-preview7.19317.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f345cbb8..588f316f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset d47f458e31fce51bb9cf06490702c98d88042984 - + https://github.com/dotnet/sdk - 77d6311a5dd7e519e6b496e97e93085bf2d3beb4 + a604702d687ad3ccdc5e0be45300588921cd7a51 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 5cc4e0538..3fdfd0182 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19316.1 + 3.0.100-preview7.19317.2 3.0.0-preview7-27817-03 From ec6aa4db78643aaaa891c4301f636ef79db8a301 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2019 21:46:48 +0000 Subject: [PATCH 229/471] Update dependencies from https://github.com/dotnet/cli build 20190617.3 (#2495) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19317.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f345cbb8..cf775983e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 77d6311a5dd7e519e6b496e97e93085bf2d3beb4 - + https://github.com/dotnet/cli - 4a953af0146b0b4aa0f4de174958e97de2124713 + f73cb901a1d1127b7bef2614a543ffce4b01b11b diff --git a/eng/Versions.props b/eng/Versions.props index 5cc4e0538..4d6501443 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19316.1 + 3.0.100-preview7.19317.3 1.0.2-beta5.19316.1 From d1f024794293f8a334e316bcde4c91aae6583e8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2019 22:05:28 +0000 Subject: [PATCH 230/471] Update dependencies from https://github.com/dotnet/cli build 20190617.4 (#2497) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19317.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf775983e..83e6525d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 77d6311a5dd7e519e6b496e97e93085bf2d3beb4 - + https://github.com/dotnet/cli - f73cb901a1d1127b7bef2614a543ffce4b01b11b + ac2e5fabc03a91d1c571bbaa754a5cf465a3cd0a diff --git a/eng/Versions.props b/eng/Versions.props index 4d6501443..e41006500 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19317.3 + 3.0.100-preview7.19317.4 1.0.2-beta5.19316.1 From 1cd2651f864508d5f610a66985fe21e118002e4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2019 23:29:38 +0000 Subject: [PATCH 231/471] Update dependencies from https://github.com/dotnet/toolset build 20190617.3 (#2498) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19317.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83e6525d3..8fc8afdb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 88feb5983d2b7bce61bcf8dff10ba74231f876f6 - + https://github.com/dotnet/toolset - d47f458e31fce51bb9cf06490702c98d88042984 + bde7d4e4c905eb7315825b4093567044a055d5a5 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e41006500..d68f6e85b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19317.2 + 3.0.100-preview7.19317.3 From d2ddaeffad32d2f4be1a86fde96d6cf074d20dad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jun 2019 23:45:04 +0000 Subject: [PATCH 232/471] Update dependencies from https://github.com/dotnet/toolset build 20190617.4 (#2499) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19317.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fc8afdb8..27843530a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 88feb5983d2b7bce61bcf8dff10ba74231f876f6 - + https://github.com/dotnet/toolset - bde7d4e4c905eb7315825b4093567044a055d5a5 + 1830775ea083bdbdb87f03152b53bad8e591f00c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d68f6e85b..61aa1f8b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19317.3 + 3.0.100-preview7.19317.4 From 9203327b4033200b95108311c59119aa79991d96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2019 06:34:50 +0000 Subject: [PATCH 233/471] Update dependencies from https://github.com/dotnet/core-setup build 20190617.07 (#2502) - NETStandard.Library.Ref - 2.1.0-preview7-27817-07 - Microsoft.NETCore.App - 3.0.0-preview7-27817-07 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27817-07 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19314.2 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19315.2 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27843530a..0f428183f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 499b95322ae3a8e29af2a2aacdfb332c4e25dfcf + 108ec6d71006012123b5f39c22c53fa2ad2548d4 - + https://github.com/dotnet/core-setup - 499b95322ae3a8e29af2a2aacdfb332c4e25dfcf + 108ec6d71006012123b5f39c22c53fa2ad2548d4 - + https://github.com/dotnet/core-setup - 499b95322ae3a8e29af2a2aacdfb332c4e25dfcf + 108ec6d71006012123b5f39c22c53fa2ad2548d4 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ ac2e5fabc03a91d1c571bbaa754a5cf465a3cd0a - + https://github.com/dotnet/winforms - 23e72e7957ec6b24943ab82a78bfee5b6531a55b + 71ad33c75df7354a51b7dd854d0b34eebbceb23e - + https://github.com/dotnet/wpf - 6491806e6bf1bff3483b1eb36cd26b53a2a8eab0 + ff8252004193ae9612f28fedf114f024659e371b diff --git a/eng/Versions.props b/eng/Versions.props index 61aa1f8b4..ab8479e8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19313.1 + 4.8.0-preview7.19314.2 - 3.0.0-preview7.19314.11 + 3.0.0-preview7.19315.2 @@ -47,7 +47,7 @@ 3.0.100-preview7.19316.1 - 3.0.0-preview7-27817-03 + 3.0.0-preview7-27817-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27817-03 + 2.1.0-preview7-27817-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27817-03 + 3.0.0-preview7-27817-07 $(MicrosoftWindowsDesktopAppPackageVersion) From c3f47d72b79251cdecd8573dbbee4846b9f46db4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2019 08:14:56 +0000 Subject: [PATCH 234/471] Update dependencies from https://github.com/dotnet/core-setup build 20190617.08 (#2503) - NETStandard.Library.Ref - 2.1.0-preview7-27817-08 - Microsoft.NETCore.App - 3.0.0-preview7-27817-08 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27817-08 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f428183f..da3180457 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 108ec6d71006012123b5f39c22c53fa2ad2548d4 + cc728f954d3466abfe9f9a7c0b05b925c0fec58b - + https://github.com/dotnet/core-setup - 108ec6d71006012123b5f39c22c53fa2ad2548d4 + cc728f954d3466abfe9f9a7c0b05b925c0fec58b - + https://github.com/dotnet/core-setup - 108ec6d71006012123b5f39c22c53fa2ad2548d4 + cc728f954d3466abfe9f9a7c0b05b925c0fec58b https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index ab8479e8f..624ddf9b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19316.1 - 3.0.0-preview7-27817-07 + 3.0.0-preview7-27817-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27817-07 + 2.1.0-preview7-27817-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27817-07 + 3.0.0-preview7-27817-08 $(MicrosoftWindowsDesktopAppPackageVersion) From fbea88ddbff8da0f4ae288858fbeadf070844d29 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2019 09:57:21 +0000 Subject: [PATCH 235/471] Update dependencies from https://github.com/dotnet/core-setup build 20190618.01 (#2504) - NETStandard.Library.Ref - 2.1.0-preview7-27818-01 - Microsoft.NETCore.App - 3.0.0-preview7-27818-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27818-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da3180457..a7689b115 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - cc728f954d3466abfe9f9a7c0b05b925c0fec58b + 52f975659b158fda7a2fea776e2af093afb72956 - + https://github.com/dotnet/core-setup - cc728f954d3466abfe9f9a7c0b05b925c0fec58b + 52f975659b158fda7a2fea776e2af093afb72956 - + https://github.com/dotnet/core-setup - cc728f954d3466abfe9f9a7c0b05b925c0fec58b + 52f975659b158fda7a2fea776e2af093afb72956 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 624ddf9b2..df75e3acd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19316.1 - 3.0.0-preview7-27817-08 + 3.0.0-preview7-27818-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27817-08 + 2.1.0-preview7-27818-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27817-08 + 3.0.0-preview7-27818-01 $(MicrosoftWindowsDesktopAppPackageVersion) From a75d5df7a339b8dbe427cfc2b1b70f75b93fdc2e Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 18 Jun 2019 12:12:04 +0000 Subject: [PATCH 236/471] Update dependencies from https://github.com/dotnet/arcade build 20190618.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19318.2 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/job/publish-build-assets.yml | 1 - .../templates/post-build/channels/public-dev-release.yml | 3 +-- .../post-build/channels/public-validation-release.yml | 3 +-- global.json | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d1dc5085..279e52817 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ - + https://github.com/dotnet/arcade - aa4285be7fab64e2b6e62e4d5688ea50931c407c + dc538a29793fd56618d0fa3186e2388d47d00c19 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 619ec68aa..014422168 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -57,7 +57,6 @@ jobs: /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) - /v:detailed condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - task: powershell@2 diff --git a/eng/common/templates/post-build/channels/public-dev-release.yml b/eng/common/templates/post-build/channels/public-dev-release.yml index b332cb517..c61eaa927 100644 --- a/eng/common/templates/post-build/channels/public-dev-release.yml +++ b/eng/common/templates/post-build/channels/public-dev-release.yml @@ -138,8 +138,7 @@ stages: inputs: targetType: inline script: | - darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) - continueOnError: true + darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location - template: ../promote-build.yml parameters: diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml index 0b9719da8..23725c6d6 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -84,8 +84,7 @@ stages: inputs: targetType: inline script: | - darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com --password $(MaestroAccessToken) - continueOnError: true + darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com --password $(MaestroAccessToken) --latest-location - template: ../promote-build.yml parameters: diff --git a/global.json b/global.json index c2cbb5898..64a602c7c 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19315.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19318.2" } } From daece02420676bdb45844e1110c9f74cf2f86205 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2019 12:34:59 +0000 Subject: [PATCH 237/471] Update dependencies from https://github.com/dotnet/toolset build 20190618.1 (#2506) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19318.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7689b115..34c19abf2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 88feb5983d2b7bce61bcf8dff10ba74231f876f6 - + https://github.com/dotnet/toolset - 1830775ea083bdbdb87f03152b53bad8e591f00c + 938779d2311cd303744a2ec5008aae6bf9ca2344 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index df75e3acd..7c3f4f883 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19317.4 + 3.0.100-preview7.19318.1 From 79d8c23f08d4400c8593339c7d90b72c74aff7fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2019 12:52:37 +0000 Subject: [PATCH 238/471] [master] Update dependencies from dotnet/toolset (#2507) * Update dependencies from https://github.com/dotnet/toolset build 20190618.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19318.2 * Update dependencies from https://github.com/dotnet/toolset build 20190618.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19318.3 * Update dependencies from https://github.com/dotnet/toolset build 20190618.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19318.4 * Update dependencies from https://github.com/dotnet/toolset build 20190618.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19318.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34c19abf2..01b1e973e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 88feb5983d2b7bce61bcf8dff10ba74231f876f6 - + https://github.com/dotnet/toolset - 938779d2311cd303744a2ec5008aae6bf9ca2344 + 7dd654df4e8d191ffb9a8c24635d8bac7b1e52fe https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7c3f4f883..1969e4869 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19318.1 + 3.0.100-preview7.19318.5 From 6efd2d05c92c31cc701d4f2197be953e211e986b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2019 13:27:33 +0000 Subject: [PATCH 239/471] [master] Update dependencies from dotnet/cli (#2501) * Update dependencies from https://github.com/dotnet/cli build 20190617.5 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19317.5 * Update dependencies from https://github.com/dotnet/cli build 20190618.1 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19318.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01b1e973e..9694ad4ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 77d6311a5dd7e519e6b496e97e93085bf2d3beb4 - + https://github.com/dotnet/cli - ac2e5fabc03a91d1c571bbaa754a5cf465a3cd0a + 038d3d6cc275b189add510639bfd1bf58e52eabe diff --git a/eng/Versions.props b/eng/Versions.props index 1969e4869..1e59f02e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19317.4 + 3.0.100-preview7.19318.1 1.0.2-beta5.19316.1 From 8b8e28c7460fbe3540e6a95c8c34cc5618b08981 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2019 13:29:13 +0000 Subject: [PATCH 240/471] Update dependencies from https://github.com/dotnet/toolset build 20190618.6 (#2508) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19318.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9694ad4ba..8b559f19f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 88feb5983d2b7bce61bcf8dff10ba74231f876f6 - + https://github.com/dotnet/toolset - 7dd654df4e8d191ffb9a8c24635d8bac7b1e52fe + 50dfa6dc4362deed5bd911aab9927e5922e7e961 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 1e59f02e7..39bca601b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19318.5 + 3.0.100-preview7.19318.6 From 945767a2a2efb7f9ec9872031516f1d6aba09981 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 18 Jun 2019 06:49:09 -0700 Subject: [PATCH 241/471] Addressing VS signing errors. (#2500) --- src/redist/targets/Signing.targets | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets index 7b4fd5a32..0e39f28d5 100644 --- a/src/redist/targets/Signing.targets +++ b/src/redist/targets/Signing.targets @@ -120,27 +120,6 @@ %(CertificateName) - - - - - - - - - - - - - - - - - - - - - Date: Tue, 18 Jun 2019 14:47:58 +0000 Subject: [PATCH 242/471] [master] Update dependencies from dotnet/core-setup (#2505) * Update dependencies from https://github.com/dotnet/core-setup build 20190618.02 - NETStandard.Library.Ref - 2.1.0-preview7-27818-02 - Microsoft.NETCore.App - 3.0.0-preview7-27818-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27818-02 * Update dependencies from https://github.com/dotnet/core-setup build 20190618.03 - NETStandard.Library.Ref - 2.1.0-preview7-27818-03 - Microsoft.NETCore.App - 3.0.0-preview7-27818-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27818-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b559f19f..1706279e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 52f975659b158fda7a2fea776e2af093afb72956 + c663963077b6040ae25924ce57aa9ea5cf116597 - + https://github.com/dotnet/core-setup - 52f975659b158fda7a2fea776e2af093afb72956 + c663963077b6040ae25924ce57aa9ea5cf116597 - + https://github.com/dotnet/core-setup - 52f975659b158fda7a2fea776e2af093afb72956 + c663963077b6040ae25924ce57aa9ea5cf116597 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 39bca601b..4aad560f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19316.1 - 3.0.0-preview7-27818-01 + 3.0.0-preview7-27818-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27818-01 + 2.1.0-preview7-27818-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27818-01 + 3.0.0-preview7-27818-03 $(MicrosoftWindowsDesktopAppPackageVersion) From 920d8ba97cc94660651dbbbba621ab2c01f1f35b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2019 16:27:36 +0000 Subject: [PATCH 243/471] [master] Update dependencies from dotnet/core-setup (#2509) * Update dependencies from https://github.com/dotnet/core-setup build 20190618.04 - NETStandard.Library.Ref - 2.1.0-preview7-27818-04 - Microsoft.NETCore.App - 3.0.0-preview7-27818-04 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27818-04 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19315.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19316.3 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190618.05 - NETStandard.Library.Ref - 2.1.0-preview7-27818-05 - Microsoft.NETCore.App - 3.0.0-preview7-27818-05 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27818-05 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19315.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19316.3 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1706279e1..467dad238 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - c663963077b6040ae25924ce57aa9ea5cf116597 + 521f511254af16a0410fc2c7feb7ae9ae6ef15cb - + https://github.com/dotnet/core-setup - c663963077b6040ae25924ce57aa9ea5cf116597 + 521f511254af16a0410fc2c7feb7ae9ae6ef15cb - + https://github.com/dotnet/core-setup - c663963077b6040ae25924ce57aa9ea5cf116597 + 521f511254af16a0410fc2c7feb7ae9ae6ef15cb https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 038d3d6cc275b189add510639bfd1bf58e52eabe - + https://github.com/dotnet/winforms - 71ad33c75df7354a51b7dd854d0b34eebbceb23e + a446ca927d3ad4f9e6baa6544822eb1321655f85 - + https://github.com/dotnet/wpf - ff8252004193ae9612f28fedf114f024659e371b + 308512f9ef2407b26baa7f3a266b278f4ff3c643 diff --git a/eng/Versions.props b/eng/Versions.props index 4aad560f6..4e96510ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19314.2 + 4.8.0-preview7.19315.1 - 3.0.0-preview7.19315.2 + 3.0.0-preview7.19316.3 @@ -47,7 +47,7 @@ 3.0.100-preview7.19316.1 - 3.0.0-preview7-27818-03 + 3.0.0-preview7-27818-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27818-03 + 2.1.0-preview7-27818-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27818-03 + 3.0.0-preview7-27818-05 $(MicrosoftWindowsDesktopAppPackageVersion) From f35007d2e676c5f590b20219005ee36877cb429a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2019 18:30:36 +0000 Subject: [PATCH 244/471] Update dependencies from https://github.com/dotnet/toolset build 20190618.7 (#2510) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19318.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 179366cbf..1a38d5548 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 88feb5983d2b7bce61bcf8dff10ba74231f876f6 - + https://github.com/dotnet/toolset - 50dfa6dc4362deed5bd911aab9927e5922e7e961 + fc5ac9cd4db6bdb15d26384574eb47bf84bb8594 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f62a6774f..74aec718c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19318.6 + 3.0.100-preview7.19318.7 From 12d04673311e9540fdd908425797862b07acbfe5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2019 20:14:50 +0000 Subject: [PATCH 245/471] Update dependencies from https://github.com/dotnet/sdk build 20190618.1 (#2511) - Microsoft.NET.Sdk - 3.0.100-preview7.19318.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a38d5548..88bb44ffd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset fc5ac9cd4db6bdb15d26384574eb47bf84bb8594 - + https://github.com/dotnet/sdk - a604702d687ad3ccdc5e0be45300588921cd7a51 + 46917a9b622ea05377dc438db9f6b6e184bd3d83 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 74aec718c..a9cd7c50d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19317.2 + 3.0.100-preview7.19318.1 3.0.0-preview7-27818-05 From 12ca3418e56d01a81a91a7c6c28d879976de91cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2019 21:17:24 +0000 Subject: [PATCH 246/471] Update dependencies from https://github.com/dotnet/core-setup build 20190618.07 (#2512) - NETStandard.Library.Ref - 2.1.0-preview7-27818-07 - Microsoft.NETCore.App - 3.0.0-preview7-27818-07 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27818-07 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88bb44ffd..c03afad37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 521f511254af16a0410fc2c7feb7ae9ae6ef15cb + 0298b805eaa286192865be92ec351e7a74b177af - + https://github.com/dotnet/core-setup - 521f511254af16a0410fc2c7feb7ae9ae6ef15cb + 0298b805eaa286192865be92ec351e7a74b177af - + https://github.com/dotnet/core-setup - 521f511254af16a0410fc2c7feb7ae9ae6ef15cb + 0298b805eaa286192865be92ec351e7a74b177af https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index a9cd7c50d..ac6bfc3c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19318.1 - 3.0.0-preview7-27818-05 + 3.0.0-preview7-27818-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27818-05 + 2.1.0-preview7-27818-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27818-05 + 3.0.0-preview7-27818-07 $(MicrosoftWindowsDesktopAppPackageVersion) From 861a83a261b1ffb9ef0f87dad30fc3340c036d35 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2019 22:36:33 +0000 Subject: [PATCH 247/471] Update dependencies from https://github.com/dotnet/core-setup build 20190618.08 (#2514) - NETStandard.Library.Ref - 2.1.0-preview7-27818-08 - Microsoft.NETCore.App - 3.0.0-preview7-27818-08 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27818-08 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c03afad37..e346d99c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 0298b805eaa286192865be92ec351e7a74b177af + e22fbbe415e7b2985e4bae8a1bf386934872f4cb - + https://github.com/dotnet/core-setup - 0298b805eaa286192865be92ec351e7a74b177af + e22fbbe415e7b2985e4bae8a1bf386934872f4cb - + https://github.com/dotnet/core-setup - 0298b805eaa286192865be92ec351e7a74b177af + e22fbbe415e7b2985e4bae8a1bf386934872f4cb https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index ac6bfc3c9..6733b7dd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19318.1 - 3.0.0-preview7-27818-07 + 3.0.0-preview7-27818-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27818-07 + 2.1.0-preview7-27818-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27818-07 + 3.0.0-preview7-27818-08 $(MicrosoftWindowsDesktopAppPackageVersion) From 2173783302101d0220d24ef31137c08492a9b856 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 18 Jun 2019 16:26:32 -0700 Subject: [PATCH 248/471] Delete duplicated tests Fixes #21 These scenarios should be covered by GivenSelfContainedAppsRollForward, it looks like the fact they were here may have been a bad merge. --- .../GivenAspNetAppsResolveImplicitVersions.cs | 235 ------------------ 1 file changed, 235 deletions(-) delete mode 100644 test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs diff --git a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs deleted file mode 100644 index f4443cf96..000000000 --- a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs +++ /dev/null @@ -1,235 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using FluentAssertions; -using Microsoft.DotNet.TestFramework; -using Microsoft.DotNet.Tools.Test.Utilities; -using NuGet.ProjectModel; -using NuGet.Versioning; -using Xunit; - -namespace EndToEnd -{ - public class GivenAspNetAppsResolveImplicitVersions : TestBase - { - private const string AspNetTestProject = "TestWebAppSimple"; - - [Fact(Skip ="https://github.com/dotnet/core-sdk/issues/21")] - public void PortablePublishWithLatestTFMUsesBundledAspNetCoreAppVersion() - { - var _testInstance = TestAssets.Get(AspNetTestProject) - .CreateInstance(identifier: LatestSupportedAspNetCoreAppVersion) - .WithSourceFiles(); - - string projectDirectory = _testInstance.Root.FullName; - string projectPath = Path.Combine(projectDirectory, $"{AspNetTestProject}.csproj"); - - var project = XDocument.Load(projectPath); - var ns = project.Root.Name.Namespace; - - // Update TargetFramework to the right version of .NET Core - project.Root.Element(ns + "PropertyGroup") - .Element(ns + "TargetFramework") - .Value = "netcoreapp" + LatestSupportedAspNetCoreAppVersion; - - project.Save(projectPath); - - // Get the implicit version - new RestoreCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("/bl:restore.binlog") - .Should().Pass(); - - var assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json"); - var assetsFile = new LockFileFormat().Read(assetsFilePath); - - var restoredVersion = GetAspNetCoreAppVersion(assetsFile, portable: true); - restoredVersion.Should().NotBeNull(); - - var bundledVersionPath = Path.Combine(projectDirectory, ".BundledAspNetCoreVersion"); - var bundledVersion = File.ReadAllText(bundledVersionPath).Trim(); - - restoredVersion.ToNormalizedString().Should().BeEquivalentTo(bundledVersion, - "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be identical to the versions generated." + - "Please update MSBuildExtensions.targets in this repo so these versions match."); - } - - [Fact(Skip = "https://github.com/dotnet/core-sdk/issues/21")] - public void StandalonePublishWithLatestTFMUsesBundledAspNetCoreAppVersion() - { - var _testInstance = TestAssets.Get(AspNetTestProject) - .CreateInstance(identifier: LatestSupportedAspNetCoreAppVersion) - .WithSourceFiles(); - - string projectDirectory = _testInstance.Root.FullName; - string projectPath = Path.Combine(projectDirectory, $"{AspNetTestProject}.csproj"); - - var project = XDocument.Load(projectPath); - var ns = project.Root.Name.Namespace; - - // Update TargetFramework to the right version of .NET Core - project.Root.Element(ns + "PropertyGroup") - .Element(ns + "TargetFramework") - .Value = "netcoreapp" + LatestSupportedAspNetCoreAppVersion; - - var rid = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier(); - - // Set RuntimeIdentifier to simulate standalone publish - project.Root.Element(ns + "PropertyGroup") - .Add(new XElement(ns + "RuntimeIdentifier", rid)); - - project.Save(projectPath); - - // Get the implicit version - new RestoreCommand() - .WithWorkingDirectory(projectDirectory) - .Execute() - .Should().Pass(); - - var assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json"); - var assetsFile = new LockFileFormat().Read(assetsFilePath); - - var restoredVersion = GetAspNetCoreAppVersion(assetsFile); - restoredVersion.Should().NotBeNull(); - - var bundledVersionPath = Path.Combine(projectDirectory, ".BundledAspNetCoreVersion"); - var bundledVersion = File.ReadAllText(bundledVersionPath).Trim(); - - restoredVersion.ToNormalizedString().Should().BeEquivalentTo(bundledVersion, - "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be identical to the versions set in DependencyVersions.props." + - "Please update MSBuildExtensions.targets in this repo so these versions match."); - } - - [Theory] - [MemberData(nameof(SupportedAspNetCoreAppVersions))] - public void ItRollsForwardToTheLatestVersion(string minorVersion) - { - if (minorVersion == "3.0") - { - // https://github.com/dotnet/core-sdk/issues/621 - return; - } - - var testProjectCreator = new TestProjectCreator(identifier: minorVersion) - { - PackageName = TestProjectCreator.AspNetCoreAppPackageName, - MinorVersion = minorVersion , - }; - - var _testInstance = testProjectCreator.Create() - .WithSourceFiles(); - - string projectDirectory = _testInstance.Root.FullName; - - string projectPath = Path.Combine(projectDirectory, $"TestAppSimple.csproj"); - - var project = XDocument.Load(projectPath); - var ns = project.Root.Name.Namespace; - - // Update TargetFramework to the right version of .NET Core - project.Root.Element(ns + "PropertyGroup") - .Element(ns + "TargetFramework") - .Value = "netcoreapp" + minorVersion; - - var rid = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier(); - - // Set RuntimeIdentifier to opt in to roll-forward behavior - project.Root.Element(ns + "PropertyGroup") - .Add(new XElement(ns + "RuntimeIdentifier", rid)); - - project.Save(projectPath); - - // Get the version rolled forward to - new RestoreCommand() - .WithWorkingDirectory(projectDirectory) - .Execute() - .Should().Pass(); - - string assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json"); - var assetsFile = new LockFileFormat().Read(assetsFilePath); - - var rolledForwardVersion = GetAspNetCoreAppVersion(assetsFile); - rolledForwardVersion.Should().NotBeNull(); - - if (rolledForwardVersion.IsPrerelease) - { - // If this version of .NET Core is still prerelease, then: - // - Floating the patch by adding ".*" to the major.minor version won't work, but - // - There aren't any patches to roll-forward to, so we skip testing this until the version - // leaves prerelease. - return; - } - - // Float the RuntimeFrameworkVersion to get the latest version of the runtime available from feeds - Directory.Delete(Path.Combine(projectDirectory, "obj"), true); - project.Root.Element(ns + "PropertyGroup") - .Add(new XElement(ns + "RuntimeFrameworkVersion", $"{minorVersion}.*")); - project.Save(projectPath); - - new RestoreCommand() - .WithWorkingDirectory(projectDirectory) - .Execute() - .Should().Pass(); - - var floatedAssetsFile = new LockFileFormat().Read(assetsFilePath); - - var floatedVersion = GetAspNetCoreAppVersion(floatedAssetsFile); - floatedVersion.Should().NotBeNull(); - - rolledForwardVersion.ToNormalizedString().Should().BeEquivalentTo(floatedVersion.ToNormalizedString(), - "the latest patch version properties in Microsoft.NETCoreSdk.BundledVersions.props need to be updated " + - "(see MSBuildExtensions.targets in this repo)"); - } - - [Fact] - public void WeCoverLatestAspNetCoreAppRollForward() - { - var directory = TestAssets.CreateTestDirectory(); - string projectDirectory = directory.FullName; - - // Run "dotnet new web", get TargetFramework property, and make sure it's covered in SupportedAspNetCoreAppVersions - - new NewCommandShim() - .WithWorkingDirectory(projectDirectory) - .Execute("web --no-restore") - .Should().Pass(); - - string projectPath = Path.Combine(projectDirectory, Path.GetFileName(projectDirectory) + ".csproj"); - - var project = XDocument.Load(projectPath); - var ns = project.Root.Name.Namespace; - - string targetFramework = project.Root.Element(ns + "PropertyGroup") - .Element(ns + "TargetFramework") - .Value; - - SupportedAspNetCoreAppVersions.Select(v => $"netcoreapp{v[0]}") - .Should().Contain(targetFramework, $"the {nameof(SupportedAspNetCoreAppVersions)} property should include the default version " + - "of Microsoft.AspNetCore.App used by the templates created by \"dotnet new web\""); - - } - - private NuGetVersion GetAspNetCoreAppVersion(LockFile lockFile, bool portable = false) - { - return lockFile?.Targets?.SingleOrDefault(t => portable == (t.RuntimeIdentifier == null)) - ?.Libraries?.SingleOrDefault(l => - string.Compare(l.Name, "Microsoft.AspNetCore.App", StringComparison.CurrentCultureIgnoreCase) == 0) - ?.Version; - } - - public static string LatestSupportedAspNetCoreAppVersion = "3.0"; - - public static IEnumerable SupportedAspNetCoreAppVersions - { - get - { - yield return new object[] { "2.1" }; - // https://github.com/dotnet/core-sdk/issues/780 - // yield return new object[] { "2.2" }; - yield return new object[] { LatestSupportedAspNetCoreAppVersion }; - } - } - } -} From f8126a6b0223edc0353467c0cb2cbaa72259dbcc Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 18 Jun 2019 16:26:57 -0700 Subject: [PATCH 249/471] Re-enable .NET Core 2.2 tests Fixes #780 --- test/EndToEnd/SupportedNetCoreAppVersions.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/EndToEnd/SupportedNetCoreAppVersions.cs b/test/EndToEnd/SupportedNetCoreAppVersions.cs index 593396c51..6c9adff95 100644 --- a/test/EndToEnd/SupportedNetCoreAppVersions.cs +++ b/test/EndToEnd/SupportedNetCoreAppVersions.cs @@ -20,8 +20,7 @@ namespace EndToEnd "1.1", "2.0", "2.1", - // https://github.com/dotnet/core-sdk/issues/780 - // "2.2", + "2.2", "3.0" }; } From eb29f40037e12872feadee0f269e463425f621e1 Mon Sep 17 00:00:00 2001 From: Parallels Date: Tue, 18 Jun 2019 16:38:26 -0700 Subject: [PATCH 250/471] Fixing the property we use in the DotnetDebTool to get the path to a stage0 dotnet. --- src/redist/targets/GenerateDebs.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateDebs.targets b/src/redist/targets/GenerateDebs.targets index 5b9254aa2..c911132fc 100644 --- a/src/redist/targets/GenerateDebs.targets +++ b/src/redist/targets/GenerateDebs.targets @@ -277,7 +277,7 @@ Mode="u+x" />--> - Date: Wed, 19 Jun 2019 00:19:44 +0000 Subject: [PATCH 251/471] Update dependencies from https://github.com/dotnet/sdk build 20190618.2 (#2516) - Microsoft.NET.Sdk - 3.0.100-preview7.19318.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5f1c9a25..495b3a780 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset fc5ac9cd4db6bdb15d26384574eb47bf84bb8594 - + https://github.com/dotnet/sdk - 46917a9b622ea05377dc438db9f6b6e184bd3d83 + 752d6e5f4d02c81b7ff32c1bde6fa4d3f033c881 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 6733b7dd4..781fd185e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19318.1 + 3.0.100-preview7.19318.2 3.0.0-preview7-27818-08 From 12b29ce67fa3df45f8dc9244edc11f92170059ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 01:41:25 +0000 Subject: [PATCH 252/471] Update dependencies from https://github.com/dotnet/sdk build 20190618.3 (#2518) - Microsoft.NET.Sdk - 3.0.100-preview7.19318.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 495b3a780..4963aebda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset fc5ac9cd4db6bdb15d26384574eb47bf84bb8594 - + https://github.com/dotnet/sdk - 752d6e5f4d02c81b7ff32c1bde6fa4d3f033c881 + 4094dca1091f32f16b5756ef14e6e1f99d67bee3 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 781fd185e..780dcf260 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19318.2 + 3.0.100-preview7.19318.3 3.0.0-preview7-27818-08 From e88d774ea69d35a809025fc6ac0d3c8ce3910e09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 02:37:36 +0000 Subject: [PATCH 253/471] Update dependencies from https://github.com/dotnet/core-setup build 20190618.11 (#2519) - NETStandard.Library.Ref - 2.1.0-preview7-27818-11 - Microsoft.NETCore.App - 3.0.0-preview7-27818-11 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27818-11 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4963aebda..fd4fad044 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - e22fbbe415e7b2985e4bae8a1bf386934872f4cb + 4bbadf25089e3de17e6f3d52c526e324c925713a - + https://github.com/dotnet/core-setup - e22fbbe415e7b2985e4bae8a1bf386934872f4cb + 4bbadf25089e3de17e6f3d52c526e324c925713a - + https://github.com/dotnet/core-setup - e22fbbe415e7b2985e4bae8a1bf386934872f4cb + 4bbadf25089e3de17e6f3d52c526e324c925713a https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 780dcf260..da9664895 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19318.3 - 3.0.0-preview7-27818-08 + 3.0.0-preview7-27818-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27818-08 + 2.1.0-preview7-27818-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27818-08 + 3.0.0-preview7-27818-11 $(MicrosoftWindowsDesktopAppPackageVersion) From 6118cb659beef154b31769be96b9076f2745d2ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 04:36:20 +0000 Subject: [PATCH 254/471] [master] Update dependencies from dotnet/core-setup (#2520) * Update dependencies from https://github.com/dotnet/core-setup build 20190618.12 - NETStandard.Library.Ref - 2.1.0-preview7-27818-12 - Microsoft.NETCore.App - 3.0.0-preview7-27818-12 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27818-12 * Update dependencies from https://github.com/dotnet/core-setup build 20190618.13 - NETStandard.Library.Ref - 2.1.0-preview7-27818-13 - Microsoft.NETCore.App - 3.0.0-preview7-27818-13 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27818-13 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd4fad044..0e7490243 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 4bbadf25089e3de17e6f3d52c526e324c925713a + 1748b45ccb95ada511477ab7c2eea8cc889c6623 - + https://github.com/dotnet/core-setup - 4bbadf25089e3de17e6f3d52c526e324c925713a + 1748b45ccb95ada511477ab7c2eea8cc889c6623 - + https://github.com/dotnet/core-setup - 4bbadf25089e3de17e6f3d52c526e324c925713a + 1748b45ccb95ada511477ab7c2eea8cc889c6623 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index da9664895..bdabda434 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19318.3 - 3.0.0-preview7-27818-11 + 3.0.0-preview7-27818-13 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27818-11 + 2.1.0-preview7-27818-13 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27818-11 + 3.0.0-preview7-27818-13 $(MicrosoftWindowsDesktopAppPackageVersion) From 9280bf88535564629d5a83bbb43d63ddf2e9dce8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 06:14:11 +0000 Subject: [PATCH 255/471] Update dependencies from https://github.com/dotnet/core-setup build 20190618.14 (#2521) - NETStandard.Library.Ref - 2.1.0-preview7-27818-14 - Microsoft.NETCore.App - 3.0.0-preview7-27818-14 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27818-14 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e7490243..7d4a537be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 1748b45ccb95ada511477ab7c2eea8cc889c6623 + 5acee9f7a02d5cfed18a5167cad4453cf04ab5a4 - + https://github.com/dotnet/core-setup - 1748b45ccb95ada511477ab7c2eea8cc889c6623 + 5acee9f7a02d5cfed18a5167cad4453cf04ab5a4 - + https://github.com/dotnet/core-setup - 1748b45ccb95ada511477ab7c2eea8cc889c6623 + 5acee9f7a02d5cfed18a5167cad4453cf04ab5a4 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index bdabda434..e07971c26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19318.3 - 3.0.0-preview7-27818-13 + 3.0.0-preview7-27818-14 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27818-13 + 2.1.0-preview7-27818-14 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27818-13 + 3.0.0-preview7-27818-14 $(MicrosoftWindowsDesktopAppPackageVersion) From 266fb7ecd8d7c5abaa199d2a2412b2b2f6fce938 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 06:46:29 +0000 Subject: [PATCH 256/471] Update dependencies from https://github.com/dotnet/sdk build 20190618.4 (#2522) - Microsoft.NET.Sdk - 3.0.100-preview7.19318.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d4a537be..cd17d797e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset fc5ac9cd4db6bdb15d26384574eb47bf84bb8594 - + https://github.com/dotnet/sdk - 4094dca1091f32f16b5756ef14e6e1f99d67bee3 + 7aa2004792850f672c70181820c86e88b8963992 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index e07971c26..a35ee1585 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19318.3 + 3.0.100-preview7.19318.4 3.0.0-preview7-27818-14 From 386404cbd37a96563ab813b75b625e7621e3f35b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 09:16:12 +0000 Subject: [PATCH 257/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190618.5 (#2523) - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19318.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19318.5 - dotnet-dev-certs - 3.0.0-preview7.19318.5 - dotnet-user-secrets - 3.0.0-preview7.19318.5 - dotnet-watch - 3.0.0-preview7.19318.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19318.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd17d797e..aed3082a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 5acee9f7a02d5cfed18a5167cad4453cf04ab5a4 - + https://github.com/aspnet/AspNetCore - 1521e6fa727370ad9d25478b1c32172ef6942cb3 + 51919cb631f62040506266b46b19bc7a4d241d43 - + https://github.com/aspnet/AspNetCore - 1521e6fa727370ad9d25478b1c32172ef6942cb3 + 51919cb631f62040506266b46b19bc7a4d241d43 - + https://github.com/aspnet/AspNetCore - 1521e6fa727370ad9d25478b1c32172ef6942cb3 + 51919cb631f62040506266b46b19bc7a4d241d43 - + https://github.com/aspnet/AspNetCore - 1521e6fa727370ad9d25478b1c32172ef6942cb3 + 51919cb631f62040506266b46b19bc7a4d241d43 - + https://github.com/aspnet/AspNetCore - 1521e6fa727370ad9d25478b1c32172ef6942cb3 + 51919cb631f62040506266b46b19bc7a4d241d43 - + https://github.com/aspnet/AspNetCore - 1521e6fa727370ad9d25478b1c32172ef6942cb3 + 51919cb631f62040506266b46b19bc7a4d241d43 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index a35ee1585..935e87d76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19315.2 - 3.0.0-preview7.19315.2 - 3.0.0-preview7.19315.2 - 3.0.0-preview7.19315.2 - 3.0.0-preview7.19315.2 - 3.0.0-preview7.19315.2 + 3.0.0-preview7.19318.5 + 3.0.0-preview7.19318.5 + 3.0.0-preview7.19318.5 + 3.0.0-preview7.19318.5 + 3.0.0-preview7.19318.5 + 3.0.0-preview7.19318.5 From dbe3273353ffb89f31831edd95d9f017fdb35c4e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 10:55:26 +0000 Subject: [PATCH 258/471] Update dependencies from https://github.com/dotnet/cli build 20190619.1 (#2524) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19319.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aed3082a1..a3f1f0062 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 7aa2004792850f672c70181820c86e88b8963992 - + https://github.com/dotnet/cli - 038d3d6cc275b189add510639bfd1bf58e52eabe + bc6394c6d57a3509d37d09754339a125f4e3f270 diff --git a/eng/Versions.props b/eng/Versions.props index 935e87d76..6367c0e68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19318.1 + 3.0.100-preview7.19319.1 1.0.2-beta5.19316.1 From c4734cd13af53eee740657f96250de6b2900c51d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 11:07:03 +0000 Subject: [PATCH 259/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190619.1 (#2525) - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19319.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19319.1 - dotnet-dev-certs - 3.0.0-preview7.19319.1 - dotnet-user-secrets - 3.0.0-preview7.19319.1 - dotnet-watch - 3.0.0-preview7.19319.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19319.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3f1f0062..8a654c315 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 5acee9f7a02d5cfed18a5167cad4453cf04ab5a4 - + https://github.com/aspnet/AspNetCore - 51919cb631f62040506266b46b19bc7a4d241d43 + 75c95c56bfc05585d72899a3525374b72c5cd8e5 - + https://github.com/aspnet/AspNetCore - 51919cb631f62040506266b46b19bc7a4d241d43 + 75c95c56bfc05585d72899a3525374b72c5cd8e5 - + https://github.com/aspnet/AspNetCore - 51919cb631f62040506266b46b19bc7a4d241d43 + 75c95c56bfc05585d72899a3525374b72c5cd8e5 - + https://github.com/aspnet/AspNetCore - 51919cb631f62040506266b46b19bc7a4d241d43 + 75c95c56bfc05585d72899a3525374b72c5cd8e5 - + https://github.com/aspnet/AspNetCore - 51919cb631f62040506266b46b19bc7a4d241d43 + 75c95c56bfc05585d72899a3525374b72c5cd8e5 - + https://github.com/aspnet/AspNetCore - 51919cb631f62040506266b46b19bc7a4d241d43 + 75c95c56bfc05585d72899a3525374b72c5cd8e5 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 6367c0e68..66adf229f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19318.5 - 3.0.0-preview7.19318.5 - 3.0.0-preview7.19318.5 - 3.0.0-preview7.19318.5 - 3.0.0-preview7.19318.5 - 3.0.0-preview7.19318.5 + 3.0.0-preview7.19319.1 + 3.0.0-preview7.19319.1 + 3.0.0-preview7.19319.1 + 3.0.0-preview7.19319.1 + 3.0.0-preview7.19319.1 + 3.0.0-preview7.19319.1 From bb5e0d13131dc917f7f90f965c9e7504391854e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 12:11:02 +0000 Subject: [PATCH 260/471] Update dependencies from https://github.com/dotnet/core-setup build 20190619.02 (#2526) - NETStandard.Library.Ref - 2.1.0-preview7-27819-02 - Microsoft.NETCore.App - 3.0.0-preview7-27819-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27819-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a654c315..f182b0c5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 5acee9f7a02d5cfed18a5167cad4453cf04ab5a4 + 5b96a74985ecd8f0390a356538440a69304d5ede - + https://github.com/dotnet/core-setup - 5acee9f7a02d5cfed18a5167cad4453cf04ab5a4 + 5b96a74985ecd8f0390a356538440a69304d5ede - + https://github.com/dotnet/core-setup - 5acee9f7a02d5cfed18a5167cad4453cf04ab5a4 + 5b96a74985ecd8f0390a356538440a69304d5ede https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 66adf229f..668a0cdbd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19318.4 - 3.0.0-preview7-27818-14 + 3.0.0-preview7-27819-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27818-14 + 2.1.0-preview7-27819-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27818-14 + 3.0.0-preview7-27819-02 $(MicrosoftWindowsDesktopAppPackageVersion) From 2832b2f8641ac49bf5a6ba7bc98dc6a3bf46e030 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 12:31:05 +0000 Subject: [PATCH 261/471] Update dependencies from https://github.com/dotnet/templating build 20190618.1 (#2528) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19318.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f182b0c5f..f6e62a3b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore 75c95c56bfc05585d72899a3525374b72c5cd8e5 - + https://github.com/dotnet/templating - 88feb5983d2b7bce61bcf8dff10ba74231f876f6 + 84d778990198681b27f4a9b2eeea6efaeeb431a3 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 668a0cdbd..8d8c75e2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19319.1 - 1.0.2-beta5.19316.1 + 1.0.2-beta5.19318.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From 61b0b28bcd278f705cba8d15b94a2bbe961a874d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 12:40:41 +0000 Subject: [PATCH 262/471] Update dependencies from https://github.com/dotnet/toolset build 20190619.1 (#2529) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19319.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6e62a3b0..705f3a9ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 84d778990198681b27f4a9b2eeea6efaeeb431a3 - + https://github.com/dotnet/toolset - fc5ac9cd4db6bdb15d26384574eb47bf84bb8594 + a4f69ff4505e9aee44b5f49503b9d1d9c11fe417 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 8d8c75e2c..2303c6f38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19318.7 + 3.0.100-preview7.19319.1 From f0dabeef13459eb8850aa23952a84b65eb72f580 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 13:01:55 +0000 Subject: [PATCH 263/471] [master] Update dependencies from dotnet/toolset (#2530) * Update dependencies from https://github.com/dotnet/toolset build 20190619.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19319.2 * Update dependencies from https://github.com/dotnet/toolset build 20190619.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19319.3 * Update dependencies from https://github.com/dotnet/toolset build 20190619.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19319.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 705f3a9ab..787fabdc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 84d778990198681b27f4a9b2eeea6efaeeb431a3 - + https://github.com/dotnet/toolset - a4f69ff4505e9aee44b5f49503b9d1d9c11fe417 + 940b464324c9790aafe2a0a08c30e7bb61e222b5 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2303c6f38..0fb4ff771 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19319.1 + 3.0.100-preview7.19319.4 From 44e1c4a65a366a6349e32cfe5df3785f3c45e3bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 13:40:23 +0000 Subject: [PATCH 264/471] Update dependencies from https://github.com/dotnet/cli build 20190619.2 (#2532) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19319.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 787fabdc7..0690c3359 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 7aa2004792850f672c70181820c86e88b8963992 - + https://github.com/dotnet/cli - bc6394c6d57a3509d37d09754339a125f4e3f270 + 2351ce89e546e51fab098b41e54ce39019b6c4d7 diff --git a/eng/Versions.props b/eng/Versions.props index 0fb4ff771..697c14a0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19319.1 + 3.0.100-preview7.19319.2 1.0.2-beta5.19318.1 From 3968cd0afdf3fb5396f9107588c2aed83be89cfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 13:54:01 +0000 Subject: [PATCH 265/471] Update dependencies from https://github.com/dotnet/toolset build 20190619.6 (#2533) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19319.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0690c3359..fa249eadb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 84d778990198681b27f4a9b2eeea6efaeeb431a3 - + https://github.com/dotnet/toolset - 940b464324c9790aafe2a0a08c30e7bb61e222b5 + 0e48e294ecd191ba6715a030f78c6940b0d481bf https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 697c14a0d..07ad673fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19319.4 + 3.0.100-preview7.19319.6 From 8e2006336f1d6bc7ab2f09a6aa4606f8c608c5ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 15:30:52 +0000 Subject: [PATCH 266/471] Update dependencies from https://github.com/dotnet/core-setup build 20190619.03 (#2535) - NETStandard.Library.Ref - 2.1.0-preview7-27819-03 - Microsoft.NETCore.App - 3.0.0-preview7-27819-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27819-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa249eadb..550457a60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 5b96a74985ecd8f0390a356538440a69304d5ede + ff396e0cab960f35b1e01a24c5170ad96da90082 - + https://github.com/dotnet/core-setup - 5b96a74985ecd8f0390a356538440a69304d5ede + ff396e0cab960f35b1e01a24c5170ad96da90082 - + https://github.com/dotnet/core-setup - 5b96a74985ecd8f0390a356538440a69304d5ede + ff396e0cab960f35b1e01a24c5170ad96da90082 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 07ad673fb..d6b3752c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19318.4 - 3.0.0-preview7-27819-02 + 3.0.0-preview7-27819-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27819-02 + 2.1.0-preview7-27819-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27819-02 + 3.0.0-preview7-27819-03 $(MicrosoftWindowsDesktopAppPackageVersion) From 6ad66060af49f47d8f68963829cf96c947103510 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 18:26:38 +0000 Subject: [PATCH 267/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190619.2 (#2536) - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19319.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19319.2 - dotnet-dev-certs - 3.0.0-preview7.19319.2 - dotnet-user-secrets - 3.0.0-preview7.19319.2 - dotnet-watch - 3.0.0-preview7.19319.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19319.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 550457a60..d32216282 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup ff396e0cab960f35b1e01a24c5170ad96da90082 - + https://github.com/aspnet/AspNetCore - 75c95c56bfc05585d72899a3525374b72c5cd8e5 + 9ea20ddef331b786141b5e52cd03a91bff4c401f - + https://github.com/aspnet/AspNetCore - 75c95c56bfc05585d72899a3525374b72c5cd8e5 + 9ea20ddef331b786141b5e52cd03a91bff4c401f - + https://github.com/aspnet/AspNetCore - 75c95c56bfc05585d72899a3525374b72c5cd8e5 + 9ea20ddef331b786141b5e52cd03a91bff4c401f - + https://github.com/aspnet/AspNetCore - 75c95c56bfc05585d72899a3525374b72c5cd8e5 + 9ea20ddef331b786141b5e52cd03a91bff4c401f - + https://github.com/aspnet/AspNetCore - 75c95c56bfc05585d72899a3525374b72c5cd8e5 + 9ea20ddef331b786141b5e52cd03a91bff4c401f - + https://github.com/aspnet/AspNetCore - 75c95c56bfc05585d72899a3525374b72c5cd8e5 + 9ea20ddef331b786141b5e52cd03a91bff4c401f https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index d6b3752c7..e18185765 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19319.1 - 3.0.0-preview7.19319.1 - 3.0.0-preview7.19319.1 - 3.0.0-preview7.19319.1 - 3.0.0-preview7.19319.1 - 3.0.0-preview7.19319.1 + 3.0.0-preview7.19319.2 + 3.0.0-preview7.19319.2 + 3.0.0-preview7.19319.2 + 3.0.0-preview7.19319.2 + 3.0.0-preview7.19319.2 + 3.0.0-preview7.19319.2 From fcdaaadf52cf968b860f7a68b64f64e1bc9e8a7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 19:35:30 +0000 Subject: [PATCH 268/471] [master] Update dependencies from dotnet/cli (#2534) * Update dependencies from https://github.com/dotnet/cli build 20190619.3 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19319.3 * Update dependencies from https://github.com/dotnet/cli build 20190619.4 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19319.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d32216282..df67ec794 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 7aa2004792850f672c70181820c86e88b8963992 - + https://github.com/dotnet/cli - 2351ce89e546e51fab098b41e54ce39019b6c4d7 + c6cd21a0db2a5647ac8bb28fc934b15935be883f diff --git a/eng/Versions.props b/eng/Versions.props index e18185765..e69a1e391 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19319.2 + 3.0.100-preview7.19319.4 1.0.2-beta5.19318.1 From b81d69f9a7fd5fe5d8d1406fcddb2db8ce86500b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 21:36:02 +0000 Subject: [PATCH 269/471] Update dependencies from https://github.com/dotnet/arcade build 20190619.1 (#2527) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19319.1 --- eng/Version.Details.xml | 4 +- eng/common/PSScriptAnalyzerSettings.psd1 | 11 ++ eng/common/internal-feed-operations.ps1 | 135 +++++++++++++++++ eng/common/internal-feed-operations.sh | 142 ++++++++++++++++++ .../post-build/setup-maestro-vars.yml | 28 +++- global.json | 2 +- 6 files changed, 311 insertions(+), 11 deletions(-) create mode 100644 eng/common/PSScriptAnalyzerSettings.psd1 create mode 100644 eng/common/internal-feed-operations.ps1 create mode 100644 eng/common/internal-feed-operations.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df67ec794..a1076eeea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - dc538a29793fd56618d0fa3186e2388d47d00c19 + 209388b8a700bb99690ae7fbbabe7e55f1999a8f diff --git a/eng/common/PSScriptAnalyzerSettings.psd1 b/eng/common/PSScriptAnalyzerSettings.psd1 new file mode 100644 index 000000000..4c1ea7c98 --- /dev/null +++ b/eng/common/PSScriptAnalyzerSettings.psd1 @@ -0,0 +1,11 @@ +@{ + IncludeRules=@('PSAvoidUsingCmdletAliases', + 'PSAvoidUsingWMICmdlet', + 'PSAvoidUsingPositionalParameters', + 'PSAvoidUsingInvokeExpression', + 'PSUseDeclaredVarsMoreThanAssignments', + 'PSUseCmdletCorrectly', + 'PSStandardDSCFunctionsInResource', + 'PSUseIdenticalMandatoryParametersForDSC', + 'PSUseIdenticalParametersForDSC') +} \ No newline at end of file diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 new file mode 100644 index 000000000..8b8bafd6a --- /dev/null +++ b/eng/common/internal-feed-operations.ps1 @@ -0,0 +1,135 @@ +param( + [Parameter(Mandatory=$true)][string] $Operation, + [string] $AuthToken, + [string] $CommitSha, + [string] $RepoName, + [switch] $IsFeedPrivate +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\tools.ps1 + +# Sets VSS_NUGET_EXTERNAL_FEED_ENDPOINTS based on the "darc-int-*" feeds defined in NuGet.config. This is needed +# in build agents by CredProvider to authenticate the restore requests to internal feeds as specified in +# https://github.com/microsoft/artifacts-credprovider/blob/0f53327cd12fd893d8627d7b08a2171bf5852a41/README.md#environment-variables. This should ONLY be called from identified +# internal builds +function SetupCredProvider { + param( + [string] $AuthToken + ) + + # Install the Cred Provider NuGet plugin + Write-Host "Setting up Cred Provider NuGet plugin in the agent..." + Write-Host "Getting 'installcredprovider.ps1' from 'https://github.com/microsoft/artifacts-credprovider'..." + + $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' + + Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." + Invoke-WebRequest $url -OutFile installcredprovider.ps1 + + Write-Host "Installing plugin..." + .\installcredprovider.ps1 -Force + + Write-Host "Deleting local copy of 'installcredprovider.ps1'..." + Remove-Item .\installcredprovider.ps1 + + if (-Not("$env:USERPROFILE\.nuget\plugins\netcore")) { + Write-Host "CredProvider plugin was not installed correctly!" + ExitWithExitCode 1 + } + else { + Write-Host "CredProvider plugin was installed correctly!" + } + + # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable + # feeds successfully + + $nugetConfigPath = "$RepoRoot\NuGet.config" + + if (-Not (Test-Path -Path $nugetConfigPath)) { + Write-Host "NuGet.config file not found in repo's root!" + ExitWithExitCode 1 + } + + $endpoints = New-Object System.Collections.ArrayList + $nugetConfigPackageSources = Select-Xml -Path $nugetConfigPath -XPath "//packageSources/add[contains(@key, 'darc-int-')]/@value" | foreach{$_.Node.Value} + + if (($nugetConfigPackageSources | Measure-Object).Count -gt 0 ) { + foreach ($stableRestoreResource in $nugetConfigPackageSources) { + $trimmedResource = ([string]$stableRestoreResource).Trim() + [void]$endpoints.Add(@{endpoint="$trimmedResource"; password="$AuthToken"}) + } + } + + if (($endpoints | Measure-Object).Count -gt 0) { + # Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}' + $endpointCredentials = @{endpointCredentials=$endpoints} | ConvertTo-Json -Compress + + # Create the environment variables the AzDo way + Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $endpointCredentials -Properties @{ + 'variable' = 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' + 'issecret' = 'false' + } + + # We don't want sessions cached since we will be updating the endpoints quite frequently + Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data 'False' -Properties @{ + 'variable' = 'NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED' + 'issecret' = 'false' + } + } + else + { + Write-Host "No internal endpoints found in NuGet.config" + } +} + +#Workaround for https://github.com/microsoft/msbuild/issues/4430 +function InstallDotNetSdkAndRestoreArcade { + $dotnetTempDir = "$RepoRoot\dotnet" + $dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) + $dotnet = "$dotnetTempDir\dotnet.exe" + $restoreProjPath = "$PSScriptRoot\restore.proj" + + Write-Host "Installing dotnet SDK version $dotnetSdkVersion to restore Arcade SDK..." + InstallDotNetSdk "$dotnetTempDir" "$dotnetSdkVersion" + + '' | Out-File "$restoreProjPath" + + & $dotnet restore $restoreProjPath + + Write-Host "Arcade SDK restored!" + + if (Test-Path -Path $restoreProjPath) { + Remove-Item $restoreProjPath + } + + if (Test-Path -Path $dotnetTempDir) { + Remove-Item $dotnetTempDir -Recurse + } +} + +try { + Push-Location $PSScriptRoot + + if ($Operation -like "setup") { + SetupCredProvider $AuthToken + } + elseif ($Operation -like "install-restore") { + InstallDotNetSdkAndRestoreArcade + } + else { + Write-Host "Unknown operation '$Operation'!" + ExitWithExitCode 1 + } +} +catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} +finally { + Pop-Location +} diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh new file mode 100644 index 000000000..1ff654d2f --- /dev/null +++ b/eng/common/internal-feed-operations.sh @@ -0,0 +1,142 @@ +#!/usr/bin/env bash + +set -e + +# Sets VSS_NUGET_EXTERNAL_FEED_ENDPOINTS based on the "darc-int-*" feeds defined in NuGet.config. This is needed +# in build agents by CredProvider to authenticate the restore requests to internal feeds as specified in +# https://github.com/microsoft/artifacts-credprovider/blob/0f53327cd12fd893d8627d7b08a2171bf5852a41/README.md#environment-variables. +# This should ONLY be called from identified internal builds +function SetupCredProvider { + local authToken=$1 + + # Install the Cred Provider NuGet plugin + echo "Setting up Cred Provider NuGet plugin in the agent..."... + echo "Getting 'installcredprovider.ps1' from 'https://github.com/microsoft/artifacts-credprovider'..." + + local url="https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh" + + echo "Writing the contents of 'installcredprovider.ps1' locally..." + local installcredproviderPath="installcredprovider.sh" + if command -v curl > /dev/null; then + curl $url > "$installcredproviderPath" + else + wget -q -O "$installcredproviderPath" "$url" + fi + + echo "Installing plugin..." + . "$installcredproviderPath" + + echo "Deleting local copy of 'installcredprovider.sh'..." + rm installcredprovider.sh + + if [ ! -d "$HOME/.nuget/plugins" ]; then + echo "CredProvider plugin was not installed correctly!" + ExitWithExitCode 1 + else + echo "CredProvider plugin was installed correctly!" + fi + + # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable + # feeds successfully + + local nugetConfigPath="$repo_root/NuGet.config" + + if [ ! "$nugetConfigPath" ]; then + echo "NuGet.config file not found in repo's root!" + ExitWithExitCode 1 + fi + + local endpoints='[' + local nugetConfigPackageValues=`cat "$nugetConfigPath" | grep "key=\"darc-int-"` + local pattern="value=\"(.*)\"" + + for value in $nugetConfigPackageValues + do + if [[ $value =~ $pattern ]]; then + local endpoint="${BASH_REMATCH[1]}" + endpoints+="{\"endpoint\": \"$endpoint\", \"password\": \"$authToken\"}," + fi + done + + endpoints=${endpoints%?} + endpoints+=']' + + if [ ${#endpoints} -gt 2 ]; then + # Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}' + local endpointCredentials="{\"endpointCredentials\": "$endpoints"}" + + echo "##vso[task.setvariable variable=VSS_NUGET_EXTERNAL_FEED_ENDPOINTS]$endpointCredentials" + echo "##vso[task.setvariable variable=NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED]False" + else + echo "No internal endpoints found in NuGet.config" + fi +} + +# Workaround for https://github.com/microsoft/msbuild/issues/4430 +function InstallDotNetSdkAndRestoreArcade { + local dotnetTempDir="$repo_root/dotnet" + local dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) + local restoreProjPath="$repo_root/eng/common/restore.proj" + + echo "Installing dotnet SDK version $dotnetSdkVersion to restore Arcade SDK..." + echo "" > "$restoreProjPath" + + InstallDotNetSdk "$dotnetTempDir" "$dotnetSdkVersion" + + local res=`$dotnetTempDir/dotnet restore $restoreProjPath` + echo "Arcade SDK restored!" + + # Cleanup + if [ "$restoreProjPath" ]; then + rm "$restoreProjPath" + fi + + if [ "$dotnetTempDir" ]; then + rm -r $dotnetTempDir + fi +} + +source="${BASH_SOURCE[0]}" +operation='' +authToken='' +repoName='' + +while [[ $# > 0 ]]; do + opt="$(echo "$1" | awk '{print tolower($0)}')" + case "$opt" in + --operation) + operation=$2 + shift + ;; + --authtoken) + authToken=$2 + shift + ;; + *) + echo "Invalid argument: $1" + usage + exit 1 + ;; + esac + + shift +done + +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 )" + +. "$scriptroot/tools.sh" + +if [ "$operation" = "setup" ]; then + SetupCredProvider $authToken +elif [ "$operation" = "install-restore" ]; then + InstallDotNetSdkAndRestoreArcade +else + echo "Unknown operation '$operation'!" +fi diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index b40e0260a..9de585a94 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -16,11 +16,23 @@ jobs: inputs: targetType: inline script: | - . "$(Build.SourcesDirectory)/eng/common/tools.ps1" - - $BarId = Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/BARBuildId.txt" - Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId - - $Channels = "" - Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/Channels.txt" | ForEach-Object { $Channels += "$_ ," } - Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels" + # This is needed to make Write-PipelineSetVariable works in this context + if ($env:BUILD_BUILDNUMBER -ne "" -and $env:BUILD_BUILDNUMBER -ne $null) { + $ci = $true + + . "$(Build.SourcesDirectory)/eng/common/tools.ps1" + + $BarId = Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/BARBuildId.txt" + Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId + + Write-Host "Asked Write-PipelineSetVariable to create BARBuildId with value '$BarId'" + + $Channels = "" + Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/Channels.txt" | ForEach-Object { $Channels += "$_ ," } + Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels" + + Write-Host "Asked Write-PipelineSetVariable to create InitialChannels with value '$Channels'" + } + else { + Write-Host "This step can only be run in an Azure DevOps CI environment." + } diff --git a/global.json b/global.json index 64a602c7c..bc8b5c487 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19318.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19319.1" } } From 6f80bbd42652efef99386e28fa15a6b74f47108b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 22:13:54 +0000 Subject: [PATCH 270/471] [master] Update dependencies from dotnet/core-setup (#2537) * Update dependencies from https://github.com/dotnet/core-setup build 20190619.06 - NETStandard.Library.Ref - 2.1.0-preview7-27819-06 - Microsoft.NETCore.App - 3.0.0-preview7-27819-06 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27819-06 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19316.2 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19318.1 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190619.07 - NETStandard.Library.Ref - 2.1.0-preview7-27819-07 - Microsoft.NETCore.App - 3.0.0-preview7-27819-07 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27819-07 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19316.2 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19318.1 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1076eeea..46144cd5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - ff396e0cab960f35b1e01a24c5170ad96da90082 + 82a394219d72114fbeae35dcc6166e79e341d21c - + https://github.com/dotnet/core-setup - ff396e0cab960f35b1e01a24c5170ad96da90082 + 82a394219d72114fbeae35dcc6166e79e341d21c - + https://github.com/dotnet/core-setup - ff396e0cab960f35b1e01a24c5170ad96da90082 + 82a394219d72114fbeae35dcc6166e79e341d21c https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ c6cd21a0db2a5647ac8bb28fc934b15935be883f - + https://github.com/dotnet/winforms - a446ca927d3ad4f9e6baa6544822eb1321655f85 + ebeaa64fb85e9d6e576d142d8e5dc345eccec8e1 - + https://github.com/dotnet/wpf - 308512f9ef2407b26baa7f3a266b278f4ff3c643 + 9c4c3b5734a1217662b93a9f72dbb12a62f30a52 diff --git a/eng/Versions.props b/eng/Versions.props index e69a1e391..cdcb75a1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19315.1 + 4.8.0-preview7.19316.2 - 3.0.0-preview7.19316.3 + 3.0.0-preview7.19318.1 @@ -47,7 +47,7 @@ 3.0.100-preview7.19318.4 - 3.0.0-preview7-27819-03 + 3.0.0-preview7-27819-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27819-03 + 2.1.0-preview7-27819-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27819-03 + 3.0.0-preview7-27819-07 $(MicrosoftWindowsDesktopAppPackageVersion) From a3e040584464118d1679d3060cd2acd09f6c832a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2019 23:00:35 +0000 Subject: [PATCH 271/471] [master] Update dependencies from dotnet/cli (#2539) * Update dependencies from https://github.com/dotnet/cli build 20190619.7 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19319.7 * Update dependencies from https://github.com/dotnet/cli build 20190619.8 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19319.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46144cd5f..49e13d4cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 7aa2004792850f672c70181820c86e88b8963992 - + https://github.com/dotnet/cli - c6cd21a0db2a5647ac8bb28fc934b15935be883f + ddbee294b581c99959bb98bf6bb6606cd218b5d8 diff --git a/eng/Versions.props b/eng/Versions.props index cdcb75a1f..0b8d0bbbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19319.4 + 3.0.100-preview7.19319.8 1.0.2-beta5.19318.1 From 01071ed506143d398588aeae2b98b7f80b089d9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2019 00:56:26 +0000 Subject: [PATCH 272/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190619.3 (#2538) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19319.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19319.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19319.3 - dotnet-watch - 3.0.0-preview7.19319.3 - dotnet-user-secrets - 3.0.0-preview7.19319.3 - dotnet-dev-certs - 3.0.0-preview7.19319.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49e13d4cd..bb9cb27d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 82a394219d72114fbeae35dcc6166e79e341d21c - + https://github.com/aspnet/AspNetCore - 9ea20ddef331b786141b5e52cd03a91bff4c401f + 2df72072ad5bf4d40c1e20d96500593cd801b557 - + https://github.com/aspnet/AspNetCore - 9ea20ddef331b786141b5e52cd03a91bff4c401f + 2df72072ad5bf4d40c1e20d96500593cd801b557 - + https://github.com/aspnet/AspNetCore - 9ea20ddef331b786141b5e52cd03a91bff4c401f + 2df72072ad5bf4d40c1e20d96500593cd801b557 - + https://github.com/aspnet/AspNetCore - 9ea20ddef331b786141b5e52cd03a91bff4c401f + 2df72072ad5bf4d40c1e20d96500593cd801b557 - + https://github.com/aspnet/AspNetCore - 9ea20ddef331b786141b5e52cd03a91bff4c401f + 2df72072ad5bf4d40c1e20d96500593cd801b557 - + https://github.com/aspnet/AspNetCore - 9ea20ddef331b786141b5e52cd03a91bff4c401f + 2df72072ad5bf4d40c1e20d96500593cd801b557 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 0b8d0bbbe..7c7bf21a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19319.2 - 3.0.0-preview7.19319.2 - 3.0.0-preview7.19319.2 - 3.0.0-preview7.19319.2 - 3.0.0-preview7.19319.2 - 3.0.0-preview7.19319.2 + 3.0.0-preview7.19319.3 + 3.0.0-preview7.19319.3 + 3.0.0-preview7.19319.3 + 3.0.0-preview7.19319.3 + 3.0.0-preview7.19319.3 + 3.0.0-preview7.19319.3 From da94a8cc8d3387cb7c9d1b14b624d2bcb9fbf91a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2019 00:59:27 +0000 Subject: [PATCH 273/471] Update dependencies from https://github.com/dotnet/core-setup build 20190619.08 (#2540) - NETStandard.Library.Ref - 2.1.0-preview7-27819-08 - Microsoft.NETCore.App - 3.0.0-preview7-27819-08 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27819-08 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19318.9 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19319.1 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb9cb27d4..925f884df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 82a394219d72114fbeae35dcc6166e79e341d21c + 9f7ab48ba6c2c910a48d0b484f103e274d3654fc - + https://github.com/dotnet/core-setup - 82a394219d72114fbeae35dcc6166e79e341d21c + 9f7ab48ba6c2c910a48d0b484f103e274d3654fc - + https://github.com/dotnet/core-setup - 82a394219d72114fbeae35dcc6166e79e341d21c + 9f7ab48ba6c2c910a48d0b484f103e274d3654fc https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ ddbee294b581c99959bb98bf6bb6606cd218b5d8 - + https://github.com/dotnet/winforms - ebeaa64fb85e9d6e576d142d8e5dc345eccec8e1 + 6970d10fef97fb3faf33cfa81224c1d8a6d10d52 - + https://github.com/dotnet/wpf - 9c4c3b5734a1217662b93a9f72dbb12a62f30a52 + 8c7ab1592b6c70e732106aeabf58f215d4b71c22 diff --git a/eng/Versions.props b/eng/Versions.props index 7c7bf21a1..4863044fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19316.2 + 4.8.0-preview7.19318.9 - 3.0.0-preview7.19318.1 + 3.0.0-preview7.19319.1 @@ -47,7 +47,7 @@ 3.0.100-preview7.19318.4 - 3.0.0-preview7-27819-07 + 3.0.0-preview7-27819-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27819-07 + 2.1.0-preview7-27819-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27819-07 + 3.0.0-preview7-27819-08 $(MicrosoftWindowsDesktopAppPackageVersion) From 19e6d0d0ddffa2e69132f2643f0cafd9ed5151e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2019 03:00:58 +0000 Subject: [PATCH 274/471] Update dependencies from https://github.com/dotnet/core-setup build 20190619.11 (#2541) - NETStandard.Library.Ref - 2.1.0-preview7-27819-11 - Microsoft.NETCore.App - 3.0.0-preview7-27819-11 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27819-11 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 925f884df..4d23cfa1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 9f7ab48ba6c2c910a48d0b484f103e274d3654fc + b50cbee1af1bb94b93dcfc3234a493619b7a62ad - + https://github.com/dotnet/core-setup - 9f7ab48ba6c2c910a48d0b484f103e274d3654fc + b50cbee1af1bb94b93dcfc3234a493619b7a62ad - + https://github.com/dotnet/core-setup - 9f7ab48ba6c2c910a48d0b484f103e274d3654fc + b50cbee1af1bb94b93dcfc3234a493619b7a62ad https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 4863044fb..c2450f2d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19318.4 - 3.0.0-preview7-27819-08 + 3.0.0-preview7-27819-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27819-08 + 2.1.0-preview7-27819-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27819-08 + 3.0.0-preview7-27819-11 $(MicrosoftWindowsDesktopAppPackageVersion) From 403ec5419403d2376b99f27d7e820a00ed74839d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2019 04:26:15 +0000 Subject: [PATCH 275/471] Update dependencies from https://github.com/dotnet/core-setup build 20190619.12 (#2542) - NETStandard.Library.Ref - 2.1.0-preview7-27819-12 - Microsoft.NETCore.App - 3.0.0-preview7-27819-12 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27819-12 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d23cfa1a..4a724abb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - b50cbee1af1bb94b93dcfc3234a493619b7a62ad + 5927e0d83b4ec23e7189944b72d43bda84ef62d1 - + https://github.com/dotnet/core-setup - b50cbee1af1bb94b93dcfc3234a493619b7a62ad + 5927e0d83b4ec23e7189944b72d43bda84ef62d1 - + https://github.com/dotnet/core-setup - b50cbee1af1bb94b93dcfc3234a493619b7a62ad + 5927e0d83b4ec23e7189944b72d43bda84ef62d1 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index c2450f2d0..edd69374a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19318.4 - 3.0.0-preview7-27819-11 + 3.0.0-preview7-27819-12 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27819-11 + 2.1.0-preview7-27819-12 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27819-11 + 3.0.0-preview7-27819-12 $(MicrosoftWindowsDesktopAppPackageVersion) From 8ed3e8fb808508c88c78c3c20c3507b759458800 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2019 05:23:52 +0000 Subject: [PATCH 276/471] Update dependencies from https://github.com/dotnet/sdk build 20190619.1 (#2543) - Microsoft.NET.Sdk - 3.0.100-preview7.19319.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a724abb8..503b6fc86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 0e48e294ecd191ba6715a030f78c6940b0d481bf - + https://github.com/dotnet/sdk - 7aa2004792850f672c70181820c86e88b8963992 + 226b4cfacea85f465a5920bcbae80706e48f2af1 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index edd69374a..598d65564 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19318.4 + 3.0.100-preview7.19319.1 3.0.0-preview7-27819-12 From 0b444f842c3b49d117a58f6205fa09ae6dfc6044 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2019 11:44:20 +0000 Subject: [PATCH 277/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190620.1 (#2544) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19320.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19320.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19320.1 - dotnet-watch - 3.0.0-preview7.19320.1 - dotnet-user-secrets - 3.0.0-preview7.19320.1 - dotnet-dev-certs - 3.0.0-preview7.19320.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 503b6fc86..69b794f39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 5927e0d83b4ec23e7189944b72d43bda84ef62d1 - + https://github.com/aspnet/AspNetCore - 2df72072ad5bf4d40c1e20d96500593cd801b557 + 56ffc6b58210292a18f548bf4eddff193f73a4d6 - + https://github.com/aspnet/AspNetCore - 2df72072ad5bf4d40c1e20d96500593cd801b557 + 56ffc6b58210292a18f548bf4eddff193f73a4d6 - + https://github.com/aspnet/AspNetCore - 2df72072ad5bf4d40c1e20d96500593cd801b557 + 56ffc6b58210292a18f548bf4eddff193f73a4d6 - + https://github.com/aspnet/AspNetCore - 2df72072ad5bf4d40c1e20d96500593cd801b557 + 56ffc6b58210292a18f548bf4eddff193f73a4d6 - + https://github.com/aspnet/AspNetCore - 2df72072ad5bf4d40c1e20d96500593cd801b557 + 56ffc6b58210292a18f548bf4eddff193f73a4d6 - + https://github.com/aspnet/AspNetCore - 2df72072ad5bf4d40c1e20d96500593cd801b557 + 56ffc6b58210292a18f548bf4eddff193f73a4d6 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 598d65564..8eaa6ca95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19319.3 - 3.0.0-preview7.19319.3 - 3.0.0-preview7.19319.3 - 3.0.0-preview7.19319.3 - 3.0.0-preview7.19319.3 - 3.0.0-preview7.19319.3 + 3.0.0-preview7.19320.1 + 3.0.0-preview7.19320.1 + 3.0.0-preview7.19320.1 + 3.0.0-preview7.19320.1 + 3.0.0-preview7.19320.1 + 3.0.0-preview7.19320.1 From 10c031b53301137008a2444f44ab34c129bb6f85 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2019 12:30:36 +0000 Subject: [PATCH 278/471] Update dependencies from https://github.com/dotnet/arcade build 20190619.25 (#2545) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19319.25 --- eng/Version.Details.xml | 4 +- eng/common/sdl/execute-all-sdl-tools.ps1 | 56 ++++++++++++------------ eng/common/sdl/init-sdl.ps1 | 6 +-- eng/common/sdl/push-gdn.ps1 | 6 +-- eng/common/templates/job/execute-sdl.yml | 37 ++++++++++++++++ global.json | 2 +- 6 files changed, 74 insertions(+), 37 deletions(-) create mode 100644 eng/common/templates/job/execute-sdl.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69b794f39..af4fa3984 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 209388b8a700bb99690ae7fbbabe7e55f1999a8f + bd50b2bcc787a8c62e2e114fb54704b645cc1c3a diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 74080f22d..0635f26fb 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -1,28 +1,28 @@ Param( - [string] $GuardianPackageName, # Required: the name of guardian CLI pacakge (not needed if GuardianCliLocation is specified) - [string] $NugetPackageDirectory, # Required: directory where NuGet packages are installed (not needed if GuardianCliLocation is specified) - [string] $GuardianCliLocation, # Optional: Direct location of Guardian CLI executable if GuardianPackageName & NugetPackageDirectory are not specified - [string] $Repository, # Required: the name of the repository (e.g. dotnet/arcade) - [string] $BranchName="master", # Optional: name of branch or version of gdn settings; defaults to master - [string] $SourceDirectory, # Required: the directory where source files are located - [string] $ArtifactsDirectory, # Required: the directory where build artifacts are located - [string] $DncEngAccessToken, # Required: access token for dnceng; should be provided via KeyVault - [string[]] $SourceToolsList, # Optional: list of SDL tools to run on source code - [string[]] $ArtifactToolsList, # Optional: list of SDL tools to run on built artifacts - [bool] $TsaPublish=$False, # Optional: true will publish results to TSA; only set to true after onboarding to TSA; TSA is the automated framework used to upload test results as bugs. - [string] $TsaBranchName=$env:BUILD_SOURCEBRANCHNAME, # Optional: required for TSA publish; defaults to $(Build.SourceBranchName); TSA is the automated framework used to upload test results as bugs. - [string] $TsaRepositoryName, # Optional: TSA repository name; will be generated automatically if not submitted; TSA is the automated framework used to upload test results as bugs. - [string] $BuildNumber=$env:BUILD_BUILDNUMBER, # Optional: required for TSA publish; defaults to $(Build.BuildNumber) - [bool] $UpdateBaseline=$False, # Optional: if true, will update the baseline in the repository; should only be run after fixing any issues which need to be fixed - [bool] $TsaOnboard=$False, # Optional: if true, will onboard the repository to TSA; should only be run once; TSA is the automated framework used to upload test results as bugs. - [string] $TsaInstanceUrl, # Optional: only needed if TsaOnboard or TsaPublish is true; the instance-url registered with TSA; TSA is the automated framework used to upload test results as bugs. - [string] $TsaCodebaseName, # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the codebase registered with TSA; TSA is the automated framework used to upload test results as bugs. - [string] $TsaProjectName, # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the project registered with TSA; TSA is the automated framework used to upload test results as bugs. - [string] $TsaNotificationEmail, # Optional: only needed if TsaOnboard is true; the email(s) which will receive notifications of TSA bug filings (e.g. alias@microsoft.com); TSA is the automated framework used to upload test results as bugs. - [string] $TsaCodebaseAdmin, # Optional: only needed if TsaOnboard is true; the aliases which are admins of the TSA codebase (e.g. DOMAIN\alias); TSA is the automated framework used to upload test results as bugs. - [string] $TsaBugAreaPath, # Optional: only needed if TsaOnboard is true; the area path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. - [string] $TsaIterationPath, # Optional: only needed if TsaOnboard is true; the iteration path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. - [string] $GuardianLoggerLevel="Standard" # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error + [string] $GuardianPackageName, # Required: the name of guardian CLI package (not needed if GuardianCliLocation is specified) + [string] $NugetPackageDirectory, # Required: directory where NuGet packages are installed (not needed if GuardianCliLocation is specified) + [string] $GuardianCliLocation, # Optional: Direct location of Guardian CLI executable if GuardianPackageName & NugetPackageDirectory are not specified + [string] $Repository=$env:BUILD_REPOSITORY_NAME, # Required: the name of the repository (e.g. dotnet/arcade) + [string] $BranchName=$env:BUILD_SOURCEBRANCH, # Optional: name of branch or version of gdn settings; defaults to master + [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, # Required: the directory where source files are located + [string] $ArtifactsDirectory = (Join-Path $env:BUILD_SOURCESDIRECTORY ("artifacts")), # Required: the directory where build artifacts are located + [string] $AzureDevOpsAccessToken, # Required: access token for dnceng; should be provided via KeyVault + [string[]] $SourceToolsList, # Optional: list of SDL tools to run on source code + [string[]] $ArtifactToolsList, # Optional: list of SDL tools to run on built artifacts + [bool] $TsaPublish=$False, # Optional: true will publish results to TSA; only set to true after onboarding to TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaBranchName=$env:BUILD_SOURCEBRANCH, # Optional: required for TSA publish; defaults to $(Build.SourceBranchName); TSA is the automated framework used to upload test results as bugs. + [string] $TsaRepositoryName=$env:BUILD_REPOSITORY_NAME, # Optional: TSA repository name; will be generated automatically if not submitted; TSA is the automated framework used to upload test results as bugs. + [string] $BuildNumber=$env:BUILD_BUILDNUMBER, # Optional: required for TSA publish; defaults to $(Build.BuildNumber) + [bool] $UpdateBaseline=$False, # Optional: if true, will update the baseline in the repository; should only be run after fixing any issues which need to be fixed + [bool] $TsaOnboard=$False, # Optional: if true, will onboard the repository to TSA; should only be run once; TSA is the automated framework used to upload test results as bugs. + [string] $TsaInstanceUrl, # Optional: only needed if TsaOnboard or TsaPublish is true; the instance-url registered with TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaCodebaseName, # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the codebase registered with TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaProjectName, # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the project registered with TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaNotificationEmail, # Optional: only needed if TsaOnboard is true; the email(s) which will receive notifications of TSA bug filings (e.g. alias@microsoft.com); TSA is the automated framework used to upload test results as bugs. + [string] $TsaCodebaseAdmin, # Optional: only needed if TsaOnboard is true; the aliases which are admins of the TSA codebase (e.g. DOMAIN\alias); TSA is the automated framework used to upload test results as bugs. + [string] $TsaBugAreaPath, # Optional: only needed if TsaOnboard is true; the area path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. + [string] $TsaIterationPath, # Optional: only needed if TsaOnboard is true; the iteration path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. + [string] $GuardianLoggerLevel="Standard" # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error ) $ErrorActionPreference = "Stop" @@ -51,7 +51,7 @@ if ($ValidPath -eq $False) exit 1 } -& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $ArtifactsDirectory -DncEngAccessToken $DncEngAccessToken -GuardianLoggerLevel $GuardianLoggerLevel +& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $ArtifactsDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel $gdnFolder = Join-Path $ArtifactsDirectory ".gdn" if ($TsaOnboard) { @@ -69,14 +69,14 @@ if ($TsaOnboard) { } if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) { - & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -DncEngAccessToken $DncEngAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel + & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel } if ($SourceToolsList -and $SourceToolsList.Count -gt 0) { - & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -DncEngAccessToken $DncEngAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel + & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel } if ($UpdateBaseline) { - & (Join-Path $PSScriptRoot "push-gdn.ps1") -Repository $RepoName -BranchName $BranchName -GdnFolder $GdnFolder -DncEngAccessToken $DncEngAccessToken -PushReason "Update baseline" + & (Join-Path $PSScriptRoot "push-gdn.ps1") -Repository $RepoName -BranchName $BranchName -GdnFolder $GdnFolder -AzureDevOpsAccessToken $AzureDevOpsAccessToken -PushReason "Update baseline" } if ($TsaPublish) { diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index cbf5c36a8..26e01c067 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -3,7 +3,7 @@ Param( [string] $Repository, [string] $BranchName="master", [string] $WorkingDirectory, - [string] $DncEngAccessToken, + [string] $AzureDevOpsAccessToken, [string] $GuardianLoggerLevel="Standard" ) @@ -12,7 +12,7 @@ Set-StrictMode -Version 2.0 $LASTEXITCODE = 0 # Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file -$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$DncEngAccessToken")) +$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken")) $escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") $uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0-preview.1" $zipFile = "$WorkingDirectory/gdn.zip" @@ -44,5 +44,5 @@ Try if ($LASTEXITCODE -ne 0) { Write-Error "Guardian baseline failed with exit code $LASTEXITCODE." } - & $(Join-Path $PSScriptRoot "push-gdn.ps1") -Repository $Repository -BranchName $BranchName -GdnFolder $gdnFolder -DncEngAccessToken $DncEngAccessToken -PushReason "Initialize gdn folder" + & $(Join-Path $PSScriptRoot "push-gdn.ps1") -Repository $Repository -BranchName $BranchName -GdnFolder $gdnFolder -AzureDevOpsAccessToken $AzureDevOpsAccessToken -PushReason "Initialize gdn folder" } \ No newline at end of file diff --git a/eng/common/sdl/push-gdn.ps1 b/eng/common/sdl/push-gdn.ps1 index cacaf8e91..79c707d6d 100644 --- a/eng/common/sdl/push-gdn.ps1 +++ b/eng/common/sdl/push-gdn.ps1 @@ -2,7 +2,7 @@ Param( [string] $Repository, [string] $BranchName="master", [string] $GdnFolder, - [string] $DncEngAccessToken, + [string] $AzureDevOpsAccessToken, [string] $PushReason ) @@ -16,8 +16,8 @@ if (Test-Path $sdlDir) { Remove-Item -Force -Recurse $sdlDir } -Write-Host "git clone https://dnceng:`$DncEngAccessToken@dev.azure.com/dnceng/internal/_git/sdl-tool-cfg $sdlDir" -git clone https://dnceng:$DncEngAccessToken@dev.azure.com/dnceng/internal/_git/sdl-tool-cfg $sdlDir +Write-Host "git clone https://dnceng:`$AzureDevOpsAccessToken@dev.azure.com/dnceng/internal/_git/sdl-tool-cfg $sdlDir" +git clone https://dnceng:$AzureDevOpsAccessToken@dev.azure.com/dnceng/internal/_git/sdl-tool-cfg $sdlDir if ($LASTEXITCODE -ne 0) { Write-Error "Git clone failed with exit code $LASTEXITCODE." } diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml new file mode 100644 index 000000000..2f669fd95 --- /dev/null +++ b/eng/common/templates/job/execute-sdl.yml @@ -0,0 +1,37 @@ +parameters: + overrideParameters: '' # Optional: to override values for parameters. + additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")' + continueOnError: false # optional: determines whether to continue the build if the step errors; + dependsOn: '' # Optional: dependencies of the job + +jobs: +- job: Run_SDL + dependsOn: ${{ parameters.dependsOn }} + displayName: Run SDL tool + variables: + - group: DotNet-VSTS-Bot + steps: + - checkout: self + clean: true + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + - task: NuGetCommand@2 + displayName: 'Install Guardian' + inputs: + restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + feedsToUse: config + nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config + externalFeedCredentials: GuardianConnect + restoreDirectory: $(Build.SourcesDirectory)\.packages + - ${{ if ne(parameters.overrideParameters, '') }}: + - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 ${{ parameters.overrideParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.continueOnError }} + - ${{ if eq(parameters.overrideParameters, '') }}: + - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 + -GuardianPackageName Microsoft.Guardian.Cli.0.3.2 + -NugetPackageDirectory $(Build.SourcesDirectory)\.packages + -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) + ${{ parameters.additionalParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.continueOnError }} diff --git a/global.json b/global.json index bc8b5c487..6c27ea1f2 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19319.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19319.25" } } From a690e01257d36dce4a1173c64f9fca3072ebc541 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2019 12:30:53 +0000 Subject: [PATCH 279/471] Update dependencies from https://github.com/dotnet/templating build 20190619.1 (#2546) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19319.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af4fa3984..52299e872 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore 56ffc6b58210292a18f548bf4eddff193f73a4d6 - + https://github.com/dotnet/templating - 84d778990198681b27f4a9b2eeea6efaeeb431a3 + 7e43668b697884dcce1f78506cbecd5e94039c9e https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 8eaa6ca95..235335c70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19319.8 - 1.0.2-beta5.19318.1 + 1.0.2-beta5.19319.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From 82f52d7a6680177831e0b4ef74b771869bdb0017 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2019 12:45:52 +0000 Subject: [PATCH 280/471] Update dependencies from https://github.com/dotnet/toolset build 20190620.1 (#2547) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19320.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52299e872..5d021ba1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 7e43668b697884dcce1f78506cbecd5e94039c9e - + https://github.com/dotnet/toolset - 0e48e294ecd191ba6715a030f78c6940b0d481bf + 9b8f6cdcc39ba2dd69de2568c919e3b0132e385b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 235335c70..c4e885698 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19319.6 + 3.0.100-preview7.19320.1 From af8bee2995fc75d1122b21cc992dafc82b419dc6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2019 13:07:52 +0000 Subject: [PATCH 281/471] [master] Update dependencies from dotnet/toolset (#2549) * Update dependencies from https://github.com/dotnet/toolset build 20190620.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19320.2 * Update dependencies from https://github.com/dotnet/toolset build 20190620.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19320.3 * Update dependencies from https://github.com/dotnet/toolset build 20190620.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19320.4 * Update dependencies from https://github.com/dotnet/toolset build 20190620.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19320.5 * Update dependencies from https://github.com/dotnet/toolset build 20190620.6 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19320.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d021ba1d..a5f43fdbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 7e43668b697884dcce1f78506cbecd5e94039c9e - + https://github.com/dotnet/toolset - 9b8f6cdcc39ba2dd69de2568c919e3b0132e385b + 803f6a3b65e6b7b3636dbaf3b891cff9b548c5ac https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c4e885698..5fcc8a87f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19320.1 + 3.0.100-preview7.19320.6 From 4b560256ab81fc65ea63da04061491dcafd8ebdc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2019 13:40:15 +0000 Subject: [PATCH 282/471] [master] Update dependencies from dotnet/cli (#2548) * Update dependencies from https://github.com/dotnet/cli build 20190620.1 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19320.1 * Update dependencies from https://github.com/dotnet/cli build 20190620.2 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19320.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5f43fdbe..9bec2fd80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 226b4cfacea85f465a5920bcbae80706e48f2af1 - + https://github.com/dotnet/cli - ddbee294b581c99959bb98bf6bb6606cd218b5d8 + b71273cf9c77aaa6342c399c8c0d0b776f4c9eff diff --git a/eng/Versions.props b/eng/Versions.props index 5fcc8a87f..d204ccecf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19319.8 + 3.0.100-preview7.19320.2 1.0.2-beta5.19319.1 From 6f4eec66769cf50bfded7d50e80e8a17e09aafbc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2019 13:49:45 +0000 Subject: [PATCH 283/471] Update dependencies from https://github.com/dotnet/toolset build 20190620.7 (#2550) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19320.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9bec2fd80..7d58162d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 7e43668b697884dcce1f78506cbecd5e94039c9e - + https://github.com/dotnet/toolset - 803f6a3b65e6b7b3636dbaf3b891cff9b548c5ac + b0f55b082a6b2352b29089e97ccb92901c133593 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d204ccecf..676a9476b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19320.6 + 3.0.100-preview7.19320.7 From 5b0554f900b2b8d051d24534a5c869f5f9a0ed49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2019 14:10:48 +0000 Subject: [PATCH 284/471] Update dependencies from https://github.com/dotnet/cli build 20190620.3 (#2551) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19320.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d58162d2..696e75c2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 226b4cfacea85f465a5920bcbae80706e48f2af1 - + https://github.com/dotnet/cli - b71273cf9c77aaa6342c399c8c0d0b776f4c9eff + 8071d61e33a9626ef4c208e557c66fc5560a4bfd diff --git a/eng/Versions.props b/eng/Versions.props index 676a9476b..d26b413c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19320.2 + 3.0.100-preview7.19320.3 1.0.2-beta5.19319.1 From 3122e986c364053873d08ec9d8974f241abe7796 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2019 14:29:07 +0000 Subject: [PATCH 285/471] Update dependencies from https://github.com/dotnet/toolset build 20190620.8 (#2552) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19320.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 696e75c2c..cd0c99f52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 7e43668b697884dcce1f78506cbecd5e94039c9e - + https://github.com/dotnet/toolset - b0f55b082a6b2352b29089e97ccb92901c133593 + 17ce9067a95474ddde8489def6f03d6adcaf5c88 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d26b413c3..ac559a2f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19320.7 + 3.0.100-preview7.19320.8 From c4768534c75a23c8962ccb80406489ad7746b6da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2019 15:37:24 +0000 Subject: [PATCH 286/471] Update dependencies from https://github.com/dotnet/core-setup build 20190620.01 (#2553) - NETStandard.Library.Ref - 2.1.0-preview7-27820-01 - Microsoft.NETCore.App - 3.0.0-preview7-27820-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27820-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd0c99f52..d0049009b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 5927e0d83b4ec23e7189944b72d43bda84ef62d1 + 581b8d13b3d8820f381cd3c09bcccaee38cd5d84 - + https://github.com/dotnet/core-setup - 5927e0d83b4ec23e7189944b72d43bda84ef62d1 + 581b8d13b3d8820f381cd3c09bcccaee38cd5d84 - + https://github.com/dotnet/core-setup - 5927e0d83b4ec23e7189944b72d43bda84ef62d1 + 581b8d13b3d8820f381cd3c09bcccaee38cd5d84 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index ac559a2f4..3f2d2a277 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19319.1 - 3.0.0-preview7-27819-12 + 3.0.0-preview7-27820-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27819-12 + 2.1.0-preview7-27820-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27819-12 + 3.0.0-preview7-27820-01 $(MicrosoftWindowsDesktopAppPackageVersion) From 453414fc7517e617b706aa620fc4c8a74ff35e75 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Thu, 20 Jun 2019 17:24:02 -0500 Subject: [PATCH 287/471] Consolidate MSBuild* versions for source-build (#2554) --- src/core-sdk-tasks/core-sdk-tasks.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 7b04a4c20..d6c8968d4 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -8,8 +8,8 @@ - - + + From 23e5de94039028c3af3686a5de50981191b83106 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2019 22:24:32 +0000 Subject: [PATCH 288/471] Update dependencies from https://github.com/dotnet/toolset build 20190620.9 (#2555) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19320.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0049009b..103cbbb55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 7e43668b697884dcce1f78506cbecd5e94039c9e - + https://github.com/dotnet/toolset - 17ce9067a95474ddde8489def6f03d6adcaf5c88 + 0237082d1b7fca42771c2526c8f08dbd0fc65b68 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 3f2d2a277..ea381c670 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19320.8 + 3.0.100-preview7.19320.9 From 25be3b3ef5f3bf437b1e4f9b1b967d7a48e5ab32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2019 23:54:48 +0000 Subject: [PATCH 289/471] Update dependencies from https://github.com/dotnet/sdk build 20190620.1 (#2556) - Microsoft.NET.Sdk - 3.0.100-preview7.19320.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 103cbbb55..bbf222888 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 0237082d1b7fca42771c2526c8f08dbd0fc65b68 - + https://github.com/dotnet/sdk - 226b4cfacea85f465a5920bcbae80706e48f2af1 + 0804f7b70294e1098a1c7b5a546d96b8920a8196 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index ea381c670..077a20838 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19319.1 + 3.0.100-preview7.19320.1 3.0.0-preview7-27820-01 From a30e5242a8a60a240ac6069eae8eb8eb436a12f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 00:40:21 +0000 Subject: [PATCH 290/471] Update dependencies from https://github.com/dotnet/sdk build 20190620.2 (#2557) - Microsoft.NET.Sdk - 3.0.100-preview7.19320.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbf222888..a507adaa5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 0237082d1b7fca42771c2526c8f08dbd0fc65b68 - + https://github.com/dotnet/sdk - 0804f7b70294e1098a1c7b5a546d96b8920a8196 + 260f37383a4974b478cba2ba67ac7908578f5b07 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 077a20838..c2e04c382 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19320.1 + 3.0.100-preview7.19320.2 3.0.0-preview7-27820-01 From f50e7614e195ee750b77ed9538d70124c7c9d610 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 04:56:23 +0000 Subject: [PATCH 291/471] [master] Update dependencies from dotnet/core-setup (#2558) * Update dependencies from https://github.com/dotnet/core-setup build 20190620.05 - NETStandard.Library.Ref - 2.1.0-preview7-27820-05 - Microsoft.NETCore.App - 3.0.0-preview7-27820-05 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27820-05 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19318.18 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19319.6 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190620.06 - NETStandard.Library.Ref - 2.1.0-preview7-27820-06 - Microsoft.NETCore.App - 3.0.0-preview7-27820-06 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27820-06 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19318.18 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19319.6 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190620.07 - NETStandard.Library.Ref - 2.1.0-preview7-27820-07 - Microsoft.NETCore.App - 3.0.0-preview7-27820-07 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27820-07 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19318.18 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19319.6 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a507adaa5..b4f226312 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 581b8d13b3d8820f381cd3c09bcccaee38cd5d84 + a6d97ae21c572ecd5485c2979e8652a70908926a - + https://github.com/dotnet/core-setup - 581b8d13b3d8820f381cd3c09bcccaee38cd5d84 + a6d97ae21c572ecd5485c2979e8652a70908926a - + https://github.com/dotnet/core-setup - 581b8d13b3d8820f381cd3c09bcccaee38cd5d84 + a6d97ae21c572ecd5485c2979e8652a70908926a https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 8071d61e33a9626ef4c208e557c66fc5560a4bfd - + https://github.com/dotnet/winforms - 6970d10fef97fb3faf33cfa81224c1d8a6d10d52 + 490fa4b91a056f4461741647c98045de1c206b94 - + https://github.com/dotnet/wpf - 8c7ab1592b6c70e732106aeabf58f215d4b71c22 + 8a32ce0a944d4401d4d7d06ae675f4fb0b267cc9 diff --git a/eng/Versions.props b/eng/Versions.props index c2e04c382..20503cf2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19318.9 + 4.8.0-preview7.19318.18 - 3.0.0-preview7.19319.1 + 3.0.0-preview7.19319.6 @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27820-01 + 3.0.0-preview7-27820-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27820-01 + 2.1.0-preview7-27820-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27820-01 + 3.0.0-preview7-27820-07 $(MicrosoftWindowsDesktopAppPackageVersion) From 8361cb8c23c8e14f065f2fcde6590b28f74672ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 06:34:05 +0000 Subject: [PATCH 292/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190620.7 (#2559) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19320.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19320.7 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19320.7 - dotnet-watch - 3.0.0-preview7.19320.7 - dotnet-user-secrets - 3.0.0-preview7.19320.7 - dotnet-dev-certs - 3.0.0-preview7.19320.7 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4f226312..f15d94420 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup a6d97ae21c572ecd5485c2979e8652a70908926a - + https://github.com/aspnet/AspNetCore - 56ffc6b58210292a18f548bf4eddff193f73a4d6 + 495f52920c1b8bd685363a3e53038f9cb8ae086d - + https://github.com/aspnet/AspNetCore - 56ffc6b58210292a18f548bf4eddff193f73a4d6 + 495f52920c1b8bd685363a3e53038f9cb8ae086d - + https://github.com/aspnet/AspNetCore - 56ffc6b58210292a18f548bf4eddff193f73a4d6 + 495f52920c1b8bd685363a3e53038f9cb8ae086d - + https://github.com/aspnet/AspNetCore - 56ffc6b58210292a18f548bf4eddff193f73a4d6 + 495f52920c1b8bd685363a3e53038f9cb8ae086d - + https://github.com/aspnet/AspNetCore - 56ffc6b58210292a18f548bf4eddff193f73a4d6 + 495f52920c1b8bd685363a3e53038f9cb8ae086d - + https://github.com/aspnet/AspNetCore - 56ffc6b58210292a18f548bf4eddff193f73a4d6 + 495f52920c1b8bd685363a3e53038f9cb8ae086d https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 20503cf2f..47641f712 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19320.1 - 3.0.0-preview7.19320.1 - 3.0.0-preview7.19320.1 - 3.0.0-preview7.19320.1 - 3.0.0-preview7.19320.1 - 3.0.0-preview7.19320.1 + 3.0.0-preview7.19320.7 + 3.0.0-preview7.19320.7 + 3.0.0-preview7.19320.7 + 3.0.0-preview7.19320.7 + 3.0.0-preview7.19320.7 + 3.0.0-preview7.19320.7 From 6eecf3afb07d6d1cc6b2939783f01d5a010fe8a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 12:28:06 +0000 Subject: [PATCH 293/471] Update dependencies from https://github.com/dotnet/arcade build 20190620.1 (#2560) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19320.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f15d94420..d3327a6e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - bd50b2bcc787a8c62e2e114fb54704b645cc1c3a + b21c24996a73aa62b7a1ee69f546b9d2eb084f29 diff --git a/global.json b/global.json index 6c27ea1f2..9f58bd93f 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19319.25" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19320.1" } } From 5f52c3973c68080f0c130b928f0926655610a762 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 12:28:24 +0000 Subject: [PATCH 294/471] Update dependencies from https://github.com/dotnet/templating build 20190620.1 (#2561) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19320.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d3327a6e0..abc133606 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore 495f52920c1b8bd685363a3e53038f9cb8ae086d - + https://github.com/dotnet/templating - 7e43668b697884dcce1f78506cbecd5e94039c9e + cd8a65408312bf4a92de7e97948782f9f88471e6 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 47641f712..f4ef185c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19320.3 - 1.0.2-beta5.19319.1 + 1.0.2-beta5.19320.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From 2dc6403c848363e6b1207b00cbc9d433846ea278 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 12:40:44 +0000 Subject: [PATCH 295/471] Update dependencies from https://github.com/dotnet/toolset build 20190621.1 (#2562) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19321.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index abc133606..b68d4b94a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating cd8a65408312bf4a92de7e97948782f9f88471e6 - + https://github.com/dotnet/toolset - 0237082d1b7fca42771c2526c8f08dbd0fc65b68 + ef8c32930a24e93044cb33f91f854b309396f32e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f4ef185c8..1bea60dc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19320.9 + 3.0.100-preview7.19321.1 From 5289881e211789f87fdfe257a56c98c2f716c790 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 12:58:40 +0000 Subject: [PATCH 296/471] [master] Update dependencies from dotnet/toolset (#2563) * Update dependencies from https://github.com/dotnet/toolset build 20190621.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19321.2 * Update dependencies from https://github.com/dotnet/toolset build 20190621.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19321.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b68d4b94a..8536e6efd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating cd8a65408312bf4a92de7e97948782f9f88471e6 - + https://github.com/dotnet/toolset - ef8c32930a24e93044cb33f91f854b309396f32e + 1fd051939f67ea2ea573498c5292aab1ea318740 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 1bea60dc0..62278a430 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19321.1 + 3.0.100-preview7.19321.3 From ca6721e5cc5a320f91db550da41d090eb00e8667 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 13:32:00 +0000 Subject: [PATCH 297/471] [master] Update dependencies from dotnet/toolset (#2564) * Update dependencies from https://github.com/dotnet/toolset build 20190621.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19321.4 * Update dependencies from https://github.com/dotnet/toolset build 20190621.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19321.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8536e6efd..14c0a7766 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating cd8a65408312bf4a92de7e97948782f9f88471e6 - + https://github.com/dotnet/toolset - 1fd051939f67ea2ea573498c5292aab1ea318740 + 50694ae64d07fd669d1d9675c0b382234fcd4d50 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 62278a430..1bdabaff8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19321.3 + 3.0.100-preview7.19321.5 From 65f703c578ec5b13034264cb2c8b8ec96518d788 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 14:48:53 +0000 Subject: [PATCH 298/471] Update dependencies from https://github.com/dotnet/core-setup build 20190621.01 (#2565) - NETStandard.Library.Ref - 2.1.0-preview7-27821-01 - Microsoft.NETCore.App - 3.0.0-preview7-27821-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27821-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14c0a7766..93a3c8f2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - a6d97ae21c572ecd5485c2979e8652a70908926a + cd550cdcfa8df7d27896520b9473d034a3f3c9a2 - + https://github.com/dotnet/core-setup - a6d97ae21c572ecd5485c2979e8652a70908926a + cd550cdcfa8df7d27896520b9473d034a3f3c9a2 - + https://github.com/dotnet/core-setup - a6d97ae21c572ecd5485c2979e8652a70908926a + cd550cdcfa8df7d27896520b9473d034a3f3c9a2 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 1bdabaff8..1d41fb0fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27820-07 + 3.0.0-preview7-27821-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27820-07 + 2.1.0-preview7-27821-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27820-07 + 3.0.0-preview7-27821-01 $(MicrosoftWindowsDesktopAppPackageVersion) From 2609b63289d81bd58a5c0a21dbac6d37e1da7677 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 16:17:03 +0000 Subject: [PATCH 299/471] Update dependencies from https://github.com/dotnet/core-setup build 20190621.02 (#2566) - NETStandard.Library.Ref - 2.1.0-preview7-27821-02 - Microsoft.NETCore.App - 3.0.0-preview7-27821-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27821-02 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19319.7 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19319.12 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93a3c8f2e..89175c802 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - cd550cdcfa8df7d27896520b9473d034a3f3c9a2 + affd77517865aef5f6f82e6bdfc214e673d4ba61 - + https://github.com/dotnet/core-setup - cd550cdcfa8df7d27896520b9473d034a3f3c9a2 + affd77517865aef5f6f82e6bdfc214e673d4ba61 - + https://github.com/dotnet/core-setup - cd550cdcfa8df7d27896520b9473d034a3f3c9a2 + affd77517865aef5f6f82e6bdfc214e673d4ba61 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 8071d61e33a9626ef4c208e557c66fc5560a4bfd - + https://github.com/dotnet/winforms - 490fa4b91a056f4461741647c98045de1c206b94 + 470d73665c119e8bfcfacf991a95a94bf11c2bdb - + https://github.com/dotnet/wpf - 8a32ce0a944d4401d4d7d06ae675f4fb0b267cc9 + 3c74b6006fbaf364363cc7be128319e4b1717915 diff --git a/eng/Versions.props b/eng/Versions.props index 1d41fb0fc..1da155266 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19318.18 + 4.8.0-preview7.19319.7 - 3.0.0-preview7.19319.6 + 3.0.0-preview7.19319.12 @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27821-01 + 3.0.0-preview7-27821-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27821-01 + 2.1.0-preview7-27821-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27821-01 + 3.0.0-preview7-27821-02 $(MicrosoftWindowsDesktopAppPackageVersion) From 2d41d3b53972714fc9417f761ad0cb3e1ce9dc75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 16:32:28 +0000 Subject: [PATCH 300/471] Update dependencies from https://github.com/dotnet/core-setup build 20190621.03 (#2567) - NETStandard.Library.Ref - 2.1.0-preview7-27821-03 - Microsoft.NETCore.App - 3.0.0-preview7-27821-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27821-03 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89175c802..b4f05e8e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup affd77517865aef5f6f82e6bdfc214e673d4ba61 - + https://github.com/dotnet/core-setup affd77517865aef5f6f82e6bdfc214e673d4ba61 - + https://github.com/dotnet/core-setup affd77517865aef5f6f82e6bdfc214e673d4ba61 diff --git a/eng/Versions.props b/eng/Versions.props index 1da155266..026b8b4fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27821-02 + 3.0.0-preview7-27821-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27821-02 + 2.1.0-preview7-27821-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27821-02 + 3.0.0-preview7-27821-03 $(MicrosoftWindowsDesktopAppPackageVersion) From a74239bb0be75cffb59bd50643f989de1d8b863c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 17:00:45 +0000 Subject: [PATCH 301/471] Update dependencies from https://github.com/dotnet/toolset build 20190621.6 (#2568) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19321.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4f05e8e6..49ecde80e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating cd8a65408312bf4a92de7e97948782f9f88471e6 - + https://github.com/dotnet/toolset - 50694ae64d07fd669d1d9675c0b382234fcd4d50 + 420548e8013e1acf9e67dc99719e89c23b761e2d https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 026b8b4fe..4c60b4f39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19321.5 + 3.0.100-preview7.19321.6 From 2f675bff1f4bf5d0551328d15e526aa7cef2ea59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 17:01:26 +0000 Subject: [PATCH 302/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190621.1 (#2569) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19321.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19321.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19321.1 - dotnet-watch - 3.0.0-preview7.19321.1 - dotnet-user-secrets - 3.0.0-preview7.19321.1 - dotnet-dev-certs - 3.0.0-preview7.19321.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49ecde80e..56413a4fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup affd77517865aef5f6f82e6bdfc214e673d4ba61 - + https://github.com/aspnet/AspNetCore - 495f52920c1b8bd685363a3e53038f9cb8ae086d + edf8bbe65de3e25dd1db64174865683146ba0af5 - + https://github.com/aspnet/AspNetCore - 495f52920c1b8bd685363a3e53038f9cb8ae086d + edf8bbe65de3e25dd1db64174865683146ba0af5 - + https://github.com/aspnet/AspNetCore - 495f52920c1b8bd685363a3e53038f9cb8ae086d + edf8bbe65de3e25dd1db64174865683146ba0af5 - + https://github.com/aspnet/AspNetCore - 495f52920c1b8bd685363a3e53038f9cb8ae086d + edf8bbe65de3e25dd1db64174865683146ba0af5 - + https://github.com/aspnet/AspNetCore - 495f52920c1b8bd685363a3e53038f9cb8ae086d + edf8bbe65de3e25dd1db64174865683146ba0af5 - + https://github.com/aspnet/AspNetCore - 495f52920c1b8bd685363a3e53038f9cb8ae086d + edf8bbe65de3e25dd1db64174865683146ba0af5 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 4c60b4f39..ab029d64c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19320.7 - 3.0.0-preview7.19320.7 - 3.0.0-preview7.19320.7 - 3.0.0-preview7.19320.7 - 3.0.0-preview7.19320.7 - 3.0.0-preview7.19320.7 + 3.0.0-preview7.19321.1 + 3.0.0-preview7.19321.1 + 3.0.0-preview7.19321.1 + 3.0.0-preview7.19321.1 + 3.0.0-preview7.19321.1 + 3.0.0-preview7.19321.1 From 93bba1866f6771402ef30aaac744e7c32592c9c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 17:55:28 +0000 Subject: [PATCH 303/471] [master] Update dependencies from dotnet/cli (#2571) * Update dependencies from https://github.com/dotnet/cli build 20190621.2 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19321.2 * Update dependencies from https://github.com/dotnet/cli build 20190621.3 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19321.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56413a4fe..6c343bced 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 260f37383a4974b478cba2ba67ac7908578f5b07 - + https://github.com/dotnet/cli - 8071d61e33a9626ef4c208e557c66fc5560a4bfd + e01a28e07d10a96016f42724e65516f1d35501f7 diff --git a/eng/Versions.props b/eng/Versions.props index ab029d64c..ccc7cde80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19320.3 + 3.0.100-preview7.19321.3 1.0.2-beta5.19320.1 From 67d69eabad8de068d57e8c2d7f4fbc6cbb507d3c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 17:59:24 +0000 Subject: [PATCH 304/471] Update dependencies from https://github.com/dotnet/core-setup build 20190621.04 (#2572) - NETStandard.Library.Ref - 2.1.0-preview7-27821-04 - Microsoft.NETCore.App - 3.0.0-preview7-27821-04 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27821-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c343bced..e90229838 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - affd77517865aef5f6f82e6bdfc214e673d4ba61 + f5637f1e79f69f0045212a61843ec1daecaea1e6 - + https://github.com/dotnet/core-setup - affd77517865aef5f6f82e6bdfc214e673d4ba61 + f5637f1e79f69f0045212a61843ec1daecaea1e6 - + https://github.com/dotnet/core-setup - affd77517865aef5f6f82e6bdfc214e673d4ba61 + f5637f1e79f69f0045212a61843ec1daecaea1e6 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index ccc7cde80..ed7ef9bb0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27821-03 + 3.0.0-preview7-27821-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27821-03 + 2.1.0-preview7-27821-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27821-03 + 3.0.0-preview7-27821-04 $(MicrosoftWindowsDesktopAppPackageVersion) From 6bfa64772bd158ebfe4b9311d896bb91915bb2d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 19:25:55 +0000 Subject: [PATCH 305/471] [master] Update dependencies from dotnet/cli (#2573) * Update dependencies from https://github.com/dotnet/cli build 20190621.1 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19321.1 * Update dependencies from https://github.com/dotnet/cli build 20190621.4 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19321.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e90229838..54d2c1006 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 260f37383a4974b478cba2ba67ac7908578f5b07 - + https://github.com/dotnet/cli - e01a28e07d10a96016f42724e65516f1d35501f7 + 821189d4aef240bb53e739e4e836fd38308c26e4 diff --git a/eng/Versions.props b/eng/Versions.props index ed7ef9bb0..b528eba11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19321.3 + 3.0.100-preview7.19321.4 1.0.2-beta5.19320.1 From 60650d8355307de5c0225c21f8fea25ab42a5973 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2019 03:08:58 +0000 Subject: [PATCH 306/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190621.9 (#2574) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19321.9 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19321.9 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19321.9 - dotnet-watch - 3.0.0-preview7.19321.9 - dotnet-user-secrets - 3.0.0-preview7.19321.9 - dotnet-dev-certs - 3.0.0-preview7.19321.9 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54d2c1006..9f578ec17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup f5637f1e79f69f0045212a61843ec1daecaea1e6 - + https://github.com/aspnet/AspNetCore - edf8bbe65de3e25dd1db64174865683146ba0af5 + 4ef204e13b88c0734e0e94a1cc4c0ef05f40849e - + https://github.com/aspnet/AspNetCore - edf8bbe65de3e25dd1db64174865683146ba0af5 + 4ef204e13b88c0734e0e94a1cc4c0ef05f40849e - + https://github.com/aspnet/AspNetCore - edf8bbe65de3e25dd1db64174865683146ba0af5 + 4ef204e13b88c0734e0e94a1cc4c0ef05f40849e - + https://github.com/aspnet/AspNetCore - edf8bbe65de3e25dd1db64174865683146ba0af5 + 4ef204e13b88c0734e0e94a1cc4c0ef05f40849e - + https://github.com/aspnet/AspNetCore - edf8bbe65de3e25dd1db64174865683146ba0af5 + 4ef204e13b88c0734e0e94a1cc4c0ef05f40849e - + https://github.com/aspnet/AspNetCore - edf8bbe65de3e25dd1db64174865683146ba0af5 + 4ef204e13b88c0734e0e94a1cc4c0ef05f40849e https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index b528eba11..57cc30cc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19321.1 - 3.0.0-preview7.19321.1 - 3.0.0-preview7.19321.1 - 3.0.0-preview7.19321.1 - 3.0.0-preview7.19321.1 - 3.0.0-preview7.19321.1 + 3.0.0-preview7.19321.9 + 3.0.0-preview7.19321.9 + 3.0.0-preview7.19321.9 + 3.0.0-preview7.19321.9 + 3.0.0-preview7.19321.9 + 3.0.0-preview7.19321.9 From 65e7ee22ba06b1292391d9b69331f2162813a2e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2019 03:27:56 +0000 Subject: [PATCH 307/471] Update dependencies from https://github.com/dotnet/core-setup build 20190621.06 (#2575) - NETStandard.Library.Ref - 2.1.0-preview7-27821-06 - Microsoft.NETCore.App - 3.0.0-preview7-27821-06 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27821-06 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f578ec17..38edd325c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - f5637f1e79f69f0045212a61843ec1daecaea1e6 + 1be0aae259c6ba7919a2aee6009c92f5108af912 - + https://github.com/dotnet/core-setup - f5637f1e79f69f0045212a61843ec1daecaea1e6 + 1be0aae259c6ba7919a2aee6009c92f5108af912 - + https://github.com/dotnet/core-setup - f5637f1e79f69f0045212a61843ec1daecaea1e6 + 1be0aae259c6ba7919a2aee6009c92f5108af912 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 57cc30cc9..6975cc43e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27821-04 + 3.0.0-preview7-27821-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27821-04 + 2.1.0-preview7-27821-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27821-04 + 3.0.0-preview7-27821-06 $(MicrosoftWindowsDesktopAppPackageVersion) From b04fe734c8534349de88b049021042a147cdcca6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2019 04:30:26 +0000 Subject: [PATCH 308/471] Update dependencies from https://github.com/dotnet/cli build 20190621.5 (#2576) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19321.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38edd325c..5ce6abc4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 260f37383a4974b478cba2ba67ac7908578f5b07 - + https://github.com/dotnet/cli - 821189d4aef240bb53e739e4e836fd38308c26e4 + 9e8a03aec2dea6d99cb499eea04fd1252e6ab242 diff --git a/eng/Versions.props b/eng/Versions.props index 6975cc43e..36fbe6719 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19321.4 + 3.0.100-preview7.19321.5 1.0.2-beta5.19320.1 From cc01df184a7dbc54e3f345a5834b058bf255e0c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2019 04:43:21 +0000 Subject: [PATCH 309/471] Update dependencies from https://github.com/dotnet/core-setup build 20190621.07 (#2577) - NETStandard.Library.Ref - 2.1.0-preview7-27821-07 - Microsoft.NETCore.App - 3.0.0-preview7-27821-07 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27821-07 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ce6abc4a..21f45062c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup 1be0aae259c6ba7919a2aee6009c92f5108af912 - + https://github.com/dotnet/core-setup 1be0aae259c6ba7919a2aee6009c92f5108af912 - + https://github.com/dotnet/core-setup 1be0aae259c6ba7919a2aee6009c92f5108af912 diff --git a/eng/Versions.props b/eng/Versions.props index 36fbe6719..babc10763 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27821-06 + 3.0.0-preview7-27821-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27821-06 + 2.1.0-preview7-27821-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27821-06 + 3.0.0-preview7-27821-07 $(MicrosoftWindowsDesktopAppPackageVersion) From b097cc236fed6f030450ec6e01389a654cad99d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2019 09:08:10 +0000 Subject: [PATCH 310/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190622.1 (#2578) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19322.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19322.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19322.1 - dotnet-watch - 3.0.0-preview7.19322.1 - dotnet-user-secrets - 3.0.0-preview7.19322.1 - dotnet-dev-certs - 3.0.0-preview7.19322.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21f45062c..2716abe4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 1be0aae259c6ba7919a2aee6009c92f5108af912 - + https://github.com/aspnet/AspNetCore - 4ef204e13b88c0734e0e94a1cc4c0ef05f40849e + 6ecfdf2c49ffe25ebc3e8872d186bb85fe8e26b9 - + https://github.com/aspnet/AspNetCore - 4ef204e13b88c0734e0e94a1cc4c0ef05f40849e + 6ecfdf2c49ffe25ebc3e8872d186bb85fe8e26b9 - + https://github.com/aspnet/AspNetCore - 4ef204e13b88c0734e0e94a1cc4c0ef05f40849e + 6ecfdf2c49ffe25ebc3e8872d186bb85fe8e26b9 - + https://github.com/aspnet/AspNetCore - 4ef204e13b88c0734e0e94a1cc4c0ef05f40849e + 6ecfdf2c49ffe25ebc3e8872d186bb85fe8e26b9 - + https://github.com/aspnet/AspNetCore - 4ef204e13b88c0734e0e94a1cc4c0ef05f40849e + 6ecfdf2c49ffe25ebc3e8872d186bb85fe8e26b9 - + https://github.com/aspnet/AspNetCore - 4ef204e13b88c0734e0e94a1cc4c0ef05f40849e + 6ecfdf2c49ffe25ebc3e8872d186bb85fe8e26b9 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index babc10763..b68f3e7a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19321.9 - 3.0.0-preview7.19321.9 - 3.0.0-preview7.19321.9 - 3.0.0-preview7.19321.9 - 3.0.0-preview7.19321.9 - 3.0.0-preview7.19321.9 + 3.0.0-preview7.19322.1 + 3.0.0-preview7.19322.1 + 3.0.0-preview7.19322.1 + 3.0.0-preview7.19322.1 + 3.0.0-preview7.19322.1 + 3.0.0-preview7.19322.1 From 6393c9f42edf3ba3c58ae02d4aa88a3164eb8497 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2019 12:29:08 +0000 Subject: [PATCH 311/471] Update dependencies from https://github.com/dotnet/arcade build 20190621.75 (#2579) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19321.75 --- eng/Version.Details.xml | 4 +-- eng/common/cross/build-rootfs.sh | 1 + eng/common/templates/job/execute-sdl.yml | 7 +++++ .../templates/job/publish-build-assets.yml | 23 +++++---------- .../templates/post-build/post-build.yml | 8 +++++ .../post-build/setup-maestro-vars.yml | 29 +++++++++---------- eng/common/tools.sh | 4 +-- global.json | 2 +- 8 files changed, 42 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2716abe4f..b66a7a4c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - b21c24996a73aa62b7a1ee69f546b9d2eb084f29 + fcee3d5c2d6180bec19c4ae50234771c436b4b52 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 7c4e12265..d7d5d7d5f 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -203,6 +203,7 @@ if [[ "$__LinuxCodeName" == "alpine" ]]; then -X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main \ -X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community \ -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \ + -X http://dl-cdn.alpinelinux.org/alpine/edge/main \ -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \ add $__AlpinePackages rm -r $__ApkToolsDir diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 2f669fd95..acb4c55d7 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -13,6 +13,13 @@ jobs: steps: - checkout: self clean: true + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + downloadType: specific files + matchingPattern: "**" + downloadPath: $(Build.SourcesDirectory)\artifacts - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' - task: NuGetCommand@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 014422168..ff7346163 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -60,27 +60,18 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - task: powershell@2 - displayName: Create BARBuildId Artifact + displayName: Create ReleaseConfigs Artifact inputs: targetType: inline script: | - Add-Content -Path "$(Build.StagingDirectory)/BARBuildId.txt" -Value $(BARBuildId) - - task: powershell@2 - displayName: Create Channels Artifact - inputs: - targetType: inline - script: | - Add-Content -Path "$(Build.StagingDirectory)/Channels.txt" -Value "$(DefaultChannels)" + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsInternalBuild) + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - task: PublishBuildArtifacts@1 - displayName: Publish BAR BuildId to VSTS + displayName: Publish ReleaseConfigs Artifact inputs: - PathtoPublish: '$(Build.StagingDirectory)/BARBuildId.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - task: PublishBuildArtifacts@1 - displayName: Publish Channels to VSTS - inputs: - PathtoPublish: '$(Build.StagingDirectory)/Channels.txt' + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' PublishLocation: Container ArtifactName: ReleaseConfigs - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 6b74475a6..2c411dd00 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -2,6 +2,9 @@ parameters: enableSourceLinkValidation: true enableSigningValidation: true enableSymbolValidation: true + SDLValidationParameters: + enable: false + params: '' stages: - stage: validate @@ -52,6 +55,11 @@ stages: -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) + - ${{ if eq(parameters.SDLValidationParameters.enable, 'true') }}: + - template: /eng/common/templates/job/execute-sdl.yml + parameters: + additionalParameters: ${{ parameters.SDLValidationParameters.params }} + - template: \eng\common\templates\post-build\channels\public-dev-release.yml parameters: enableSymbolValidation: ${{ parameters.enableSymbolValidation }} diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 9de585a94..0eddd6cd3 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -17,22 +17,21 @@ jobs: targetType: inline script: | # This is needed to make Write-PipelineSetVariable works in this context - if ($env:BUILD_BUILDNUMBER -ne "" -and $env:BUILD_BUILDNUMBER -ne $null) { - $ci = $true + $ci = $true - . "$(Build.SourcesDirectory)/eng/common/tools.ps1" - - $BarId = Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/BARBuildId.txt" - Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId + . "$(Build.SourcesDirectory)/eng/common/tools.ps1" - Write-Host "Asked Write-PipelineSetVariable to create BARBuildId with value '$BarId'" + $Content = Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" - $Channels = "" - Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/Channels.txt" | ForEach-Object { $Channels += "$_ ," } - Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels" + $BarId = $Content | Select -Index 0 - Write-Host "Asked Write-PipelineSetVariable to create InitialChannels with value '$Channels'" - } - else { - Write-Host "This step can only be run in an Azure DevOps CI environment." - } + $Channels = "" + $Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," } + + $IsInternalBuild = $Content | Select -Index 2 + $IsStableBuild = $Content | Select -Index 3 + + Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId + Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels" + Write-PipelineSetVariable -Name 'IsInternalBuild' -Value $IsInternalBuild + Write-PipelineSetVariable -Name 'IsStableBuild' -Value $IsStableBuild diff --git a/eng/common/tools.sh b/eng/common/tools.sh index f39aab57b..70d92cf85 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -356,11 +356,11 @@ function MSBuild-Core { } } -. "$scriptroot/pipeline-logging-functions.sh" - ResolvePath "${BASH_SOURCE[0]}" _script_dir=`dirname "$_ResolvePath"` +. "$_script_dir/pipeline-logging-functions.sh" + eng_root=`cd -P "$_script_dir/.." && pwd` repo_root=`cd -P "$_script_dir/../.." && pwd` artifacts_dir="$repo_root/artifacts" diff --git a/global.json b/global.json index 9f58bd93f..74ab6b527 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19320.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19321.75" } } From 7ff1b17c6e816367a693800f79f6d57224148acb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2019 12:44:55 +0000 Subject: [PATCH 312/471] [master] Update dependencies from dotnet/toolset (#2581) * Update dependencies from https://github.com/dotnet/toolset build 20190622.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19322.1 * Update dependencies from https://github.com/dotnet/toolset build 20190622.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19322.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b66a7a4c6..6f5ba3331 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating cd8a65408312bf4a92de7e97948782f9f88471e6 - + https://github.com/dotnet/toolset - 420548e8013e1acf9e67dc99719e89c23b761e2d + 035634fd052af9b8858017cbd15435bfd3611a07 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b68f3e7a8..f770ab060 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19321.6 + 3.0.100-preview7.19322.2 From d61df7336fbbc83620954b5a12654cbc105de281 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2019 13:02:32 +0000 Subject: [PATCH 313/471] Update dependencies from https://github.com/dotnet/toolset build 20190622.3 (#2582) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19322.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f5ba3331..da613aacb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating cd8a65408312bf4a92de7e97948782f9f88471e6 - + https://github.com/dotnet/toolset - 035634fd052af9b8858017cbd15435bfd3611a07 + d679caa52e3c910997b804a47e2af99546774cee https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f770ab060..db3d0f79f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19322.2 + 3.0.100-preview7.19322.3 From ed5e6c3fcd848608d4d822edf33d9e6daa879aea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2019 13:33:25 +0000 Subject: [PATCH 314/471] [master] Update dependencies from dotnet/toolset (#2584) * Update dependencies from https://github.com/dotnet/toolset build 20190622.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19322.4 * Update dependencies from https://github.com/dotnet/toolset build 20190622.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19322.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da613aacb..60d26d697 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating cd8a65408312bf4a92de7e97948782f9f88471e6 - + https://github.com/dotnet/toolset - d679caa52e3c910997b804a47e2af99546774cee + 0510fb8aeb43cb1d71c5176701a40ca64156280a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index db3d0f79f..352fe369f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19322.3 + 3.0.100-preview7.19322.5 From 4cc1518bb3e9b6ccd5cacebdcabbb901803d7a52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2019 13:55:40 +0000 Subject: [PATCH 315/471] [master] Update dependencies from dotnet/cli (#2583) * Update dependencies from https://github.com/dotnet/cli build 20190622.1 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19322.1 * Update dependencies from https://github.com/dotnet/cli build 20190622.2 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19322.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60d26d697..ffc887b8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 260f37383a4974b478cba2ba67ac7908578f5b07 - + https://github.com/dotnet/cli - 9e8a03aec2dea6d99cb499eea04fd1252e6ab242 + 53f8c7a63790ebe0a6edace728c79cff2fd372ac diff --git a/eng/Versions.props b/eng/Versions.props index 352fe369f..2a1df4073 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19321.5 + 3.0.100-preview7.19322.2 1.0.2-beta5.19320.1 From b719d181ba7b9687a520668f215c6a00c34b21db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2019 14:44:50 +0000 Subject: [PATCH 316/471] Update dependencies from https://github.com/dotnet/core-setup build 20190622.01 (#2585) - NETStandard.Library.Ref - 2.1.0-preview7-27822-01 - Microsoft.NETCore.App - 3.0.0-preview7-27822-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27822-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffc887b8d..b8557e38f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 1be0aae259c6ba7919a2aee6009c92f5108af912 + ee9575062ec9d0b3d5b64e3433b32f8fe287624d - + https://github.com/dotnet/core-setup - 1be0aae259c6ba7919a2aee6009c92f5108af912 + ee9575062ec9d0b3d5b64e3433b32f8fe287624d - + https://github.com/dotnet/core-setup - 1be0aae259c6ba7919a2aee6009c92f5108af912 + ee9575062ec9d0b3d5b64e3433b32f8fe287624d https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 2a1df4073..e071c34df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27821-07 + 3.0.0-preview7-27822-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27821-07 + 2.1.0-preview7-27822-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27821-07 + 3.0.0-preview7-27822-01 $(MicrosoftWindowsDesktopAppPackageVersion) From b81caf13a371aa7aae0325d3e82d5099a85160b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2019 15:55:45 +0000 Subject: [PATCH 317/471] Update dependencies from https://github.com/dotnet/core-setup build 20190622.02 (#2586) - NETStandard.Library.Ref - 2.1.0-preview7-27822-02 - Microsoft.NETCore.App - 3.0.0-preview7-27822-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27822-02 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19319.11 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19321.1 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8557e38f..55220af00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - ee9575062ec9d0b3d5b64e3433b32f8fe287624d + 48ea4f274fad7b0e973cbf2727978b86b9c82065 - + https://github.com/dotnet/core-setup - ee9575062ec9d0b3d5b64e3433b32f8fe287624d + 48ea4f274fad7b0e973cbf2727978b86b9c82065 - + https://github.com/dotnet/core-setup - ee9575062ec9d0b3d5b64e3433b32f8fe287624d + 48ea4f274fad7b0e973cbf2727978b86b9c82065 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 53f8c7a63790ebe0a6edace728c79cff2fd372ac - + https://github.com/dotnet/winforms - 470d73665c119e8bfcfacf991a95a94bf11c2bdb + ded88b1d6d116235c7434cb54e5ba0d2494321db - + https://github.com/dotnet/wpf - 3c74b6006fbaf364363cc7be128319e4b1717915 + b8fba8acae0192696a69ed859d2e01b1f2eefe65 diff --git a/eng/Versions.props b/eng/Versions.props index e071c34df..d3a81613d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19319.7 + 4.8.0-preview7.19319.11 - 3.0.0-preview7.19319.12 + 3.0.0-preview7.19321.1 @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27822-01 + 3.0.0-preview7-27822-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27822-01 + 2.1.0-preview7-27822-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27822-01 + 3.0.0-preview7-27822-02 $(MicrosoftWindowsDesktopAppPackageVersion) From e971020266d3fbdd72138381b4dcf8ed1777d90d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2019 17:04:00 +0000 Subject: [PATCH 318/471] Update dependencies from https://github.com/dotnet/core-setup build 20190622.03 (#2587) - NETStandard.Library.Ref - 2.1.0-preview7-27822-03 - Microsoft.NETCore.App - 3.0.0-preview7-27822-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27822-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55220af00..4580048f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 48ea4f274fad7b0e973cbf2727978b86b9c82065 + b9c5f9d5137bb31a79a780619ec172213b3d8b06 - + https://github.com/dotnet/core-setup - 48ea4f274fad7b0e973cbf2727978b86b9c82065 + b9c5f9d5137bb31a79a780619ec172213b3d8b06 - + https://github.com/dotnet/core-setup - 48ea4f274fad7b0e973cbf2727978b86b9c82065 + b9c5f9d5137bb31a79a780619ec172213b3d8b06 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index d3a81613d..09fcb2f13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27822-02 + 3.0.0-preview7-27822-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27822-02 + 2.1.0-preview7-27822-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27822-02 + 3.0.0-preview7-27822-03 $(MicrosoftWindowsDesktopAppPackageVersion) From b7a1d191ae07aba5e4136ca19b8945e2db84f33d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2019 17:39:27 +0000 Subject: [PATCH 319/471] Update dependencies from https://github.com/dotnet/core-setup build 20190622.04 (#2588) - NETStandard.Library.Ref - 2.1.0-preview7-27822-04 - Microsoft.NETCore.App - 3.0.0-preview7-27822-04 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27822-04 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4580048f5..edc05d985 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup b9c5f9d5137bb31a79a780619ec172213b3d8b06 - + https://github.com/dotnet/core-setup b9c5f9d5137bb31a79a780619ec172213b3d8b06 - + https://github.com/dotnet/core-setup b9c5f9d5137bb31a79a780619ec172213b3d8b06 diff --git a/eng/Versions.props b/eng/Versions.props index 09fcb2f13..354474138 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27822-03 + 3.0.0-preview7-27822-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27822-03 + 2.1.0-preview7-27822-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27822-03 + 3.0.0-preview7-27822-04 $(MicrosoftWindowsDesktopAppPackageVersion) From db70fd20b637ad2f7139c45a5f871403cfb44ea4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2019 03:04:43 +0000 Subject: [PATCH 320/471] Update dependencies from https://github.com/dotnet/core-setup build 20190622.05 (#2589) - NETStandard.Library.Ref - 2.1.0-preview7-27822-05 - Microsoft.NETCore.App - 3.0.0-preview7-27822-05 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27822-05 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edc05d985..9b4a8d94e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - b9c5f9d5137bb31a79a780619ec172213b3d8b06 + 1af2ba41a56e09064091dc82264057289b56bd15 - + https://github.com/dotnet/core-setup - b9c5f9d5137bb31a79a780619ec172213b3d8b06 + 1af2ba41a56e09064091dc82264057289b56bd15 - + https://github.com/dotnet/core-setup - b9c5f9d5137bb31a79a780619ec172213b3d8b06 + 1af2ba41a56e09064091dc82264057289b56bd15 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 354474138..faddab46d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27822-04 + 3.0.0-preview7-27822-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27822-04 + 2.1.0-preview7-27822-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27822-04 + 3.0.0-preview7-27822-05 $(MicrosoftWindowsDesktopAppPackageVersion) From 7071e8a81870b36f4586753c484a4ff070760513 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2019 05:25:07 +0000 Subject: [PATCH 321/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190622.3 (#2590) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19322.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19322.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19322.3 - dotnet-watch - 3.0.0-preview7.19322.3 - dotnet-user-secrets - 3.0.0-preview7.19322.3 - dotnet-dev-certs - 3.0.0-preview7.19322.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b4a8d94e..0874d5f32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 1af2ba41a56e09064091dc82264057289b56bd15 - + https://github.com/aspnet/AspNetCore - 6ecfdf2c49ffe25ebc3e8872d186bb85fe8e26b9 + 6761dec9c69ffb4cd5b14a0a663ab73aa01fc7e2 - + https://github.com/aspnet/AspNetCore - 6ecfdf2c49ffe25ebc3e8872d186bb85fe8e26b9 + 6761dec9c69ffb4cd5b14a0a663ab73aa01fc7e2 - + https://github.com/aspnet/AspNetCore - 6ecfdf2c49ffe25ebc3e8872d186bb85fe8e26b9 + 6761dec9c69ffb4cd5b14a0a663ab73aa01fc7e2 - + https://github.com/aspnet/AspNetCore - 6ecfdf2c49ffe25ebc3e8872d186bb85fe8e26b9 + 6761dec9c69ffb4cd5b14a0a663ab73aa01fc7e2 - + https://github.com/aspnet/AspNetCore - 6ecfdf2c49ffe25ebc3e8872d186bb85fe8e26b9 + 6761dec9c69ffb4cd5b14a0a663ab73aa01fc7e2 - + https://github.com/aspnet/AspNetCore - 6ecfdf2c49ffe25ebc3e8872d186bb85fe8e26b9 + 6761dec9c69ffb4cd5b14a0a663ab73aa01fc7e2 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index faddab46d..29b3fa834 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19322.1 - 3.0.0-preview7.19322.1 - 3.0.0-preview7.19322.1 - 3.0.0-preview7.19322.1 - 3.0.0-preview7.19322.1 - 3.0.0-preview7.19322.1 + 3.0.0-preview7.19322.3 + 3.0.0-preview7.19322.3 + 3.0.0-preview7.19322.3 + 3.0.0-preview7.19322.3 + 3.0.0-preview7.19322.3 + 3.0.0-preview7.19322.3 From 4693c268614b5ac4b1e804b6ce90d00dc0de3e85 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2019 06:30:23 +0000 Subject: [PATCH 322/471] Update dependencies from https://github.com/dotnet/cli build 20190622.3 (#2591) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19322.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0874d5f32..efeda99a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 260f37383a4974b478cba2ba67ac7908578f5b07 - + https://github.com/dotnet/cli - 53f8c7a63790ebe0a6edace728c79cff2fd372ac + 27e57fd31f725cbe14880631ff2234b06557e30c diff --git a/eng/Versions.props b/eng/Versions.props index 29b3fa834..970abebed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19322.2 + 3.0.100-preview7.19322.3 1.0.2-beta5.19320.1 From 6e5ca5e819355f77d593822fe35ca710ac781374 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2019 12:28:27 +0000 Subject: [PATCH 323/471] [master] Update dependencies from dotnet/templating (#2580) * Update dependencies from https://github.com/dotnet/templating build 20190621.2 - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19321.2 * Update dependencies from https://github.com/dotnet/templating build 20190622.1 - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19322.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efeda99a0..b7d010604 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore 6761dec9c69ffb4cd5b14a0a663ab73aa01fc7e2 - + https://github.com/dotnet/templating - cd8a65408312bf4a92de7e97948782f9f88471e6 + 03b89264a9744a58359b0b79b9af2e7275e93962 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 970abebed..650dc17f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19322.3 - 1.0.2-beta5.19320.1 + 1.0.2-beta5.19322.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From 3c1fb16fc5b6c099390f1b1379610a610635b8d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2019 12:29:23 +0000 Subject: [PATCH 324/471] Update dependencies from https://github.com/dotnet/arcade build 20190622.2 (#2592) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19322.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7d010604..ece4a58ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - fcee3d5c2d6180bec19c4ae50234771c436b4b52 + 48aed493ffa093728bc9ffd17be0e5957f77aade diff --git a/global.json b/global.json index 74ab6b527..6ddb6aca3 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19321.75" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19322.2" } } From 3e6a66b185fdb48084b7fb79f7c1a12b113c8c1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2019 12:39:18 +0000 Subject: [PATCH 325/471] Update dependencies from https://github.com/dotnet/toolset build 20190623.1 (#2593) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19323.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ece4a58ca..80ea432c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 03b89264a9744a58359b0b79b9af2e7275e93962 - + https://github.com/dotnet/toolset - 0510fb8aeb43cb1d71c5176701a40ca64156280a + f274526247d3e0093c45b42295510d3bd7876357 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 650dc17f0..6d6659718 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19322.5 + 3.0.100-preview7.19323.1 From 26f3192c5cfa7bb27a73288840819d89e1cc9374 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2019 12:55:14 +0000 Subject: [PATCH 326/471] [master] Update dependencies from dotnet/toolset (#2594) * Update dependencies from https://github.com/dotnet/toolset build 20190623.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19323.2 * Update dependencies from https://github.com/dotnet/toolset build 20190623.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19323.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80ea432c2..4cd707d7c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 03b89264a9744a58359b0b79b9af2e7275e93962 - + https://github.com/dotnet/toolset - f274526247d3e0093c45b42295510d3bd7876357 + 02ccd07977228c16e9c71db9f1fde15cf0205e14 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6d6659718..6c02b9558 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19323.1 + 3.0.100-preview7.19323.3 From ad6d52cd987a2f1d65f90fd637a2c2ee478f29ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2019 13:25:41 +0000 Subject: [PATCH 327/471] Update dependencies from https://github.com/dotnet/toolset build 20190623.4 (#2595) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19323.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cd707d7c..9e4c3e86c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 03b89264a9744a58359b0b79b9af2e7275e93962 - + https://github.com/dotnet/toolset - 02ccd07977228c16e9c71db9f1fde15cf0205e14 + 55e0d6661fbd4f76b54622445015ab0ade185afe https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6c02b9558..4554c8177 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19323.3 + 3.0.100-preview7.19323.4 From 5ff0c5bcdd5c1197b44fa518807f5d5de56ce7a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2019 13:30:23 +0000 Subject: [PATCH 328/471] Update dependencies from https://github.com/dotnet/cli build 20190623.1 (#2596) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19323.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e4c3e86c..06b397ad4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 260f37383a4974b478cba2ba67ac7908578f5b07 - + https://github.com/dotnet/cli - 27e57fd31f725cbe14880631ff2234b06557e30c + 4c8ad316395300930fb23731feaac6773aa67654 diff --git a/eng/Versions.props b/eng/Versions.props index 4554c8177..c277f9716 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19322.3 + 3.0.100-preview7.19323.1 1.0.2-beta5.19322.1 From f28a5e5b5a576ea56767cc0d369c706a0827d2f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2019 13:42:54 +0000 Subject: [PATCH 329/471] Update dependencies from https://github.com/dotnet/toolset build 20190623.5 (#2597) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19323.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06b397ad4..31c90efe8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 03b89264a9744a58359b0b79b9af2e7275e93962 - + https://github.com/dotnet/toolset - 55e0d6661fbd4f76b54622445015ab0ade185afe + 60ab71ea44f69ec6f3ab0bed427d6f4aeb5bd7a6 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c277f9716..ae437fa95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19323.4 + 3.0.100-preview7.19323.5 From 1ae5f5517e92913000d393cd1914f0c8c6a5959e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2019 14:55:46 +0000 Subject: [PATCH 330/471] Update dependencies from https://github.com/dotnet/core-setup build 20190623.01 (#2598) - NETStandard.Library.Ref - 2.1.0-preview7-27823-01 - Microsoft.NETCore.App - 3.0.0-preview7-27823-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27823-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31c90efe8..2cb9cc4dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 1af2ba41a56e09064091dc82264057289b56bd15 + e652098d2019210a77e1abcbd7920015bc133cfd - + https://github.com/dotnet/core-setup - 1af2ba41a56e09064091dc82264057289b56bd15 + e652098d2019210a77e1abcbd7920015bc133cfd - + https://github.com/dotnet/core-setup - 1af2ba41a56e09064091dc82264057289b56bd15 + e652098d2019210a77e1abcbd7920015bc133cfd https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index ae437fa95..391626841 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27822-05 + 3.0.0-preview7-27823-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27822-05 + 2.1.0-preview7-27823-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27822-05 + 3.0.0-preview7-27823-01 $(MicrosoftWindowsDesktopAppPackageVersion) From fab3331ce71a92ce4fd7075a2ce532561441a51f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2019 16:15:34 +0000 Subject: [PATCH 331/471] Update dependencies from https://github.com/dotnet/core-setup build 20190623.02 (#2599) - NETStandard.Library.Ref - 2.1.0-preview7-27823-02 - Microsoft.NETCore.App - 3.0.0-preview7-27823-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27823-02 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19320.7 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19322.1 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2cb9cc4dd..55534e3a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - e652098d2019210a77e1abcbd7920015bc133cfd + e4656737e86f59ee2374c3463ccb5b89f946640c - + https://github.com/dotnet/core-setup - e652098d2019210a77e1abcbd7920015bc133cfd + e4656737e86f59ee2374c3463ccb5b89f946640c - + https://github.com/dotnet/core-setup - e652098d2019210a77e1abcbd7920015bc133cfd + e4656737e86f59ee2374c3463ccb5b89f946640c https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 4c8ad316395300930fb23731feaac6773aa67654 - + https://github.com/dotnet/winforms - ded88b1d6d116235c7434cb54e5ba0d2494321db + ec302430e0e792ea446ec20e3406a03dc0143310 - + https://github.com/dotnet/wpf - b8fba8acae0192696a69ed859d2e01b1f2eefe65 + 530d4aecbcd678b5de8eb8acb2963310e8b44ac5 diff --git a/eng/Versions.props b/eng/Versions.props index 391626841..94554e997 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19319.11 + 4.8.0-preview7.19320.7 - 3.0.0-preview7.19321.1 + 3.0.0-preview7.19322.1 @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27823-01 + 3.0.0-preview7-27823-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27823-01 + 2.1.0-preview7-27823-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27823-01 + 3.0.0-preview7-27823-02 $(MicrosoftWindowsDesktopAppPackageVersion) From c8dad35b2a0482f3a82539cd7cec684ac77fb14b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2019 16:31:21 +0000 Subject: [PATCH 332/471] Update dependencies from https://github.com/dotnet/core-setup build 20190623.03 (#2600) - NETStandard.Library.Ref - 2.1.0-preview7-27823-03 - Microsoft.NETCore.App - 3.0.0-preview7-27823-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27823-03 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55534e3a9..298d56639 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup e4656737e86f59ee2374c3463ccb5b89f946640c - + https://github.com/dotnet/core-setup e4656737e86f59ee2374c3463ccb5b89f946640c - + https://github.com/dotnet/core-setup e4656737e86f59ee2374c3463ccb5b89f946640c diff --git a/eng/Versions.props b/eng/Versions.props index 94554e997..a43931cb6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27823-02 + 3.0.0-preview7-27823-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27823-02 + 2.1.0-preview7-27823-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27823-02 + 3.0.0-preview7-27823-03 $(MicrosoftWindowsDesktopAppPackageVersion) From 9f96072c08f04a343f5d9c27284b6f01cec34f3c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 02:55:59 +0000 Subject: [PATCH 333/471] Update dependencies from https://github.com/dotnet/core-setup build 20190623.04 (#2601) - NETStandard.Library.Ref - 2.1.0-preview7-27823-04 - Microsoft.NETCore.App - 3.0.0-preview7-27823-04 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27823-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 298d56639..98ff1ed53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - e4656737e86f59ee2374c3463ccb5b89f946640c + 08e144c8651632da7bf1fbab409d27787ce6aa4a - + https://github.com/dotnet/core-setup - e4656737e86f59ee2374c3463ccb5b89f946640c + 08e144c8651632da7bf1fbab409d27787ce6aa4a - + https://github.com/dotnet/core-setup - e4656737e86f59ee2374c3463ccb5b89f946640c + 08e144c8651632da7bf1fbab409d27787ce6aa4a https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index a43931cb6..0b22b8f5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27823-03 + 3.0.0-preview7-27823-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27823-03 + 2.1.0-preview7-27823-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27823-03 + 3.0.0-preview7-27823-04 $(MicrosoftWindowsDesktopAppPackageVersion) From c1bfffc56750cd2b1f4c6e7d4481e8137c77d3ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 08:53:40 +0000 Subject: [PATCH 334/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190623.3 (#2603) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19323.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19323.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19323.3 - dotnet-watch - 3.0.0-preview7.19323.3 - dotnet-user-secrets - 3.0.0-preview7.19323.3 - dotnet-dev-certs - 3.0.0-preview7.19323.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98ff1ed53..b7770bfa9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 08e144c8651632da7bf1fbab409d27787ce6aa4a - + https://github.com/aspnet/AspNetCore - 6761dec9c69ffb4cd5b14a0a663ab73aa01fc7e2 + 5ca92305c2e6452e2add9a2eb115963896c6fe85 - + https://github.com/aspnet/AspNetCore - 6761dec9c69ffb4cd5b14a0a663ab73aa01fc7e2 + 5ca92305c2e6452e2add9a2eb115963896c6fe85 - + https://github.com/aspnet/AspNetCore - 6761dec9c69ffb4cd5b14a0a663ab73aa01fc7e2 + 5ca92305c2e6452e2add9a2eb115963896c6fe85 - + https://github.com/aspnet/AspNetCore - 6761dec9c69ffb4cd5b14a0a663ab73aa01fc7e2 + 5ca92305c2e6452e2add9a2eb115963896c6fe85 - + https://github.com/aspnet/AspNetCore - 6761dec9c69ffb4cd5b14a0a663ab73aa01fc7e2 + 5ca92305c2e6452e2add9a2eb115963896c6fe85 - + https://github.com/aspnet/AspNetCore - 6761dec9c69ffb4cd5b14a0a663ab73aa01fc7e2 + 5ca92305c2e6452e2add9a2eb115963896c6fe85 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 0b22b8f5c..cb2e19446 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19322.3 - 3.0.0-preview7.19322.3 - 3.0.0-preview7.19322.3 - 3.0.0-preview7.19322.3 - 3.0.0-preview7.19322.3 - 3.0.0-preview7.19322.3 + 3.0.0-preview7.19323.3 + 3.0.0-preview7.19323.3 + 3.0.0-preview7.19323.3 + 3.0.0-preview7.19323.3 + 3.0.0-preview7.19323.3 + 3.0.0-preview7.19323.3 From e7ba231e650c1305b8b4277f7abe5bd4e7373f8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 12:24:18 +0000 Subject: [PATCH 335/471] Update dependencies from https://github.com/dotnet/templating build 20190623.1 (#2605) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19323.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7770bfa9..34f859a60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore 5ca92305c2e6452e2add9a2eb115963896c6fe85 - + https://github.com/dotnet/templating - 03b89264a9744a58359b0b79b9af2e7275e93962 + 391cd004dfca3ea20e938ba0066dc5abaa4003e6 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index cb2e19446..3780ddee1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19323.1 - 1.0.2-beta5.19322.1 + 1.0.2-beta5.19323.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From bb769976f4b7bb77df8a9960db61678e29a7f8ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 12:29:04 +0000 Subject: [PATCH 336/471] Update dependencies from https://github.com/dotnet/arcade build 20190623.4 (#2604) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19323.4 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34f859a60..3a53189d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 48aed493ffa093728bc9ffd17be0e5957f77aade + 9946534da4f73e6242ca105f6798ab58119c9ab0 diff --git a/global.json b/global.json index 6ddb6aca3..77026e895 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19322.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19323.4" } } From 3efa6607771f9fe9e27fbe09b79bd1efda312247 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 12:39:42 +0000 Subject: [PATCH 337/471] Update dependencies from https://github.com/dotnet/toolset build 20190624.1 (#2606) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19324.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a53189d0..5c494ed29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 391cd004dfca3ea20e938ba0066dc5abaa4003e6 - + https://github.com/dotnet/toolset - 60ab71ea44f69ec6f3ab0bed427d6f4aeb5bd7a6 + fc1389b267603bc79af816d0092ff5e828f466e6 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 3780ddee1..7684a56c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19323.5 + 3.0.100-preview7.19324.1 From bf15718a8e49364890313585d9e4123770707fb5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 12:56:35 +0000 Subject: [PATCH 338/471] Update dependencies from https://github.com/dotnet/toolset build 20190624.2 (#2607) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19324.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c494ed29..e59d03a7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 391cd004dfca3ea20e938ba0066dc5abaa4003e6 - + https://github.com/dotnet/toolset - fc1389b267603bc79af816d0092ff5e828f466e6 + cbb12d8a8b7ba3c97cd810856e7fc0b5b7468632 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7684a56c8..682bd9bc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19324.1 + 3.0.100-preview7.19324.2 From 2f78f673a0c95fcddca6eb7dcb420dc8417119f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 13:24:41 +0000 Subject: [PATCH 339/471] Update dependencies from https://github.com/dotnet/toolset build 20190624.3 (#2608) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19324.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e59d03a7d..dce32b3a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 391cd004dfca3ea20e938ba0066dc5abaa4003e6 - + https://github.com/dotnet/toolset - cbb12d8a8b7ba3c97cd810856e7fc0b5b7468632 + 97724a3d572b4b503deca138cc95a31396eec0fe https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 682bd9bc4..cd4e5e28d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19324.2 + 3.0.100-preview7.19324.3 From 8bfeaf41fd51303c9bb6cf9704cba01d5e4efc98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 15:24:48 +0000 Subject: [PATCH 340/471] [master] Update dependencies from dotnet/toolset (#2610) * Update dependencies from https://github.com/dotnet/toolset build 20190624.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19324.4 * Update dependencies from https://github.com/dotnet/toolset build 20190624.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19324.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dce32b3a4..ab65e878d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 391cd004dfca3ea20e938ba0066dc5abaa4003e6 - + https://github.com/dotnet/toolset - 97724a3d572b4b503deca138cc95a31396eec0fe + d33977268e59e7fd42f90c8132a4824f4f77006b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index cd4e5e28d..94c4feb76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19324.3 + 3.0.100-preview7.19324.5 From 4180d21b793be207d00affcb9dfc40224fc9a355 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 15:40:17 +0000 Subject: [PATCH 341/471] Update dependencies from https://github.com/dotnet/toolset build 20190624.6 (#2611) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19324.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab65e878d..457403d18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 391cd004dfca3ea20e938ba0066dc5abaa4003e6 - + https://github.com/dotnet/toolset - d33977268e59e7fd42f90c8132a4824f4f77006b + 733b5434f0f20d142070cf74d4ab9cb8b3c59241 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 94c4feb76..63be86401 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19324.5 + 3.0.100-preview7.19324.6 From 4e6104ed1c18a14ed189668fdc871f0595585584 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 15:42:14 +0000 Subject: [PATCH 342/471] [master] Update dependencies from dotnet/core-setup (#2602) * Update dependencies from https://github.com/dotnet/core-setup build 20190623.05 - NETStandard.Library.Ref - 2.1.0-preview7-27823-05 - Microsoft.NETCore.App - 3.0.0-preview7-27823-05 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27823-05 * Update dependencies from https://github.com/dotnet/core-setup build 20190624.01 - NETStandard.Library.Ref - 2.1.0-preview7-27824-01 - Microsoft.NETCore.App - 3.0.0-preview7-27824-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27824-01 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19322.5 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 457403d18..83ca3288e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 08e144c8651632da7bf1fbab409d27787ce6aa4a + 730e8c6700dacfcb2e68a69227233010407edc3d - + https://github.com/dotnet/core-setup - 08e144c8651632da7bf1fbab409d27787ce6aa4a + 730e8c6700dacfcb2e68a69227233010407edc3d - + https://github.com/dotnet/core-setup - 08e144c8651632da7bf1fbab409d27787ce6aa4a + 730e8c6700dacfcb2e68a69227233010407edc3d https://github.com/aspnet/AspNetCore @@ -59,9 +59,9 @@ https://github.com/dotnet/winforms ec302430e0e792ea446ec20e3406a03dc0143310 - + https://github.com/dotnet/wpf - 530d4aecbcd678b5de8eb8acb2963310e8b44ac5 + d5270358430ccec594c0f4bce4697c2e65760d69 diff --git a/eng/Versions.props b/eng/Versions.props index 63be86401..474feaefa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.0-preview7.19322.1 + 3.0.0-preview7.19322.5 @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27823-04 + 3.0.0-preview7-27824-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27823-04 + 2.1.0-preview7-27824-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27823-04 + 3.0.0-preview7-27824-01 $(MicrosoftWindowsDesktopAppPackageVersion) From 7512d4993a7cf882f1ad0d03628aa8ee0e650820 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 16:34:32 +0000 Subject: [PATCH 343/471] Update dependencies from https://github.com/dotnet/core-setup build 20190624.02 (#2612) - NETStandard.Library.Ref - 2.1.0-preview7-27824-02 - Microsoft.NETCore.App - 3.0.0-preview7-27824-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27824-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83ca3288e..d438a437d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 730e8c6700dacfcb2e68a69227233010407edc3d + e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/core-setup - 730e8c6700dacfcb2e68a69227233010407edc3d + e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/core-setup - 730e8c6700dacfcb2e68a69227233010407edc3d + e1d780539e85f4d8de263957715f9d08db2ceef4 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 474feaefa..838ea766f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27824-01 + 3.0.0-preview7-27824-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27824-01 + 2.1.0-preview7-27824-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27824-01 + 3.0.0-preview7-27824-02 $(MicrosoftWindowsDesktopAppPackageVersion) From 8da6c1c12c536e5fb0438817dbe8f0c0e5ef2d9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 17:27:52 +0000 Subject: [PATCH 344/471] Update dependencies from https://github.com/dotnet/cli build 20190624.1 (#2609) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19324.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d438a437d..4aba2d32d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 260f37383a4974b478cba2ba67ac7908578f5b07 - + https://github.com/dotnet/cli - 4c8ad316395300930fb23731feaac6773aa67654 + a9412be70e0ef1639e0683f4154a722af5d90356 diff --git a/eng/Versions.props b/eng/Versions.props index 838ea766f..2b50804b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19323.1 + 3.0.100-preview7.19324.1 1.0.2-beta5.19323.1 From f818360231dd40b48ca0786a8b5280fa190ff50e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 17:31:07 +0000 Subject: [PATCH 345/471] Update dependencies from https://github.com/dotnet/core-setup build 20190624.03 (#2613) - NETStandard.Library.Ref - 2.1.0-preview7-27824-03 - Microsoft.NETCore.App - 3.0.0-preview7-27824-03 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27824-03 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4aba2d32d..0ee7d5efd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 diff --git a/eng/Versions.props b/eng/Versions.props index 2b50804b4..68afcafc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19320.2 - 3.0.0-preview7-27824-02 + 3.0.0-preview7-27824-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27824-02 + 2.1.0-preview7-27824-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27824-02 + 3.0.0-preview7-27824-03 $(MicrosoftWindowsDesktopAppPackageVersion) From 5692f6f8ca002b850b4fa0346eb14ebbf3bc59ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 17:35:55 +0000 Subject: [PATCH 346/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190624.1 (#2614) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19324.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19324.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19324.1 - dotnet-watch - 3.0.0-preview7.19324.1 - dotnet-user-secrets - 3.0.0-preview7.19324.1 - dotnet-dev-certs - 3.0.0-preview7.19324.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ee7d5efd..a49296b6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/aspnet/AspNetCore - 5ca92305c2e6452e2add9a2eb115963896c6fe85 + 6ce8a879ae10e9f27798ec6e1c577092413f813d - + https://github.com/aspnet/AspNetCore - 5ca92305c2e6452e2add9a2eb115963896c6fe85 + 6ce8a879ae10e9f27798ec6e1c577092413f813d - + https://github.com/aspnet/AspNetCore - 5ca92305c2e6452e2add9a2eb115963896c6fe85 + 6ce8a879ae10e9f27798ec6e1c577092413f813d - + https://github.com/aspnet/AspNetCore - 5ca92305c2e6452e2add9a2eb115963896c6fe85 + 6ce8a879ae10e9f27798ec6e1c577092413f813d - + https://github.com/aspnet/AspNetCore - 5ca92305c2e6452e2add9a2eb115963896c6fe85 + 6ce8a879ae10e9f27798ec6e1c577092413f813d - + https://github.com/aspnet/AspNetCore - 5ca92305c2e6452e2add9a2eb115963896c6fe85 + 6ce8a879ae10e9f27798ec6e1c577092413f813d https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 68afcafc6..fa37d26b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19323.3 - 3.0.0-preview7.19323.3 - 3.0.0-preview7.19323.3 - 3.0.0-preview7.19323.3 - 3.0.0-preview7.19323.3 - 3.0.0-preview7.19323.3 + 3.0.0-preview7.19324.1 + 3.0.0-preview7.19324.1 + 3.0.0-preview7.19324.1 + 3.0.0-preview7.19324.1 + 3.0.0-preview7.19324.1 + 3.0.0-preview7.19324.1 From 3cea274e447d0a0934b69cde9b04ff5c0d5c28af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 18:40:24 +0000 Subject: [PATCH 347/471] Update dependencies from https://github.com/dotnet/cli build 20190624.2 (#2615) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19324.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a49296b6f..6e0eaaf73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 260f37383a4974b478cba2ba67ac7908578f5b07 - + https://github.com/dotnet/cli - a9412be70e0ef1639e0683f4154a722af5d90356 + b6eae083f19e7be11cb902f0b13fb19cc19f9c07 diff --git a/eng/Versions.props b/eng/Versions.props index fa37d26b2..2581d93ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19324.1 + 3.0.100-preview7.19324.2 1.0.2-beta5.19323.1 From 92f828fdc5ca9d36b2bf2b6609977b4b9ecc56c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 20:35:34 +0000 Subject: [PATCH 348/471] Update dependencies from https://github.com/dotnet/cli build 20190624.3 (#2618) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19324.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e0eaaf73..7a87d459c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 260f37383a4974b478cba2ba67ac7908578f5b07 - + https://github.com/dotnet/cli - b6eae083f19e7be11cb902f0b13fb19cc19f9c07 + 466cb94ad5d5137c3e5d101e6e44cf9505305156 diff --git a/eng/Versions.props b/eng/Versions.props index 2581d93ad..a9c99ea4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19324.2 + 3.0.100-preview7.19324.3 1.0.2-beta5.19323.1 From 180ab1adb5adb324dbad26cf5e051cdf9302ab34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 23:43:02 +0000 Subject: [PATCH 349/471] Update dependencies from https://github.com/dotnet/sdk build 20190624.1 (#2619) - Microsoft.NET.Sdk - 3.0.100-preview7.19324.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 994a475fd..8f21de1b1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a87d459c..402b5701f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 733b5434f0f20d142070cf74d4ab9cb8b3c59241 - + https://github.com/dotnet/sdk - 260f37383a4974b478cba2ba67ac7908578f5b07 + b8d9bbcf9ff5dbe719d8c92dc70a13f3d4162bc5 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index a9c99ea4d..e998a84a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19320.2 + 3.0.100-preview7.19324.1 3.0.0-preview7-27824-03 From 703d6cdb362dba49b5e6dada821fca40dfacb0fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 23:59:20 +0000 Subject: [PATCH 350/471] [master] Update dependencies from aspnet/AspNetCore (#2616) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190624.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19324.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19324.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19324.2 - dotnet-watch - 3.0.0-preview7.19324.2 - dotnet-user-secrets - 3.0.0-preview7.19324.2 - dotnet-dev-certs - 3.0.0-preview7.19324.2 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190624.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19324.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19324.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19324.3 - dotnet-watch - 3.0.0-preview7.19324.3 - dotnet-user-secrets - 3.0.0-preview7.19324.3 - dotnet-dev-certs - 3.0.0-preview7.19324.3 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190624.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19324.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19324.5 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19324.5 - dotnet-watch - 3.0.0-preview7.19324.5 - dotnet-user-secrets - 3.0.0-preview7.19324.5 - dotnet-dev-certs - 3.0.0-preview7.19324.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 402b5701f..2bd255d97 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/aspnet/AspNetCore - 6ce8a879ae10e9f27798ec6e1c577092413f813d + 151ae526610a6a32efb09aee8cd7b3960a6f5aa8 - + https://github.com/aspnet/AspNetCore - 6ce8a879ae10e9f27798ec6e1c577092413f813d + 151ae526610a6a32efb09aee8cd7b3960a6f5aa8 - + https://github.com/aspnet/AspNetCore - 6ce8a879ae10e9f27798ec6e1c577092413f813d + 151ae526610a6a32efb09aee8cd7b3960a6f5aa8 - + https://github.com/aspnet/AspNetCore - 6ce8a879ae10e9f27798ec6e1c577092413f813d + 151ae526610a6a32efb09aee8cd7b3960a6f5aa8 - + https://github.com/aspnet/AspNetCore - 6ce8a879ae10e9f27798ec6e1c577092413f813d + 151ae526610a6a32efb09aee8cd7b3960a6f5aa8 - + https://github.com/aspnet/AspNetCore - 6ce8a879ae10e9f27798ec6e1c577092413f813d + 151ae526610a6a32efb09aee8cd7b3960a6f5aa8 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index e998a84a7..ed189533e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19324.1 - 3.0.0-preview7.19324.1 - 3.0.0-preview7.19324.1 - 3.0.0-preview7.19324.1 - 3.0.0-preview7.19324.1 - 3.0.0-preview7.19324.1 + 3.0.0-preview7.19324.5 + 3.0.0-preview7.19324.5 + 3.0.0-preview7.19324.5 + 3.0.0-preview7.19324.5 + 3.0.0-preview7.19324.5 + 3.0.0-preview7.19324.5 From 2e381148ce657327e8d8cd5b5a849fd36da0e5b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 01:10:23 +0000 Subject: [PATCH 351/471] Update dependencies from https://github.com/dotnet/cli build 20190624.4 (#2620) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19324.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2bd255d97..d3d655418 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk b8d9bbcf9ff5dbe719d8c92dc70a13f3d4162bc5 - + https://github.com/dotnet/cli - 466cb94ad5d5137c3e5d101e6e44cf9505305156 + b896766a14d2fe8cb0dcd44c32e9a72a66afc3b6 diff --git a/eng/Versions.props b/eng/Versions.props index ed189533e..0b04e111d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19324.3 + 3.0.100-preview7.19324.4 1.0.2-beta5.19323.1 From 0ead435e84fd8c13f914a18e5ca265f7b088df1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 02:30:26 +0000 Subject: [PATCH 352/471] Update dependencies from https://github.com/dotnet/cli build 20190624.5 (#2622) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19324.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d3d655418..4f8c07a2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk b8d9bbcf9ff5dbe719d8c92dc70a13f3d4162bc5 - + https://github.com/dotnet/cli - b896766a14d2fe8cb0dcd44c32e9a72a66afc3b6 + 8821ef7b70fdce8e321962a44a7858437dacee1b diff --git a/eng/Versions.props b/eng/Versions.props index 0b04e111d..b4cebb568 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19324.4 + 3.0.100-preview7.19324.5 1.0.2-beta5.19323.1 From ff53919cf55f88a5415dde68bd3e910e94be3967 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 04:42:54 +0000 Subject: [PATCH 353/471] Update dependencies from https://github.com/dotnet/sdk build 20190624.2 (#2623) - Microsoft.NET.Sdk - 3.0.100-preview7.19324.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f8c07a2d..82776b34a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 733b5434f0f20d142070cf74d4ab9cb8b3c59241 - + https://github.com/dotnet/sdk - b8d9bbcf9ff5dbe719d8c92dc70a13f3d4162bc5 + e00f4025fd1fb7c69450b27a6160ddcd0245ff5f https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index b4cebb568..a1321c2aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19324.1 + 3.0.100-preview7.19324.2 3.0.0-preview7-27824-03 From 225b021c889d64ed1ab2a6a6ea5193d5b2f1433c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 08:35:33 +0000 Subject: [PATCH 354/471] Update dependencies from https://github.com/dotnet/cli build 20190625.1 (#2624) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19325.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82776b34a..0eab4fff9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk e00f4025fd1fb7c69450b27a6160ddcd0245ff5f - + https://github.com/dotnet/cli - 8821ef7b70fdce8e321962a44a7858437dacee1b + c3fc785fb68d226ecea75eb1592c3aaae0432e81 diff --git a/eng/Versions.props b/eng/Versions.props index a1321c2aa..5512abe54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19324.5 + 3.0.100-preview7.19325.1 1.0.2-beta5.19323.1 From aefdb6cbd74c1589c28ff553e1e54d41fa9577a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 09:17:43 +0000 Subject: [PATCH 355/471] [master] Update dependencies from aspnet/AspNetCore (#2621) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190624.6 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19324.6 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19324.6 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19324.6 - dotnet-watch - 3.0.0-preview7.19324.6 - dotnet-user-secrets - 3.0.0-preview7.19324.6 - dotnet-dev-certs - 3.0.0-preview7.19324.6 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190624.10 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19324.10 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19324.10 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19324.10 - dotnet-watch - 3.0.0-preview7.19324.10 - dotnet-dev-certs - 3.0.0-preview7.19324.10 - dotnet-user-secrets - 3.0.0-preview7.19324.10 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0eab4fff9..02e97e223 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/aspnet/AspNetCore - 151ae526610a6a32efb09aee8cd7b3960a6f5aa8 + 5ace0efa495c1faa61c8138699f31a830c676ca5 - + https://github.com/aspnet/AspNetCore - 151ae526610a6a32efb09aee8cd7b3960a6f5aa8 + 5ace0efa495c1faa61c8138699f31a830c676ca5 - + https://github.com/aspnet/AspNetCore - 151ae526610a6a32efb09aee8cd7b3960a6f5aa8 + 5ace0efa495c1faa61c8138699f31a830c676ca5 - + https://github.com/aspnet/AspNetCore - 151ae526610a6a32efb09aee8cd7b3960a6f5aa8 + 5ace0efa495c1faa61c8138699f31a830c676ca5 - + https://github.com/aspnet/AspNetCore - 151ae526610a6a32efb09aee8cd7b3960a6f5aa8 + 5ace0efa495c1faa61c8138699f31a830c676ca5 - + https://github.com/aspnet/AspNetCore - 151ae526610a6a32efb09aee8cd7b3960a6f5aa8 + 5ace0efa495c1faa61c8138699f31a830c676ca5 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 5512abe54..4642c69e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19324.5 - 3.0.0-preview7.19324.5 - 3.0.0-preview7.19324.5 - 3.0.0-preview7.19324.5 - 3.0.0-preview7.19324.5 - 3.0.0-preview7.19324.5 + 3.0.0-preview7.19324.10 + 3.0.0-preview7.19324.10 + 3.0.0-preview7.19324.10 + 3.0.0-preview7.19324.10 + 3.0.0-preview7.19324.10 + 3.0.0-preview7.19324.10 From 14111432e2dd2122ed62c504b8aec7bf0970a63f Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 25 Jun 2019 09:17:57 +0000 Subject: [PATCH 356/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190624.11 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19324.11 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19324.11 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19324.11 - dotnet-watch - 3.0.0-preview7.19324.11 - dotnet-dev-certs - 3.0.0-preview7.19324.11 - dotnet-user-secrets - 3.0.0-preview7.19324.11 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02e97e223..3f419dfdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/aspnet/AspNetCore - 5ace0efa495c1faa61c8138699f31a830c676ca5 + 6608b3b1789690c768eb4b84eed62e0da3fa3e1c - + https://github.com/aspnet/AspNetCore - 5ace0efa495c1faa61c8138699f31a830c676ca5 + 6608b3b1789690c768eb4b84eed62e0da3fa3e1c - + https://github.com/aspnet/AspNetCore - 5ace0efa495c1faa61c8138699f31a830c676ca5 + 6608b3b1789690c768eb4b84eed62e0da3fa3e1c - + https://github.com/aspnet/AspNetCore - 5ace0efa495c1faa61c8138699f31a830c676ca5 + 6608b3b1789690c768eb4b84eed62e0da3fa3e1c - + https://github.com/aspnet/AspNetCore - 5ace0efa495c1faa61c8138699f31a830c676ca5 + 6608b3b1789690c768eb4b84eed62e0da3fa3e1c - + https://github.com/aspnet/AspNetCore - 5ace0efa495c1faa61c8138699f31a830c676ca5 + 6608b3b1789690c768eb4b84eed62e0da3fa3e1c https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 4642c69e3..8b07f4044 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19324.10 - 3.0.0-preview7.19324.10 - 3.0.0-preview7.19324.10 - 3.0.0-preview7.19324.10 - 3.0.0-preview7.19324.10 - 3.0.0-preview7.19324.10 + 3.0.0-preview7.19324.11 + 3.0.0-preview7.19324.11 + 3.0.0-preview7.19324.11 + 3.0.0-preview7.19324.11 + 3.0.0-preview7.19324.11 + 3.0.0-preview7.19324.11 From 6fedcd8ebd875b93a68a1e34ce49cb69f2a71a5b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 10:35:24 +0000 Subject: [PATCH 357/471] Update dependencies from https://github.com/dotnet/cli build 20190625.2 (#2626) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19325.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02e97e223..ee1c8e897 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk e00f4025fd1fb7c69450b27a6160ddcd0245ff5f - + https://github.com/dotnet/cli - c3fc785fb68d226ecea75eb1592c3aaae0432e81 + e163fa6a2d7423fb147a668cff29eb64058148c6 diff --git a/eng/Versions.props b/eng/Versions.props index 4642c69e3..5a629c7e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19325.1 + 3.0.100-preview7.19325.2 1.0.2-beta5.19323.1 From 0a42660e10ea9f3b170f6db689931991b01aca6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 15:29:27 +0000 Subject: [PATCH 358/471] Update dependencies from https://github.com/dotnet/core-setup build 20190625.01 (#2630) - NETStandard.Library.Ref - 2.1.0-preview7-27825-01 - Microsoft.NETCore.App - 3.0.0-preview7-27825-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27825-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee1c8e897..3732f6468 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - e1d780539e85f4d8de263957715f9d08db2ceef4 + afd0301944d63a573c5bcb55c34ab2dd094dcc8e - + https://github.com/dotnet/core-setup - e1d780539e85f4d8de263957715f9d08db2ceef4 + afd0301944d63a573c5bcb55c34ab2dd094dcc8e - + https://github.com/dotnet/core-setup - e1d780539e85f4d8de263957715f9d08db2ceef4 + afd0301944d63a573c5bcb55c34ab2dd094dcc8e https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 5a629c7e5..047250bff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19324.2 - 3.0.0-preview7-27824-03 + 3.0.0-preview7-27825-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27824-03 + 2.1.0-preview7-27825-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27824-03 + 3.0.0-preview7-27825-01 $(MicrosoftWindowsDesktopAppPackageVersion) From 587b49e2e0084827f307636b8ececaaab3bf02f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 16:07:16 +0000 Subject: [PATCH 359/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190625.1 (#2632) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19325.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19325.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19325.1 - dotnet-watch - 3.0.0-preview7.19325.1 - dotnet-dev-certs - 3.0.0-preview7.19325.1 - dotnet-user-secrets - 3.0.0-preview7.19325.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34f2b6bb7..e169d9ff8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup afd0301944d63a573c5bcb55c34ab2dd094dcc8e - + https://github.com/aspnet/AspNetCore - 6608b3b1789690c768eb4b84eed62e0da3fa3e1c + 73e1b5de9e9a00925afd36954cdaacfdbf3d4b41 - + https://github.com/aspnet/AspNetCore - 6608b3b1789690c768eb4b84eed62e0da3fa3e1c + 73e1b5de9e9a00925afd36954cdaacfdbf3d4b41 - + https://github.com/aspnet/AspNetCore - 6608b3b1789690c768eb4b84eed62e0da3fa3e1c + 73e1b5de9e9a00925afd36954cdaacfdbf3d4b41 - + https://github.com/aspnet/AspNetCore - 6608b3b1789690c768eb4b84eed62e0da3fa3e1c + 73e1b5de9e9a00925afd36954cdaacfdbf3d4b41 - + https://github.com/aspnet/AspNetCore - 6608b3b1789690c768eb4b84eed62e0da3fa3e1c + 73e1b5de9e9a00925afd36954cdaacfdbf3d4b41 - + https://github.com/aspnet/AspNetCore - 6608b3b1789690c768eb4b84eed62e0da3fa3e1c + 73e1b5de9e9a00925afd36954cdaacfdbf3d4b41 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 51302e6ec..0a92d86dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19324.11 - 3.0.0-preview7.19324.11 - 3.0.0-preview7.19324.11 - 3.0.0-preview7.19324.11 - 3.0.0-preview7.19324.11 - 3.0.0-preview7.19324.11 + 3.0.0-preview7.19325.1 + 3.0.0-preview7.19325.1 + 3.0.0-preview7.19325.1 + 3.0.0-preview7.19325.1 + 3.0.0-preview7.19325.1 + 3.0.0-preview7.19325.1 From 0ea808d96475edd0eb0cc6e14c7aca42a3fa272a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 16:35:15 +0000 Subject: [PATCH 360/471] Update dependencies from https://github.com/dotnet/core-setup build 20190625.02 (#2633) - NETStandard.Library.Ref - 2.1.0-preview7-27825-02 - Microsoft.NETCore.App - 3.0.0-preview7-27825-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27825-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e169d9ff8..9d7770d5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - afd0301944d63a573c5bcb55c34ab2dd094dcc8e + 6a10c1af0fbab54c2d32b186cec72b1f09df5ecc - + https://github.com/dotnet/core-setup - afd0301944d63a573c5bcb55c34ab2dd094dcc8e + 6a10c1af0fbab54c2d32b186cec72b1f09df5ecc - + https://github.com/dotnet/core-setup - afd0301944d63a573c5bcb55c34ab2dd094dcc8e + 6a10c1af0fbab54c2d32b186cec72b1f09df5ecc https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 0a92d86dd..d13ce773d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19324.2 - 3.0.0-preview7-27825-01 + 3.0.0-preview7-27825-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27825-01 + 2.1.0-preview7-27825-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27825-01 + 3.0.0-preview7-27825-02 $(MicrosoftWindowsDesktopAppPackageVersion) From 806f6a40e97a842c128f2cab6da6186fdb3c2b99 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 17:25:26 +0000 Subject: [PATCH 361/471] Update dependencies from https://github.com/dotnet/cli build 20190625.3 (#2634) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19325.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d7770d5a..61033b530 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk e00f4025fd1fb7c69450b27a6160ddcd0245ff5f - + https://github.com/dotnet/cli - e163fa6a2d7423fb147a668cff29eb64058148c6 + 138a4c0a54d7eb872f94db75f0572b26ba76c356 diff --git a/eng/Versions.props b/eng/Versions.props index d13ce773d..aa733214a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19325.2 + 3.0.100-preview7.19325.3 1.0.2-beta5.19323.1 From c3a13649481b55e25e8fb9e14e847ad318b52ac4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 18:43:54 +0000 Subject: [PATCH 362/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190625.2 (#2635) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19325.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19325.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19325.2 - dotnet-watch - 3.0.0-preview7.19325.2 - dotnet-dev-certs - 3.0.0-preview7.19325.2 - dotnet-user-secrets - 3.0.0-preview7.19325.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61033b530..f6552d915 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 6a10c1af0fbab54c2d32b186cec72b1f09df5ecc - + https://github.com/aspnet/AspNetCore - 73e1b5de9e9a00925afd36954cdaacfdbf3d4b41 + bf95c946ec1f8f78a1581e725480fe1c64ee83b5 - + https://github.com/aspnet/AspNetCore - 73e1b5de9e9a00925afd36954cdaacfdbf3d4b41 + bf95c946ec1f8f78a1581e725480fe1c64ee83b5 - + https://github.com/aspnet/AspNetCore - 73e1b5de9e9a00925afd36954cdaacfdbf3d4b41 + bf95c946ec1f8f78a1581e725480fe1c64ee83b5 - + https://github.com/aspnet/AspNetCore - 73e1b5de9e9a00925afd36954cdaacfdbf3d4b41 + bf95c946ec1f8f78a1581e725480fe1c64ee83b5 - + https://github.com/aspnet/AspNetCore - 73e1b5de9e9a00925afd36954cdaacfdbf3d4b41 + bf95c946ec1f8f78a1581e725480fe1c64ee83b5 - + https://github.com/aspnet/AspNetCore - 73e1b5de9e9a00925afd36954cdaacfdbf3d4b41 + bf95c946ec1f8f78a1581e725480fe1c64ee83b5 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index aa733214a..c3211018e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19325.1 - 3.0.0-preview7.19325.1 - 3.0.0-preview7.19325.1 - 3.0.0-preview7.19325.1 - 3.0.0-preview7.19325.1 - 3.0.0-preview7.19325.1 + 3.0.0-preview7.19325.2 + 3.0.0-preview7.19325.2 + 3.0.0-preview7.19325.2 + 3.0.0-preview7.19325.2 + 3.0.0-preview7.19325.2 + 3.0.0-preview7.19325.2 From 194cdca50690bfb14fa1faadcba6628b0eb84cf4 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Sat, 2 Feb 2019 16:34:04 -0600 Subject: [PATCH 363/471] Don't reset blob URL if we pass it in. --- src/redist/targets/GenerateLayout.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index ca2bf1373..1d1dea9d4 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -8,7 +8,8 @@ $(RedistLayoutPath)sdk\$(SdkVersion)\ - https://dotnetcli.azureedge.net/dotnet/ + https://dotnetcli.azureedge.net/dotnet/ + https://dotnetcli.blob.core.windows.net/dotnet/ https://dotnetfeed.blob.core.windows.net/dotnet-toolset/ $(HostRid) From 64ba96eac4b2dae973ef1601381e39ef79928697 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 4 Feb 2019 08:49:39 -0600 Subject: [PATCH 364/471] Don't copy over packages if there are no packages to copy. --- src/redist/targets/LayoutTool.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/LayoutTool.csproj b/src/redist/targets/LayoutTool.csproj index 37f55a05f..1ce7612ba 100644 --- a/src/redist/targets/LayoutTool.csproj +++ b/src/redist/targets/LayoutTool.csproj @@ -9,7 +9,7 @@ - + $([System.IO.Path]::GetFullPath('$(NuGetPackageRoot)/$(PackageToRestore)/$(PackageVersionToRestore)')) From 6962cd30c5f3596ca05572dbe0cbcbbde764484f Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Sat, 9 Mar 2019 23:21:04 -0600 Subject: [PATCH 365/471] Allow specifying CoreSetupRid. --- src/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 1d1dea9d4..94a522633 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -12,7 +12,7 @@ https://dotnetcli.blob.core.windows.net/dotnet/ https://dotnetfeed.blob.core.windows.net/dotnet-toolset/ - $(HostRid) + $(HostRid) $(HostMonikerRid) From c0ad419eae27f45d850866cb0af72f331d53f22b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 19:44:14 +0000 Subject: [PATCH 366/471] Update dependencies from https://github.com/dotnet/sdk build 20190625.1 (#2638) - Microsoft.NET.Sdk - 3.0.100-preview7.19325.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6552d915..31a1248cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 733b5434f0f20d142070cf74d4ab9cb8b3c59241 - + https://github.com/dotnet/sdk - e00f4025fd1fb7c69450b27a6160ddcd0245ff5f + d49d89e5e6897e5a417a74c3e1bae6d210cbfce2 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index c3211018e..ba3b29f3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19324.2 + 3.0.100-preview7.19325.1 3.0.0-preview7-27825-02 From 9ff8662422bd0b18a141b5297f8c174e1e8f86ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 19:55:48 +0000 Subject: [PATCH 367/471] [master] Update dependencies from dotnet/cli (#2636) * Update dependencies from https://github.com/dotnet/cli build 20190625.4 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19325.4 * Update dependencies from https://github.com/dotnet/cli build 20190625.5 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19325.5 * Update dependencies from https://github.com/dotnet/cli build 20190625.6 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19325.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31a1248cf..86b1c3ed5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk d49d89e5e6897e5a417a74c3e1bae6d210cbfce2 - + https://github.com/dotnet/cli - 138a4c0a54d7eb872f94db75f0572b26ba76c356 + 7a96d9cb1a40d80b9ec99181fdd0fbb9458a94b9 diff --git a/eng/Versions.props b/eng/Versions.props index ba3b29f3b..cfc8b6870 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19325.3 + 3.0.100-preview7.19325.6 1.0.2-beta5.19323.1 From ad8bacc7c2d9f2aaad65a3f5896ad456a737887a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 20:45:00 +0000 Subject: [PATCH 368/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190625.3 (#2639) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19325.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19325.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19325.3 - dotnet-watch - 3.0.0-preview7.19325.3 - dotnet-dev-certs - 3.0.0-preview7.19325.3 - dotnet-user-secrets - 3.0.0-preview7.19325.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86b1c3ed5..265c2357b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 6a10c1af0fbab54c2d32b186cec72b1f09df5ecc - + https://github.com/aspnet/AspNetCore - bf95c946ec1f8f78a1581e725480fe1c64ee83b5 + 9016794111d725be590589b7f385cad6ba40a226 - + https://github.com/aspnet/AspNetCore - bf95c946ec1f8f78a1581e725480fe1c64ee83b5 + 9016794111d725be590589b7f385cad6ba40a226 - + https://github.com/aspnet/AspNetCore - bf95c946ec1f8f78a1581e725480fe1c64ee83b5 + 9016794111d725be590589b7f385cad6ba40a226 - + https://github.com/aspnet/AspNetCore - bf95c946ec1f8f78a1581e725480fe1c64ee83b5 + 9016794111d725be590589b7f385cad6ba40a226 - + https://github.com/aspnet/AspNetCore - bf95c946ec1f8f78a1581e725480fe1c64ee83b5 + 9016794111d725be590589b7f385cad6ba40a226 - + https://github.com/aspnet/AspNetCore - bf95c946ec1f8f78a1581e725480fe1c64ee83b5 + 9016794111d725be590589b7f385cad6ba40a226 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index cfc8b6870..570b708d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19325.2 - 3.0.0-preview7.19325.2 - 3.0.0-preview7.19325.2 - 3.0.0-preview7.19325.2 - 3.0.0-preview7.19325.2 - 3.0.0-preview7.19325.2 + 3.0.0-preview7.19325.3 + 3.0.0-preview7.19325.3 + 3.0.0-preview7.19325.3 + 3.0.0-preview7.19325.3 + 3.0.0-preview7.19325.3 + 3.0.0-preview7.19325.3 From 93df7a789d958fc71cef1b2bd502fb04c0a6af7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 21:24:23 +0000 Subject: [PATCH 369/471] Update dependencies from https://github.com/dotnet/sdk build 20190625.2 (#2640) - Microsoft.NET.Sdk - 3.0.100-preview7.19325.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 265c2357b..58f7f4b57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 733b5434f0f20d142070cf74d4ab9cb8b3c59241 - + https://github.com/dotnet/sdk - d49d89e5e6897e5a417a74c3e1bae6d210cbfce2 + d72a57f27e8d8d5a3bf8376599346d325a6a2491 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 570b708d3..3f3bfe053 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19325.1 + 3.0.100-preview7.19325.2 3.0.0-preview7-27825-02 From 4453fd08633813b2f9ff16eb91e37c5d838677e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 22:51:10 +0000 Subject: [PATCH 370/471] Update dependencies from https://github.com/dotnet/core-setup build 20190625.05 (#2641) - Microsoft.NETCore.App - 3.0.0-preview7-27825-05 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27825-05 - NETStandard.Library.Ref - 2.1.0-preview7-27825-05 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19323.8 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19324.12 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58f7f4b57..3f972dcc4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 6a10c1af0fbab54c2d32b186cec72b1f09df5ecc + aec4d1de74f35b86a7e78761095e9fbf4219ba37 - + https://github.com/dotnet/core-setup - 6a10c1af0fbab54c2d32b186cec72b1f09df5ecc + aec4d1de74f35b86a7e78761095e9fbf4219ba37 - + https://github.com/dotnet/core-setup - 6a10c1af0fbab54c2d32b186cec72b1f09df5ecc + aec4d1de74f35b86a7e78761095e9fbf4219ba37 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 7a96d9cb1a40d80b9ec99181fdd0fbb9458a94b9 - + https://github.com/dotnet/winforms - ec302430e0e792ea446ec20e3406a03dc0143310 + 4c20bc21ee3538341b1dc863eec6c33e3e528eaf - + https://github.com/dotnet/wpf - d5270358430ccec594c0f4bce4697c2e65760d69 + f207fe697fe2a72cc27a2cb745393fd5b24ed9c7 diff --git a/eng/Versions.props b/eng/Versions.props index 3f3bfe053..7845829fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19320.7 + 4.8.0-preview7.19323.8 - 3.0.0-preview7.19322.5 + 3.0.0-preview7.19324.12 @@ -47,7 +47,7 @@ 3.0.100-preview7.19325.2 - 3.0.0-preview7-27825-02 + 3.0.0-preview7-27825-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27825-02 + 2.1.0-preview7-27825-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27825-02 + 3.0.0-preview7-27825-05 $(MicrosoftWindowsDesktopAppPackageVersion) From 33f829339b878057fecd8c295b48bd73b2c9d392 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 00:37:25 +0000 Subject: [PATCH 371/471] Update dependencies from https://github.com/dotnet/core-setup build 20190625.06 (#2642) - Microsoft.NETCore.App - 3.0.0-preview7-27825-06 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27825-06 - NETStandard.Library.Ref - 2.1.0-preview7-27825-06 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f972dcc4..f16230435 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - aec4d1de74f35b86a7e78761095e9fbf4219ba37 + ea3f1f8e455b051b16d8d6e2269435dc1d044234 - + https://github.com/dotnet/core-setup - aec4d1de74f35b86a7e78761095e9fbf4219ba37 + ea3f1f8e455b051b16d8d6e2269435dc1d044234 - + https://github.com/dotnet/core-setup - aec4d1de74f35b86a7e78761095e9fbf4219ba37 + ea3f1f8e455b051b16d8d6e2269435dc1d044234 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 7845829fa..b07cdd5d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19325.2 - 3.0.0-preview7-27825-05 + 3.0.0-preview7-27825-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27825-05 + 2.1.0-preview7-27825-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27825-05 + 3.0.0-preview7-27825-06 $(MicrosoftWindowsDesktopAppPackageVersion) From f348b78b28152b65b2e90b6de27e03cb5e7ad0a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 04:08:35 +0000 Subject: [PATCH 372/471] Update dependencies from https://github.com/dotnet/sdk build 20190625.3 (#2645) - Microsoft.NET.Sdk - 3.0.100-preview7.19325.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f16230435..fa8cdc048 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 733b5434f0f20d142070cf74d4ab9cb8b3c59241 - + https://github.com/dotnet/sdk - d72a57f27e8d8d5a3bf8376599346d325a6a2491 + 87eeda589c34ebfd245fcb52ad63ae6ce97bad30 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index b07cdd5d2..b25d77943 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19325.2 + 3.0.100-preview7.19325.3 3.0.0-preview7-27825-06 From 5fa29de5dab3b9915a7d29064bddb0e70af72d54 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 04:22:07 +0000 Subject: [PATCH 373/471] [master] Update dependencies from dotnet/core-setup (#2643) * Update dependencies from https://github.com/dotnet/core-setup build 20190625.08 - Microsoft.NETCore.App - 3.0.0-preview7-27825-08 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27825-08 - NETStandard.Library.Ref - 2.1.0-preview7-27825-08 * Update dependencies from https://github.com/dotnet/core-setup build 20190625.09 - Microsoft.NETCore.App - 3.0.0-preview7-27825-09 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27825-09 - NETStandard.Library.Ref - 2.1.0-preview7-27825-09 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa8cdc048..760427df3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - ea3f1f8e455b051b16d8d6e2269435dc1d044234 + 2954215e45552f47dc0e73306fa5cb79390643f7 - + https://github.com/dotnet/core-setup - ea3f1f8e455b051b16d8d6e2269435dc1d044234 + 2954215e45552f47dc0e73306fa5cb79390643f7 - + https://github.com/dotnet/core-setup - ea3f1f8e455b051b16d8d6e2269435dc1d044234 + 2954215e45552f47dc0e73306fa5cb79390643f7 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index b25d77943..aae0f092e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19325.3 - 3.0.0-preview7-27825-06 + 3.0.0-preview7-27825-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27825-06 + 2.1.0-preview7-27825-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27825-06 + 3.0.0-preview7-27825-09 $(MicrosoftWindowsDesktopAppPackageVersion) From 629a4be4f60dafe5cbf635b161a95267918424a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 04:37:33 +0000 Subject: [PATCH 374/471] Update dependencies from https://github.com/dotnet/core-setup build 20190625.10 (#2646) - Microsoft.NETCore.App - 3.0.0-preview7-27825-10 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27825-10 - NETStandard.Library.Ref - 2.1.0-preview7-27825-10 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 760427df3..b6b526f6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup 2954215e45552f47dc0e73306fa5cb79390643f7 - + https://github.com/dotnet/core-setup 2954215e45552f47dc0e73306fa5cb79390643f7 - + https://github.com/dotnet/core-setup 2954215e45552f47dc0e73306fa5cb79390643f7 diff --git a/eng/Versions.props b/eng/Versions.props index aae0f092e..f0d992681 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19325.3 - 3.0.0-preview7-27825-09 + 3.0.0-preview7-27825-10 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27825-09 + 2.1.0-preview7-27825-10 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27825-09 + 3.0.0-preview7-27825-10 $(MicrosoftWindowsDesktopAppPackageVersion) From a54d5b96ac6f375b51f357753a1d39741c362363 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 06:37:04 +0000 Subject: [PATCH 375/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190625.7 (#2647) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19325.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19325.7 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19325.7 - dotnet-watch - 3.0.0-preview7.19325.7 - dotnet-dev-certs - 3.0.0-preview7.19325.7 - dotnet-user-secrets - 3.0.0-preview7.19325.7 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6b526f6a..192f97498 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 2954215e45552f47dc0e73306fa5cb79390643f7 - + https://github.com/aspnet/AspNetCore - 9016794111d725be590589b7f385cad6ba40a226 + fe796b216e9a47c24a2d23bf77905056651acfc8 - + https://github.com/aspnet/AspNetCore - 9016794111d725be590589b7f385cad6ba40a226 + fe796b216e9a47c24a2d23bf77905056651acfc8 - + https://github.com/aspnet/AspNetCore - 9016794111d725be590589b7f385cad6ba40a226 + fe796b216e9a47c24a2d23bf77905056651acfc8 - + https://github.com/aspnet/AspNetCore - 9016794111d725be590589b7f385cad6ba40a226 + fe796b216e9a47c24a2d23bf77905056651acfc8 - + https://github.com/aspnet/AspNetCore - 9016794111d725be590589b7f385cad6ba40a226 + fe796b216e9a47c24a2d23bf77905056651acfc8 - + https://github.com/aspnet/AspNetCore - 9016794111d725be590589b7f385cad6ba40a226 + fe796b216e9a47c24a2d23bf77905056651acfc8 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index f0d992681..68f2c60af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19325.3 - 3.0.0-preview7.19325.3 - 3.0.0-preview7.19325.3 - 3.0.0-preview7.19325.3 - 3.0.0-preview7.19325.3 - 3.0.0-preview7.19325.3 + 3.0.0-preview7.19325.7 + 3.0.0-preview7.19325.7 + 3.0.0-preview7.19325.7 + 3.0.0-preview7.19325.7 + 3.0.0-preview7.19325.7 + 3.0.0-preview7.19325.7 From b3deb2ed084b49a2808aa05e864b9f2bd06ed9a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 07:40:25 +0000 Subject: [PATCH 376/471] Update dependencies from https://github.com/dotnet/cli build 20190625.7 (#2648) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19325.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 192f97498..6ef8fe786 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 87eeda589c34ebfd245fcb52ad63ae6ce97bad30 - + https://github.com/dotnet/cli - 7a96d9cb1a40d80b9ec99181fdd0fbb9458a94b9 + d0c5899ec03c4f659d78698ad2c6001759a0015f diff --git a/eng/Versions.props b/eng/Versions.props index 68f2c60af..5bbc23073 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19325.6 + 3.0.100-preview7.19325.7 1.0.2-beta5.19323.1 From b2fb9ef3f5f0c0f56b0ca10b396865f6e49cd341 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 07:55:24 +0000 Subject: [PATCH 377/471] Update dependencies from https://github.com/dotnet/core-setup build 20190625.11 (#2649) - Microsoft.NETCore.App - 3.0.0-preview7-27825-11 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27825-11 - NETStandard.Library.Ref - 2.1.0-preview7-27825-11 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ef8fe786..240aea80d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 2954215e45552f47dc0e73306fa5cb79390643f7 + d0fea7eea839827195e907d4c1a30429ce108422 - + https://github.com/dotnet/core-setup - 2954215e45552f47dc0e73306fa5cb79390643f7 + d0fea7eea839827195e907d4c1a30429ce108422 - + https://github.com/dotnet/core-setup - 2954215e45552f47dc0e73306fa5cb79390643f7 + d0fea7eea839827195e907d4c1a30429ce108422 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 5bbc23073..880aa9c40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19325.3 - 3.0.0-preview7-27825-10 + 3.0.0-preview7-27825-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27825-10 + 2.1.0-preview7-27825-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27825-10 + 3.0.0-preview7-27825-11 $(MicrosoftWindowsDesktopAppPackageVersion) From 1a7ed89608b328fa62c5fa7af39b4bcb7fd95b41 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Wed, 26 Jun 2019 08:16:13 +0000 Subject: [PATCH 378/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190625.8 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19325.8 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19325.8 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19325.8 - dotnet-watch - 3.0.0-preview7.19325.8 - dotnet-dev-certs - 3.0.0-preview7.19325.8 - dotnet-user-secrets - 3.0.0-preview7.19325.8 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 240aea80d..f994ef43d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup d0fea7eea839827195e907d4c1a30429ce108422 - + https://github.com/aspnet/AspNetCore - fe796b216e9a47c24a2d23bf77905056651acfc8 + 9f52639909df27efa01017e777ca9703dc77a2ab - + https://github.com/aspnet/AspNetCore - fe796b216e9a47c24a2d23bf77905056651acfc8 + 9f52639909df27efa01017e777ca9703dc77a2ab - + https://github.com/aspnet/AspNetCore - fe796b216e9a47c24a2d23bf77905056651acfc8 + 9f52639909df27efa01017e777ca9703dc77a2ab - + https://github.com/aspnet/AspNetCore - fe796b216e9a47c24a2d23bf77905056651acfc8 + 9f52639909df27efa01017e777ca9703dc77a2ab - + https://github.com/aspnet/AspNetCore - fe796b216e9a47c24a2d23bf77905056651acfc8 + 9f52639909df27efa01017e777ca9703dc77a2ab - + https://github.com/aspnet/AspNetCore - fe796b216e9a47c24a2d23bf77905056651acfc8 + 9f52639909df27efa01017e777ca9703dc77a2ab https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 880aa9c40..43838961d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19325.7 - 3.0.0-preview7.19325.7 - 3.0.0-preview7.19325.7 - 3.0.0-preview7.19325.7 - 3.0.0-preview7.19325.7 - 3.0.0-preview7.19325.7 + 3.0.0-preview7.19325.8 + 3.0.0-preview7.19325.8 + 3.0.0-preview7.19325.8 + 3.0.0-preview7.19325.8 + 3.0.0-preview7.19325.8 + 3.0.0-preview7.19325.8 From f1243d13675b0cc3382af67a8a5a5c76dbd9c153 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 11:11:03 +0000 Subject: [PATCH 379/471] Update dependencies from https://github.com/dotnet/core-setup build 20190626.01 (#2651) - Microsoft.NETCore.App - 3.0.0-preview7-27826-01 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27826-01 - NETStandard.Library.Ref - 2.1.0-preview7-27826-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 240aea80d..646000eb6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - d0fea7eea839827195e907d4c1a30429ce108422 + d41f5ea7cc70f89f59b1e670475972ec9fb7a5f3 - + https://github.com/dotnet/core-setup - d0fea7eea839827195e907d4c1a30429ce108422 + d41f5ea7cc70f89f59b1e670475972ec9fb7a5f3 - + https://github.com/dotnet/core-setup - d0fea7eea839827195e907d4c1a30429ce108422 + d41f5ea7cc70f89f59b1e670475972ec9fb7a5f3 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 880aa9c40..18741d692 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19325.3 - 3.0.0-preview7-27825-11 + 3.0.0-preview7-27826-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27825-11 + 2.1.0-preview7-27826-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27825-11 + 3.0.0-preview7-27826-01 $(MicrosoftWindowsDesktopAppPackageVersion) From abc23b73f9ed06e827ed96507eddb318f9b4132a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 12:09:41 +0000 Subject: [PATCH 380/471] Update dependencies from https://github.com/dotnet/templating build 20190624.3 (#2628) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19324.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 646000eb6..6ef14d0ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore fe796b216e9a47c24a2d23bf77905056651acfc8 - + https://github.com/dotnet/templating - 391cd004dfca3ea20e938ba0066dc5abaa4003e6 + 22cb72f50b1eb682c75bfad6dee86acb239cc9b7 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 18741d692..af9d96849 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19325.7 - 1.0.2-beta5.19323.1 + 1.0.2-beta5.19324.3 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From 86a2e1fec814c420e1cd6af9045514f2cb66bffc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 15:22:54 +0000 Subject: [PATCH 381/471] Update dependencies from https://github.com/dotnet/sdk build 20190626.1 (#2654) - Microsoft.NET.Sdk - 3.0.100-preview7.19326.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ef14d0ee..4341a5c4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 733b5434f0f20d142070cf74d4ab9cb8b3c59241 - + https://github.com/dotnet/sdk - 87eeda589c34ebfd245fcb52ad63ae6ce97bad30 + ae583998ab000f500014e0a2ef9ffa4ff57d5bed https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index af9d96849..f01862801 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19325.3 + 3.0.100-preview7.19326.1 3.0.0-preview7-27826-01 From 80774ce4c88293458cbe6f8d26e45f3f402c8638 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 16:29:39 +0000 Subject: [PATCH 382/471] [master] Update dependencies from dotnet/core-setup (#2653) * Update dependencies from https://github.com/dotnet/core-setup build 20190626.02 - Microsoft.NETCore.App - 3.0.0-preview7-27826-02 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27826-02 - NETStandard.Library.Ref - 2.1.0-preview7-27826-02 * Update dependencies from https://github.com/dotnet/core-setup build 20190626.04 - Microsoft.NETCore.App - 3.0.0-preview7-27826-04 - Microsoft.WindowsDesktop.App - 3.0.0-preview7-27826-04 - NETStandard.Library.Ref - 2.1.0-preview7-27826-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4341a5c4f..425f1c022 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - d41f5ea7cc70f89f59b1e670475972ec9fb7a5f3 + 5c4d829254f40bca8a85ee11f03b2d90d71aa847 - + https://github.com/dotnet/core-setup - d41f5ea7cc70f89f59b1e670475972ec9fb7a5f3 + 5c4d829254f40bca8a85ee11f03b2d90d71aa847 - + https://github.com/dotnet/core-setup - d41f5ea7cc70f89f59b1e670475972ec9fb7a5f3 + 5c4d829254f40bca8a85ee11f03b2d90d71aa847 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index f01862801..852d854b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19326.1 - 3.0.0-preview7-27826-01 + 3.0.0-preview7-27826-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27826-01 + 2.1.0-preview7-27826-04 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27826-01 + 3.0.0-preview7-27826-04 $(MicrosoftWindowsDesktopAppPackageVersion) From 1b14e8dfdfaaec9f83371b9ae1e517d26fe01951 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 17:27:24 +0000 Subject: [PATCH 383/471] Update dependencies from https://github.com/dotnet/templating build 20190625.2 (#2652) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19325.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 425f1c022..b93d0a0fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore fe796b216e9a47c24a2d23bf77905056651acfc8 - + https://github.com/dotnet/templating - 22cb72f50b1eb682c75bfad6dee86acb239cc9b7 + 612d96b1548567063ea7e1416b328c87e774e151 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 852d854b1..a54ed52cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19325.7 - 1.0.2-beta5.19324.3 + 1.0.2-beta5.19325.2 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From 11df535cabc07f915fbb4547b99faadeac450414 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 20:25:07 +0000 Subject: [PATCH 384/471] [master] Update dependencies from dotnet/toolset (#2657) * Update dependencies from https://github.com/dotnet/toolset build 20190625.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19325.5 * Update dependencies from https://github.com/dotnet/toolset build 20190625.6 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19325.6 * Update dependencies from https://github.com/dotnet/toolset build 20190626.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19326.1 * Update dependencies from https://github.com/dotnet/toolset build 20190626.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19326.2 * Update dependencies from https://github.com/dotnet/toolset build 20190626.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19326.3 * Update dependencies from https://github.com/dotnet/toolset build 20190626.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19326.4 * Update dependencies from https://github.com/dotnet/toolset build 20190626.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19326.5 * Update dependencies from https://github.com/dotnet/toolset build 20190626.6 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19326.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b93d0a0fb..f16ff858b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 612d96b1548567063ea7e1416b328c87e774e151 - + https://github.com/dotnet/toolset - 733b5434f0f20d142070cf74d4ab9cb8b3c59241 + fb11c947aaf5bdbc6971d9cc6cc0407d2f0711c4 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a54ed52cc..65b4a6068 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19324.6 + 3.0.100-preview7.19326.6 From 4b67762087bc15629e73b3415d531fe1254cca4d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 20:33:53 +0000 Subject: [PATCH 385/471] Update dependencies from https://github.com/dotnet/arcade build 20190626.2 (#2658) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19326.2 --- eng/Version.Details.xml | 4 +- eng/common/sdl/packages.config | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- .../templates/job/publish-build-assets.yml | 1 - .../channels/internal-servicing.yml | 167 ++++++++++++++++++ .../channels/public-dev-release.yml | 59 ++++--- .../post-build/channels/public-release.yml | 167 ++++++++++++++++++ .../channels/public-validation-release.yml | 52 ++++-- .../templates/post-build/common-variables.yml | 9 + .../templates/post-build/post-build.yml | 4 + .../templates/post-build/promote-build.yml | 1 - .../post-build/setup-maestro-vars.yml | 4 +- global.json | 2 +- 13 files changed, 429 insertions(+), 45 deletions(-) create mode 100644 eng/common/templates/post-build/channels/internal-servicing.yml create mode 100644 eng/common/templates/post-build/channels/public-release.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f16ff858b..b7f6bcb8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 9946534da4f73e6242ca105f6798ab58119c9ab0 + 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index b054737df..fb9b71286 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@  - + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index acb4c55d7..39a8e8083 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -36,7 +36,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 - -GuardianPackageName Microsoft.Guardian.Cli.0.3.2 + -GuardianPackageName Microsoft.Guardian.Cli.0.6.0 -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index ff7346163..9e77ef1b5 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -66,7 +66,6 @@ jobs: script: | Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsInternalBuild) Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - task: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact diff --git a/eng/common/templates/post-build/channels/internal-servicing.yml b/eng/common/templates/post-build/channels/internal-servicing.yml new file mode 100644 index 000000000..99cd59b19 --- /dev/null +++ b/eng/common/templates/post-build/channels/internal-servicing.yml @@ -0,0 +1,167 @@ +parameters: + enableSymbolValidation: true + +stages: +- stage: IS_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: Internal Servicing + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Symbol Publishing + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id) + variables: + - group: DotNet-Symbol-Server-Pats + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Artifacts + inputs: + downloadType: specific files + matchingPattern: "*Artifacts*" + + - task: PowerShell@2 + displayName: Publish + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet + /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) + /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:Configuration=Release + + - job: + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: IsStableBuild + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Asset Manifests + inputs: + buildType: current + artifactName: AssetManifests + + - task: PowerShell@2 + displayName: Add Assets Location + env: + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ChannelId=$(InternalServicing_30_Channel_Id) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' + /p:BuildAssetRegistryToken='$(MaestroAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' + /p:Configuration=Release + + - task: NuGetCommand@2 + displayName: Publish Packages to AzDO Feed + condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') + inputs: + command: push + vstsFeed: $(AzDoFeedName) + packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg + publishVstsFeed: $(AzDoFeedName) + + - task: PowerShell@2 + displayName: Publish Blobs to AzDO Feed + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 + arguments: -FeedName $(AzDoFeedName) + -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) + enabled: false + + +- stage: IS_PublishValidation + displayName: Publish Validation + variables: + - template: ../common-variables.yml + jobs: + - template: ../setup-maestro-vars.yml + + - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: + - job: + displayName: Symbol Availability + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: PowerShell@2 + displayName: Check Symbol Availability + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) + + - job: + displayName: Gather Drop + dependsOn: setupMaestroVars + variables: + BARBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: PowerShell@2 + displayName: Setup Darc CLI + inputs: + targetType: filePath + filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1' + + - task: PowerShell@2 + displayName: Run Darc gather-drop + inputs: + targetType: inline + script: | + darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location + enabled: false + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/public-dev-release.yml b/eng/common/templates/post-build/channels/public-dev-release.yml index c61eaa927..dfbc24682 100644 --- a/eng/common/templates/post-build/channels/public-dev-release.yml +++ b/eng/common/templates/post-build/channels/public-dev-release.yml @@ -20,17 +20,10 @@ stages: vmImage: 'windows-2019' steps: - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts + displayName: Download Artifacts inputs: - buildType: current - artifactName: PDBArtifacts - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts + downloadType: specific files + matchingPattern: "*Artifacts*" - task: PowerShell@2 displayName: Publish @@ -44,13 +37,16 @@ stages: /p:Configuration=Release - job: - displayName: Publish to Static Feed + displayName: Publish Assets dependsOn: setupMaestroVars variables: - group: DotNet-Blob-Feed - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: IsStableBuild + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) pool: vmImage: 'windows-2019' @@ -74,22 +70,47 @@ stages: artifactName: AssetManifests - task: PowerShell@2 - displayName: Publish + displayName: Add Assets Location + env: + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToPackageFeed -restore -msbuildEngine dotnet - /p:AccountKeyToStaticFeed='$(dotnetfeed-storage-access-key-1)' + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ChannelId=$(PublicDevRelease_30_Channel_Id) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' /p:BuildAssetRegistryToken='$(MaestroAccessToken)' /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:ArtifactsCategory='$(_DotNetArtifactsCategory)' - /p:OverrideAssetsWithSameName=true - /p:PassIfExistingItemIdentical=true /p:Configuration=Release + - task: NuGetCommand@2 + displayName: Publish Packages to AzDO Feed + condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') + inputs: + command: push + vstsFeed: $(AzDoFeedName) + packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg + publishVstsFeed: $(AzDoFeedName) + + - task: PowerShell@2 + displayName: Publish Blobs to AzDO Feed + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 + arguments: -FeedName $(AzDoFeedName) + -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) + enabled: false + - stage: PublishValidation displayName: Publish Validation @@ -139,7 +160,3 @@ stages: targetType: inline script: | darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/public-release.yml b/eng/common/templates/post-build/channels/public-release.yml new file mode 100644 index 000000000..f23eb3f54 --- /dev/null +++ b/eng/common/templates/post-build/channels/public-release.yml @@ -0,0 +1,167 @@ +parameters: + enableSymbolValidation: true + +stages: +- stage: PubRel_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: Public Release + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Symbol Publishing + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicRelease_30_Channel_Id) + variables: + - group: DotNet-Symbol-Server-Pats + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Artifacts + inputs: + downloadType: specific files + matchingPattern: "*Artifacts*" + + - task: PowerShell@2 + displayName: Publish + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet + /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) + /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:Configuration=Release + + - job: + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: IsStableBuild + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicRelease_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Asset Manifests + inputs: + buildType: current + artifactName: AssetManifests + + - task: PowerShell@2 + displayName: Publish + env: + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ChannelId=$(PublicRelease_30_Channel_Id) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:NugetPath=$(Agent.BuildDirectory)/Nuget/NuGet.exe + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' + /p:BuildAssetRegistryToken='$(MaestroAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' + /p:Configuration=Release + + - task: NuGetCommand@2 + displayName: Publish Packages to AzDO Feed + condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') + inputs: + command: push + vstsFeed: $(AzDoFeedName) + packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg + publishVstsFeed: $(AzDoFeedName) + + - task: PowerShell@2 + displayName: Publish Blobs to AzDO Feed + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 + arguments: -FeedName $(AzDoFeedName) + -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) + enabled: false + + +- stage: PubRel_PublishValidation + displayName: Publish Validation + variables: + - template: ../common-variables.yml + jobs: + - template: ../setup-maestro-vars.yml + + - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: + - job: + displayName: Symbol Availability + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicRelease_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: PowerShell@2 + displayName: Check Symbol Availability + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) + + - job: + displayName: Gather Drop + dependsOn: setupMaestroVars + variables: + BARBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicRelease_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: PowerShell@2 + displayName: Setup Darc CLI + inputs: + targetType: filePath + filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1' + + - task: PowerShell@2 + displayName: Run Darc gather-drop + inputs: + targetType: inline + script: | + darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location + enabled: false + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml index 23725c6d6..0ef68c2b0 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -8,14 +8,17 @@ stages: - template: ../setup-maestro-vars.yml - job: - displayName: Publish to Static Feed + displayName: Publish Assets dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicValidationRelease_30_Channel_Id) variables: - group: DotNet-Blob-Feed - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: IsStableBuild + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicValidationRelease_30_Channel_Id) pool: vmImage: 'windows-2019' steps: @@ -38,21 +41,46 @@ stages: artifactName: AssetManifests - task: PowerShell@2 - displayName: Publish + displayName: Add Assets Location + env: + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToPackageFeed -restore -msbuildEngine dotnet - /p:AccountKeyToStaticFeed='$(dotnetfeed-storage-access-key-1)' + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ChannelId=$(PublicValidationRelease_30_Channel_Id) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' /p:BuildAssetRegistryToken='$(MaestroAccessToken)' /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:ArtifactsCategory='$(_DotNetArtifactsCategory)' - /p:OverrideAssetsWithSameName=true - /p:PassIfExistingItemIdentical=true + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' /p:Configuration=Release + + - task: NuGetCommand@2 + displayName: Publish Packages to AzDO Feed + condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') + inputs: + command: push + vstsFeed: $(AzDoFeedName) + packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg + publishVstsFeed: $(AzDoFeedName) + + - task: PowerShell@2 + displayName: Publish Blobs to AzDO Feed + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 + arguments: -FeedName $(AzDoFeedName) + -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) + enabled: false - stage: PVR_PublishValidation @@ -85,7 +113,3 @@ stages: targetType: inline script: | darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com --password $(MaestroAccessToken) --latest-location - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 97b48d97f..828346735 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -5,5 +5,14 @@ variables: # .NET Tools - Validation PublicValidationRelease_30_Channel_Id: 9 + # .NET Core 3.0 Internal Servicing + InternalServicing_30_Channel_Id: 184 + + # .NET Core 3.0 Release + PublicRelease_30_Channel_Id: 19 + + # Whether the build is internal or not + IsInternalBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} + SourceLinkCLIVersion: 3.0.0 SymbolToolVersion: 1.0.1 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 2c411dd00..3d7e6776e 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -65,3 +65,7 @@ stages: enableSymbolValidation: ${{ parameters.enableSymbolValidation }} - template: \eng\common\templates\post-build\channels\public-validation-release.yml + +- template: \eng\common\templates\post-build\channels\public-release.yml + +- template: \eng\common\templates\post-build\channels\internal-servicing.yml diff --git a/eng/common/templates/post-build/promote-build.yml b/eng/common/templates/post-build/promote-build.yml index d00317003..57241bab8 100644 --- a/eng/common/templates/post-build/promote-build.yml +++ b/eng/common/templates/post-build/promote-build.yml @@ -25,4 +25,3 @@ jobs: "Authorization" = "Bearer $(MaestroAccessToken)" } Invoke-RestMethod -Method Post -Headers $headers -Uri https://maestro-prod.westus2.cloudapp.azure.com/api/channels/$(ChannelId)/builds/$(BARBuildId)?api-version=2019-01-16 - enabled: false diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 0eddd6cd3..f6120dc1e 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -28,10 +28,8 @@ jobs: $Channels = "" $Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," } - $IsInternalBuild = $Content | Select -Index 2 - $IsStableBuild = $Content | Select -Index 3 + $IsStableBuild = $Content | Select -Index 2 Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels" - Write-PipelineSetVariable -Name 'IsInternalBuild' -Value $IsInternalBuild Write-PipelineSetVariable -Name 'IsStableBuild' -Value $IsStableBuild diff --git a/global.json b/global.json index 77026e895..778879691 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview5-011568" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19323.4" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19326.2" } } From e0a6ccca8928b702592a891d82be3e52774e5fb9 Mon Sep 17 00:00:00 2001 From: Christopher Costa Date: Wed, 26 Jun 2019 13:55:25 -0700 Subject: [PATCH 386/471] Provide NonShipping metadata --- eng/Publishing.props | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index 30a74f1ac..1a6232b31 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -60,15 +60,16 @@ DependsOnTargets="SetSdkVersionInfo" Condition=" '$(PublishSdkAssetsAndChecksumsToBlob)' == 'true' "> - + $(BlobStoragePartialRelativePath)/$(SdkVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/')) - + $(BlobStoragePartialRelativePath)/$(SdkVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/')) + NonShipping=true - + $(BlobStoragePartialRelativePath)/$(SdkVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/')) From c4826aef8ebfbb0ef918cb05f4203788731d8fd6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 23:19:44 +0000 Subject: [PATCH 387/471] Update dependencies from https://github.com/dotnet/toolset build 20190626.7 (#2660) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19326.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fcae3bac3..44d2f7193 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 612d96b1548567063ea7e1416b328c87e774e151 - + https://github.com/dotnet/toolset - fb11c947aaf5bdbc6971d9cc6cc0407d2f0711c4 + 1b644ce8612e695fee60862f32ad0fcfe759257a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 875b080a5..6f3c69ce4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19326.6 + 3.0.100-preview7.19326.7 From daa74af16b44f60f0eb85ee659dd82df8d62f4c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 23:48:05 +0000 Subject: [PATCH 388/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190626.6 (#2661) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19326.6 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19326.6 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19326.6 - dotnet-watch - 3.0.0-preview7.19326.6 - dotnet-dev-certs - 3.0.0-preview7.19326.6 - dotnet-user-secrets - 3.0.0-preview7.19326.6 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44d2f7193..6111c70d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 5c4d829254f40bca8a85ee11f03b2d90d71aa847 - + https://github.com/aspnet/AspNetCore - 9f52639909df27efa01017e777ca9703dc77a2ab + 785cd9abb1fa2178ae99d0f22ca25b246352ec34 - + https://github.com/aspnet/AspNetCore - 9f52639909df27efa01017e777ca9703dc77a2ab + 785cd9abb1fa2178ae99d0f22ca25b246352ec34 - + https://github.com/aspnet/AspNetCore - 9f52639909df27efa01017e777ca9703dc77a2ab + 785cd9abb1fa2178ae99d0f22ca25b246352ec34 - + https://github.com/aspnet/AspNetCore - 9f52639909df27efa01017e777ca9703dc77a2ab + 785cd9abb1fa2178ae99d0f22ca25b246352ec34 - + https://github.com/aspnet/AspNetCore - 9f52639909df27efa01017e777ca9703dc77a2ab + 785cd9abb1fa2178ae99d0f22ca25b246352ec34 - + https://github.com/aspnet/AspNetCore - 9f52639909df27efa01017e777ca9703dc77a2ab + 785cd9abb1fa2178ae99d0f22ca25b246352ec34 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 6f3c69ce4..0fb9f932a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19325.8 - 3.0.0-preview7.19325.8 - 3.0.0-preview7.19325.8 - 3.0.0-preview7.19325.8 - 3.0.0-preview7.19325.8 - 3.0.0-preview7.19325.8 + 3.0.0-preview7.19326.6 + 3.0.0-preview7.19326.6 + 3.0.0-preview7.19326.6 + 3.0.0-preview7.19326.6 + 3.0.0-preview7.19326.6 + 3.0.0-preview7.19326.6 From 7494bddd7dcd01c4a003824f89d3542a615cb376 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 23:50:27 +0000 Subject: [PATCH 389/471] Update dependencies from https://github.com/dotnet/cli build 20190626.1 (#2662) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19326.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6111c70d5..aa7828acb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk ae583998ab000f500014e0a2ef9ffa4ff57d5bed - + https://github.com/dotnet/cli - d0c5899ec03c4f659d78698ad2c6001759a0015f + dcf5c027ecbbcee91d22a0a1ecfb6d89523240fe diff --git a/eng/Versions.props b/eng/Versions.props index 0fb9f932a..47d3c9870 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19325.7 + 3.0.100-preview7.19326.1 1.0.2-beta5.19325.2 From 71cc0d2898eb470dd1077c04327926dc6c6aa3cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 01:00:30 +0000 Subject: [PATCH 390/471] [master] Update dependencies from dotnet/cli (#2663) * Update dependencies from https://github.com/dotnet/cli build 20190626.2 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19326.2 * Update dependencies from https://github.com/dotnet/cli build 20190626.3 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19326.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa7828acb..a5464ab5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk ae583998ab000f500014e0a2ef9ffa4ff57d5bed - + https://github.com/dotnet/cli - dcf5c027ecbbcee91d22a0a1ecfb6d89523240fe + f6e50ae0e3e371a9e292d60aca64916af4aa8322 diff --git a/eng/Versions.props b/eng/Versions.props index 47d3c9870..effdf5246 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19326.1 + 3.0.100-preview7.19326.3 1.0.2-beta5.19325.2 From 6baf14a94adef39f185b2a740e866c98600d6299 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 04:00:25 +0000 Subject: [PATCH 391/471] Update dependencies from https://github.com/dotnet/cli build 20190626.4 (#2664) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19326.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5464ab5e..c480eb3e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk ae583998ab000f500014e0a2ef9ffa4ff57d5bed - + https://github.com/dotnet/cli - f6e50ae0e3e371a9e292d60aca64916af4aa8322 + 0c7a6caea739553ceeb94b2e0d05c4354c79c8fe diff --git a/eng/Versions.props b/eng/Versions.props index effdf5246..bb02a0eee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19326.3 + 3.0.100-preview7.19326.4 1.0.2-beta5.19325.2 From 5e407d627638a95bc453fa8134f39ed8ca3164ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 04:36:32 +0000 Subject: [PATCH 392/471] Update dependencies from https://github.com/dotnet/sdk build 20190626.4 (#2665) - Microsoft.NET.Sdk - 3.0.100-preview7.19326.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c480eb3e1..e41da7ffd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 1b644ce8612e695fee60862f32ad0fcfe759257a - + https://github.com/dotnet/sdk - ae583998ab000f500014e0a2ef9ffa4ff57d5bed + 949d6cae3e0287cec56cf8ae6d7ca40034c6c51b https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index bb02a0eee..34d881bec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19326.1 + 3.0.100-preview7.19326.4 3.0.0-preview7-27826-04 From b8f7799c19010f272b855269e28f76793b75310c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 05:09:43 +0000 Subject: [PATCH 393/471] Update dependencies from https://github.com/dotnet/sdk build 20190626.5 (#2666) - Microsoft.NET.Sdk - 3.0.100-preview7.19326.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e41da7ffd..8bb7f6fe3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 1b644ce8612e695fee60862f32ad0fcfe759257a - + https://github.com/dotnet/sdk - 949d6cae3e0287cec56cf8ae6d7ca40034c6c51b + bc5ef9f7d32f3e5d443100671b1f427fe738b318 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 34d881bec..b0cc8150d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19326.4 + 3.0.100-preview7.19326.5 3.0.0-preview7-27826-04 From 330cc91712949643b9586982d718c277c258b24d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 12:27:27 +0000 Subject: [PATCH 394/471] Update dependencies from https://github.com/dotnet/templating build 20190626.2 (#2668) - Microsoft.DotNet.Common.ItemTemplates - 1.0.2-beta5.19326.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bb7f6fe3..eb6949b37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore 785cd9abb1fa2178ae99d0f22ca25b246352ec34 - + https://github.com/dotnet/templating - 612d96b1548567063ea7e1416b328c87e774e151 + bbddc61f0be0bb3379405005a01677f9c59d7193 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index b0cc8150d..2968daa34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19326.4 - 1.0.2-beta5.19325.2 + 1.0.2-beta5.19326.2 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From bfe5944ce6f8ac827bc367da12c34f83d7d3f407 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 12:41:10 +0000 Subject: [PATCH 395/471] Update dependencies from https://github.com/dotnet/toolset build 20190627.1 (#2669) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19327.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb6949b37..6a9ede369 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating bbddc61f0be0bb3379405005a01677f9c59d7193 - + https://github.com/dotnet/toolset - 1b644ce8612e695fee60862f32ad0fcfe759257a + 8f3d14335c8b7fb5867b97fa9181ae5872bb5998 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2968daa34..c30fb8526 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19326.7 + 3.0.100-preview7.19327.1 From bf5124da4ba70768667ffbbff69b026726043fba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 12:58:34 +0000 Subject: [PATCH 396/471] [master] Update dependencies from dotnet/toolset (#2670) * Update dependencies from https://github.com/dotnet/toolset build 20190627.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19327.2 * Update dependencies from https://github.com/dotnet/toolset build 20190627.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19327.3 * Update dependencies from https://github.com/dotnet/toolset build 20190627.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19327.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a9ede369..a2e52751b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating bbddc61f0be0bb3379405005a01677f9c59d7193 - + https://github.com/dotnet/toolset - 8f3d14335c8b7fb5867b97fa9181ae5872bb5998 + d7c8d017b6dbb59a9bda7d69c9405ddc19255c9c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c30fb8526..822c3eec3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19327.1 + 3.0.100-preview7.19327.4 From fbb1f6d47de42c5963041b75d330233121c33d4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 13:30:00 +0000 Subject: [PATCH 397/471] Update dependencies from https://github.com/dotnet/toolset build 20190627.5 (#2671) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19327.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2e52751b..1e2881ebf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating bbddc61f0be0bb3379405005a01677f9c59d7193 - + https://github.com/dotnet/toolset - d7c8d017b6dbb59a9bda7d69c9405ddc19255c9c + e1bcf8023b1241ddca9aae3293f4cc6375a87869 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 822c3eec3..207d09bba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19327.4 + 3.0.100-preview7.19327.5 From 3e194450c6e882664c4747477e073b4060d818a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 14:05:24 +0000 Subject: [PATCH 398/471] Update dependencies from https://github.com/dotnet/cli build 20190627.1 (#2672) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19327.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e2881ebf..fc74f15e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk bc5ef9f7d32f3e5d443100671b1f427fe738b318 - + https://github.com/dotnet/cli - 0c7a6caea739553ceeb94b2e0d05c4354c79c8fe + eff3adcd36e8f4fa654a18cea0372677c2afac4f diff --git a/eng/Versions.props b/eng/Versions.props index 207d09bba..d1d059325 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19326.4 + 3.0.100-preview7.19327.1 1.0.2-beta5.19326.2 From bc6c7d4076ee8a967b358f8ada4be1ea6113d58e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 15:40:30 +0000 Subject: [PATCH 399/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190626.10 (#2673) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19326.10 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19326.10 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19326.10 - dotnet-watch - 3.0.0-preview7.19326.10 - dotnet-dev-certs - 3.0.0-preview7.19326.10 - dotnet-user-secrets - 3.0.0-preview7.19326.10 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc74f15e8..d89d61f9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 5c4d829254f40bca8a85ee11f03b2d90d71aa847 - + https://github.com/aspnet/AspNetCore - 785cd9abb1fa2178ae99d0f22ca25b246352ec34 + fd9ad7f8c5a21543b5c0ca4e2197a25ce67068b2 - + https://github.com/aspnet/AspNetCore - 785cd9abb1fa2178ae99d0f22ca25b246352ec34 + fd9ad7f8c5a21543b5c0ca4e2197a25ce67068b2 - + https://github.com/aspnet/AspNetCore - 785cd9abb1fa2178ae99d0f22ca25b246352ec34 + fd9ad7f8c5a21543b5c0ca4e2197a25ce67068b2 - + https://github.com/aspnet/AspNetCore - 785cd9abb1fa2178ae99d0f22ca25b246352ec34 + fd9ad7f8c5a21543b5c0ca4e2197a25ce67068b2 - + https://github.com/aspnet/AspNetCore - 785cd9abb1fa2178ae99d0f22ca25b246352ec34 + fd9ad7f8c5a21543b5c0ca4e2197a25ce67068b2 - + https://github.com/aspnet/AspNetCore - 785cd9abb1fa2178ae99d0f22ca25b246352ec34 + fd9ad7f8c5a21543b5c0ca4e2197a25ce67068b2 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index d1d059325..2583d0556 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19326.6 - 3.0.0-preview7.19326.6 - 3.0.0-preview7.19326.6 - 3.0.0-preview7.19326.6 - 3.0.0-preview7.19326.6 - 3.0.0-preview7.19326.6 + 3.0.0-preview7.19326.10 + 3.0.0-preview7.19326.10 + 3.0.0-preview7.19326.10 + 3.0.0-preview7.19326.10 + 3.0.0-preview7.19326.10 + 3.0.0-preview7.19326.10 From 3f4ab7f5c5a5d8467e84e6c8d37254c89ec1083b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 16:03:56 +0000 Subject: [PATCH 400/471] Update dependencies from https://github.com/dotnet/sdk build 20190627.1 (#2674) - Microsoft.NET.Sdk - 3.0.100-preview7.19327.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d89d61f9d..58cb5d692 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset e1bcf8023b1241ddca9aae3293f4cc6375a87869 - + https://github.com/dotnet/sdk - bc5ef9f7d32f3e5d443100671b1f427fe738b318 + 940cff55e5d3cda1a126e303bcaf0692fb5fc624 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 2583d0556..3a2f01d12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19326.5 + 3.0.100-preview7.19327.1 3.0.0-preview7-27826-04 From b959696aadf6f70c66f72c365ce5d0018e78967e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 16:50:29 +0000 Subject: [PATCH 401/471] Update dependencies from https://github.com/dotnet/cli build 20190627.2 (#2675) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19327.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58cb5d692..09ea07e02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 940cff55e5d3cda1a126e303bcaf0692fb5fc624 - + https://github.com/dotnet/cli - eff3adcd36e8f4fa654a18cea0372677c2afac4f + 0062e76403483352c717714bf4179c4a1c3a42e6 diff --git a/eng/Versions.props b/eng/Versions.props index 3a2f01d12..24a9ec195 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19327.1 + 3.0.100-preview7.19327.2 1.0.2-beta5.19326.2 From 0980c54a2c5d6a7f8b1c8642884dc5a4b133de7e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 18:12:49 +0000 Subject: [PATCH 402/471] Update dependencies from https://github.com/dotnet/toolset build 20190627.6 (#2677) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19327.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09ea07e02..037c39492 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating bbddc61f0be0bb3379405005a01677f9c59d7193 - + https://github.com/dotnet/toolset - e1bcf8023b1241ddca9aae3293f4cc6375a87869 + fdef19c09a13a300181fdd95adcc690568066632 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 24a9ec195..6cc8717be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19327.5 + 3.0.100-preview7.19327.6 From c009546daffd762871edbfc1852bc4d8dd5b5a62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 19:01:45 +0000 Subject: [PATCH 403/471] Update dependencies from https://github.com/dotnet/toolset build 20190627.7 (#2678) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19327.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 037c39492..164ddc437 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating bbddc61f0be0bb3379405005a01677f9c59d7193 - + https://github.com/dotnet/toolset - fdef19c09a13a300181fdd95adcc690568066632 + bcc9388125784b1aac42c4c85b4bffb19efe7b27 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6cc8717be..128e64478 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19327.6 + 3.0.100-preview7.19327.7 From 8e3bfb72cfae0f00498debf4052a7f2b0a45117b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 20:54:29 +0000 Subject: [PATCH 404/471] Update dependencies from https://github.com/dotnet/sdk build 20190627.2 (#2680) - Microsoft.NET.Sdk - 3.0.100-preview7.19327.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 164ddc437..0c13b4076 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset bcc9388125784b1aac42c4c85b4bffb19efe7b27 - + https://github.com/dotnet/sdk - 940cff55e5d3cda1a126e303bcaf0692fb5fc624 + 172f18daffc19910afbb8fc812a65dd5a34f3f6c https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 128e64478..7ebe5a4c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19327.1 + 3.0.100-preview7.19327.2 3.0.0-preview7-27826-04 From 84048fc1ffcd1d8c76a47e9f1f6742749ff7507f Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Thu, 27 Jun 2019 15:57:58 -0700 Subject: [PATCH 405/471] Use Microsoft.NETCoreApp out of release branch (#2681) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c13b4076..0f937f728 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 5c4d829254f40bca8a85ee11f03b2d90d71aa847 + ee0c7ead1a46f06f98aff9102b785f532b71da9c - + https://github.com/dotnet/core-setup - 5c4d829254f40bca8a85ee11f03b2d90d71aa847 + ee0c7ead1a46f06f98aff9102b785f532b71da9c - + https://github.com/dotnet/core-setup - 5c4d829254f40bca8a85ee11f03b2d90d71aa847 + ee0c7ead1a46f06f98aff9102b785f532b71da9c https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 7ebe5a4c7..38feef4e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19327.2 - 3.0.0-preview7-27826-04 + 3.0.0-preview7-27826-20 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27826-04 + 2.1.0-preview7-27826-20 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27826-04 + 3.0.0-preview7-27826-20 $(MicrosoftWindowsDesktopAppPackageVersion) From d1a2d3db53fabbd4c759925127d55290dbb0471d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 23:19:14 +0000 Subject: [PATCH 406/471] Update dependencies from https://github.com/dotnet/toolset build 20190627.8 (#2682) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19327.8 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19325.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview7.19326.12 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f937f728..a1f64641c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating bbddc61f0be0bb3379405005a01677f9c59d7193 - + https://github.com/dotnet/toolset - bcc9388125784b1aac42c4c85b4bffb19efe7b27 + b8700db3b900a1ff64502d797b467e2aa0a42fee https://github.com/dotnet/sdk @@ -55,13 +55,13 @@ 0062e76403483352c717714bf4179c4a1c3a42e6 - + https://github.com/dotnet/winforms - 4c20bc21ee3538341b1dc863eec6c33e3e528eaf + 9b0ec7bb6e82818a4ac80702a9cd5c45f5d2ffde - + https://github.com/dotnet/wpf - f207fe697fe2a72cc27a2cb745393fd5b24ed9c7 + 214d5f749dd3c5ff79579e9395ccd817d23134d8 diff --git a/eng/Versions.props b/eng/Versions.props index 38feef4e2..3df372d30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,15 +12,15 @@ preview - 3.0.100-preview7.19327.7 + 3.0.100-preview7.19327.8 - 4.8.0-preview7.19323.8 + 4.8.0-preview7.19325.3 - 3.0.0-preview7.19324.12 + 3.0.0-preview7.19326.12 From 4747de953cc3005d06d28093263e9d86893d6653 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 00:50:00 +0000 Subject: [PATCH 407/471] Update dependencies from https://github.com/dotnet/toolset build 20190627.9 (#2683) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19327.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1f64641c..5b2a9c734 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating bbddc61f0be0bb3379405005a01677f9c59d7193 - + https://github.com/dotnet/toolset - b8700db3b900a1ff64502d797b467e2aa0a42fee + 864a430156d3ea6e6881e6ef1c01e6b4e5f07d51 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 3df372d30..89be65db6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19327.8 + 3.0.100-preview7.19327.9 From c3cb9975a6efb931f58f287e3752518ab449c0e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 18:05:12 -0700 Subject: [PATCH 408/471] [master] Update dependencies from dotnet/cli (#2679) * Update dependencies from https://github.com/dotnet/cli build 20190627.4 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19327.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b2a9c734..0e201dc2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 172f18daffc19910afbb8fc812a65dd5a34f3f6c - + https://github.com/dotnet/cli - 0062e76403483352c717714bf4179c4a1c3a42e6 + 6b0885139c1f37093ba4d3797f46fe90bf093883 diff --git a/eng/Versions.props b/eng/Versions.props index 89be65db6..edb2f4e3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19327.2 + 3.0.100-preview7.19327.4 1.0.2-beta5.19326.2 From 067519ab03f7048de286244517f48b3a7ef9817a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 01:22:59 +0000 Subject: [PATCH 409/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190627.9 (#2684) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19327.9 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19327.9 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19327.9 - dotnet-watch - 3.0.0-preview7.19327.9 - dotnet-dev-certs - 3.0.0-preview7.19327.9 - dotnet-user-secrets - 3.0.0-preview7.19327.9 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e201dc2f..14bb118ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup ee0c7ead1a46f06f98aff9102b785f532b71da9c - + https://github.com/aspnet/AspNetCore - fd9ad7f8c5a21543b5c0ca4e2197a25ce67068b2 + 82149f92ed212fd1889f66201ab2deac811e4847 - + https://github.com/aspnet/AspNetCore - fd9ad7f8c5a21543b5c0ca4e2197a25ce67068b2 + 82149f92ed212fd1889f66201ab2deac811e4847 - + https://github.com/aspnet/AspNetCore - fd9ad7f8c5a21543b5c0ca4e2197a25ce67068b2 + 82149f92ed212fd1889f66201ab2deac811e4847 - + https://github.com/aspnet/AspNetCore - fd9ad7f8c5a21543b5c0ca4e2197a25ce67068b2 + 82149f92ed212fd1889f66201ab2deac811e4847 - + https://github.com/aspnet/AspNetCore - fd9ad7f8c5a21543b5c0ca4e2197a25ce67068b2 + 82149f92ed212fd1889f66201ab2deac811e4847 - + https://github.com/aspnet/AspNetCore - fd9ad7f8c5a21543b5c0ca4e2197a25ce67068b2 + 82149f92ed212fd1889f66201ab2deac811e4847 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index edb2f4e3c..de9e83ad0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19326.10 - 3.0.0-preview7.19326.10 - 3.0.0-preview7.19326.10 - 3.0.0-preview7.19326.10 - 3.0.0-preview7.19326.10 - 3.0.0-preview7.19326.10 + 3.0.0-preview7.19327.9 + 3.0.0-preview7.19327.9 + 3.0.0-preview7.19327.9 + 3.0.0-preview7.19327.9 + 3.0.0-preview7.19327.9 + 3.0.0-preview7.19327.9 From 5701b9340d242de1c74ee3dbb8daee375c72f138 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 01:52:40 +0000 Subject: [PATCH 410/471] Update dependencies from https://github.com/dotnet/toolset build 20190627.10 (#2685) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19327.10 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14bb118ea..0c5150ba1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating bbddc61f0be0bb3379405005a01677f9c59d7193 - + https://github.com/dotnet/toolset - 864a430156d3ea6e6881e6ef1c01e6b4e5f07d51 + f86949fb6f14ffecf2d78f29232f32ad302ad842 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index de9e83ad0..bf99c6c9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19327.9 + 3.0.100-preview7.19327.10 From fcfecb0199ad361c375af2b0bde3ce7344d8f011 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 03:00:25 +0000 Subject: [PATCH 411/471] Update dependencies from https://github.com/dotnet/cli build 20190627.5 (#2686) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19327.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c5150ba1..88ba13b7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 172f18daffc19910afbb8fc812a65dd5a34f3f6c - + https://github.com/dotnet/cli - 6b0885139c1f37093ba4d3797f46fe90bf093883 + c0074b29f95896da38c48950c97a510f155c421c diff --git a/eng/Versions.props b/eng/Versions.props index bf99c6c9d..1da551489 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19327.4 + 3.0.100-preview7.19327.5 1.0.2-beta5.19326.2 From 72251c9cf4f874ba58c2aaa82341fd8a3ab0e377 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 03:15:42 +0000 Subject: [PATCH 412/471] Update dependencies from https://github.com/dotnet/sdk build 20190627.3 (#2687) - Microsoft.NET.Sdk - 3.0.100-preview7.19327.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88ba13b7d..1525b040f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset f86949fb6f14ffecf2d78f29232f32ad302ad842 - + https://github.com/dotnet/sdk - 172f18daffc19910afbb8fc812a65dd5a34f3f6c + a676be89f28eb54ece33ecfa9a7d084dd05346ba https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 1da551489..814b2e2d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19327.2 + 3.0.100-preview7.19327.3 3.0.0-preview7-27826-20 From 3e3df26fe9c39df67808d5abe203e58b0a911505 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 03:20:10 +0000 Subject: [PATCH 413/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190627.11 (#2688) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19327.11 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19327.11 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19327.11 - dotnet-watch - 3.0.0-preview7.19327.11 - dotnet-dev-certs - 3.0.0-preview7.19327.11 - dotnet-user-secrets - 3.0.0-preview7.19327.11 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1525b040f..c2898479d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup ee0c7ead1a46f06f98aff9102b785f532b71da9c - + https://github.com/aspnet/AspNetCore - 82149f92ed212fd1889f66201ab2deac811e4847 + 1c0014c5390385ec1c6351f0a2dcc498f34faa1d - + https://github.com/aspnet/AspNetCore - 82149f92ed212fd1889f66201ab2deac811e4847 + 1c0014c5390385ec1c6351f0a2dcc498f34faa1d - + https://github.com/aspnet/AspNetCore - 82149f92ed212fd1889f66201ab2deac811e4847 + 1c0014c5390385ec1c6351f0a2dcc498f34faa1d - + https://github.com/aspnet/AspNetCore - 82149f92ed212fd1889f66201ab2deac811e4847 + 1c0014c5390385ec1c6351f0a2dcc498f34faa1d - + https://github.com/aspnet/AspNetCore - 82149f92ed212fd1889f66201ab2deac811e4847 + 1c0014c5390385ec1c6351f0a2dcc498f34faa1d - + https://github.com/aspnet/AspNetCore - 82149f92ed212fd1889f66201ab2deac811e4847 + 1c0014c5390385ec1c6351f0a2dcc498f34faa1d https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 814b2e2d8..fed1911a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19327.9 - 3.0.0-preview7.19327.9 - 3.0.0-preview7.19327.9 - 3.0.0-preview7.19327.9 - 3.0.0-preview7.19327.9 - 3.0.0-preview7.19327.9 + 3.0.0-preview7.19327.11 + 3.0.0-preview7.19327.11 + 3.0.0-preview7.19327.11 + 3.0.0-preview7.19327.11 + 3.0.0-preview7.19327.11 + 3.0.0-preview7.19327.11 From 3be5c40f97c40b96f74bbf5bf7624ab4d5b06f16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 04:30:24 +0000 Subject: [PATCH 414/471] Update dependencies from https://github.com/dotnet/cli build 20190627.6 (#2689) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19327.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2898479d..293309c0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk a676be89f28eb54ece33ecfa9a7d084dd05346ba - + https://github.com/dotnet/cli - c0074b29f95896da38c48950c97a510f155c421c + 632222309350feea76c19898c9a838523b65e22f diff --git a/eng/Versions.props b/eng/Versions.props index fed1911a7..40b249de5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19327.5 + 3.0.100-preview7.19327.6 1.0.2-beta5.19326.2 From 81111d6424105ea6621ea94dc8852bd782978e94 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 13:12:46 +0000 Subject: [PATCH 415/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190627.12 (#2690) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19327.12 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19327.12 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19327.12 - dotnet-watch - 3.0.0-preview7.19327.12 - dotnet-dev-certs - 3.0.0-preview7.19327.12 - dotnet-user-secrets - 3.0.0-preview7.19327.12 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 293309c0d..24ff54b62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup ee0c7ead1a46f06f98aff9102b785f532b71da9c - + https://github.com/aspnet/AspNetCore - 1c0014c5390385ec1c6351f0a2dcc498f34faa1d + 33849f3381125e697008c846ac78bd0c0fd32e29 - + https://github.com/aspnet/AspNetCore - 1c0014c5390385ec1c6351f0a2dcc498f34faa1d + 33849f3381125e697008c846ac78bd0c0fd32e29 - + https://github.com/aspnet/AspNetCore - 1c0014c5390385ec1c6351f0a2dcc498f34faa1d + 33849f3381125e697008c846ac78bd0c0fd32e29 - + https://github.com/aspnet/AspNetCore - 1c0014c5390385ec1c6351f0a2dcc498f34faa1d + 33849f3381125e697008c846ac78bd0c0fd32e29 - + https://github.com/aspnet/AspNetCore - 1c0014c5390385ec1c6351f0a2dcc498f34faa1d + 33849f3381125e697008c846ac78bd0c0fd32e29 - + https://github.com/aspnet/AspNetCore - 1c0014c5390385ec1c6351f0a2dcc498f34faa1d + 33849f3381125e697008c846ac78bd0c0fd32e29 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 40b249de5..8f33227ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19327.11 - 3.0.0-preview7.19327.11 - 3.0.0-preview7.19327.11 - 3.0.0-preview7.19327.11 - 3.0.0-preview7.19327.11 - 3.0.0-preview7.19327.11 + 3.0.0-preview7.19327.12 + 3.0.0-preview7.19327.12 + 3.0.0-preview7.19327.12 + 3.0.0-preview7.19327.12 + 3.0.0-preview7.19327.12 + 3.0.0-preview7.19327.12 From 76797cc92077bcca60ac9ab5df40c85303a714ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 13:15:43 +0000 Subject: [PATCH 416/471] [master] Update dependencies from dotnet/arcade (#2667) * Update dependencies from https://github.com/dotnet/arcade build 20190626.44 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19326.44 * Add missing feed * Use PackageDownload * Update dependencies from https://github.com/dotnet/arcade build 20190627.39 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19327.39 * Use new apphost package and stop downloading extra packages --- eng/Version.Details.xml | 4 +- eng/Versions.props | 1 + eng/common/post-build/nuget-validation.ps1 | 28 ++++++++ eng/common/post-build/promote-build.ps1 | 53 ++++++++++++++ .../post-build/trigger-subscriptions.ps1 | 69 ++++++++++++++++++ eng/common/sdl/extract-artifact-packages.ps1 | 70 +++++++++++++++++++ eng/common/templates/job/execute-sdl.yml | 10 +++ .../channels/internal-servicing.yml | 9 ++- .../channels/public-dev-release.yml | 4 ++ .../post-build/channels/public-release.yml | 5 +- .../channels/public-validation-release.yml | 4 ++ .../templates/post-build/post-build.yml | 20 ++++++ .../templates/post-build/promote-build.yml | 11 ++- .../post-build/trigger-subscription.yml | 11 +++ global.json | 4 +- src/redist/targets/DownloadPackage.csproj | 15 ++-- src/redist/targets/GenerateLayout.targets | 2 +- 17 files changed, 297 insertions(+), 23 deletions(-) create mode 100644 eng/common/post-build/nuget-validation.ps1 create mode 100644 eng/common/post-build/promote-build.ps1 create mode 100644 eng/common/post-build/trigger-subscriptions.ps1 create mode 100644 eng/common/sdl/extract-artifact-packages.ps1 create mode 100644 eng/common/templates/post-build/trigger-subscription.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24ff54b62..e970f0808 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + 247c0290c554a68dd3e560dd88fb0da26353d9d7 diff --git a/eng/Versions.props b/eng/Versions.props index 8f33227ab..1ecd3f7b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -73,6 +73,7 @@ $(RestoreSources); + https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; https://dotnet.myget.org/F/msbuild/api/v3/index.json; https://dotnet.myget.org/F/nuget-build/api/v3/index.json; https://dotnet.myget.org/F/templating/api/v3/index.json; diff --git a/eng/common/post-build/nuget-validation.ps1 b/eng/common/post-build/nuget-validation.ps1 new file mode 100644 index 000000000..1bdced1e3 --- /dev/null +++ b/eng/common/post-build/nuget-validation.ps1 @@ -0,0 +1,28 @@ +# This script validates NuGet package metadata information using this +# tool: https://github.com/NuGet/NuGetGallery/tree/jver-verify/src/VerifyMicrosoftPackage + +param( + [Parameter(Mandatory=$true)][string] $PackagesPath, # Path to where the packages to be validated are + [Parameter(Mandatory=$true)][string] $ToolDestinationPath # Where the validation tool should be downloaded to +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\..\tools.ps1 + +try { + $url = "https://raw.githubusercontent.com/NuGet/NuGetGallery/jver-verify/src/VerifyMicrosoftPackage/verify.ps1" + + New-Item -ItemType "directory" -Path ${ToolDestinationPath} -Force + + Invoke-WebRequest $url -OutFile ${ToolDestinationPath}\verify.ps1 + + & ${ToolDestinationPath}\verify.ps1 ${PackagesPath}\*.nupkg +} +catch { + Write-PipelineTaskError "NuGet package validation failed. Please check error logs." + Write-Host $_ + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} diff --git a/eng/common/post-build/promote-build.ps1 b/eng/common/post-build/promote-build.ps1 new file mode 100644 index 000000000..84a608fa5 --- /dev/null +++ b/eng/common/post-build/promote-build.ps1 @@ -0,0 +1,53 @@ +param( + [Parameter(Mandatory=$true)][int] $BuildId, + [Parameter(Mandatory=$true)][int] $ChannelId, + [Parameter(Mandatory=$true)][string] $BarToken, + [string] $MaestroEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com", + [string] $ApiVersion = "2019-01-16" +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\..\tools.ps1 + +function Get-Headers([string]$accept, [string]$barToken) { + $headers = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' + $headers.Add('Accept',$accept) + $headers.Add('Authorization',"Bearer $barToken") + return $headers +} + +try { + $maestroHeaders = Get-Headers 'application/json' $BarToken + + # Get info about which channels the build has already been promoted to + $getBuildApiEndpoint = "$MaestroEndpoint/api/builds/${BuildId}?api-version=$ApiVersion" + $buildInfo = Invoke-WebRequest -Method Get -Uri $getBuildApiEndpoint -Headers $maestroHeaders | ConvertFrom-Json + + if (!$buildInfo) { + Write-Host "Build with BAR ID $BuildId was not found in BAR!" + ExitWithExitCode 1 + } + + # Find whether the build is already assigned to the channel or not + if ($buildInfo.channels) { + foreach ($channel in $buildInfo.channels) { + if ($channel.Id -eq $ChannelId) { + Write-Host "The build with BAR ID $BuildId is already on channel $ChannelId!" + ExitWithExitCode 0 + } + } + } + + Write-Host "Build not present in channel $ChannelId. Promoting build ... " + + $promoteBuildApiEndpoint = "$maestroEndpoint/api/channels/${ChannelId}/builds/${BuildId}?api-version=$ApiVersion" + Invoke-WebRequest -Method Post -Uri $promoteBuildApiEndpoint -Headers $maestroHeaders + Write-Host "done." +} +catch { + Write-Host "There was an error while trying to promote build '$BuildId' to channel '$ChannelId'" + Write-Host $_ + Write-Host $_.ScriptStackTrace +} diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 new file mode 100644 index 000000000..db8a83945 --- /dev/null +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -0,0 +1,69 @@ +param( + [Parameter(Mandatory=$true)][string] $SourceRepo, + [Parameter(Mandatory=$true)][int] $ChannelId, + [string] $MaestroEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com", + [string] $BarToken, + [string] $ApiVersion = "2019-01-16" +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\..\tools.ps1 + +function Get-Headers([string]$accept, [string]$barToken) { + $headers = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' + $headers.Add('Accept',$accept) + $headers.Add('Authorization',"Bearer $barToken") + return $headers +} + +# Get all the $SourceRepo subscriptions +$normalizedSurceRepo = $SourceRepo.Replace('dnceng@', '') +$getSubscriptionsApiEndpoint = "$maestroEndpoint/api/subscriptions?sourceRepository=$normalizedSurceRepo&api-version=$apiVersion" +$headers = Get-Headers 'application/json' $barToken + +$subscriptions = Invoke-WebRequest -Uri $getSubscriptionsApiEndpoint -Headers $headers | ConvertFrom-Json + +if (!$subscriptions) { + Write-Host "No subscriptions found for source repo '$normalizedSurceRepo' in channel '$ChannelId'" + return +} + +$subscriptionsToTrigger = New-Object System.Collections.Generic.List[string] +$failedTriggeredSubscription = $false + +# Get all enabled subscriptions that need dependency flow on 'everyBuild' +foreach ($subscription in $subscriptions) { + if ($subscription.enabled -and $subscription.policy.updateFrequency -like 'everyBuild' -and $subscription.channel.id -eq $ChannelId) { + Write-Host "$subscription.id" + [void]$subscriptionsToTrigger.Add($subscription.id) + } +} + +foreach ($subscriptionToTrigger in $subscriptionsToTrigger) { + try { + $triggerSubscriptionApiEndpoint = "$maestroEndpoint/api/subscriptions/$subscriptionToTrigger/trigger?api-version=$apiVersion" + $headers = Get-Headers 'application/json' $BarToken + + Write-Host "Triggering subscription '$subscriptionToTrigger'..." + + Invoke-WebRequest -Uri $triggerSubscriptionApiEndpoint -Headers $headers -Method Post + + Write-Host "Subscription '$subscriptionToTrigger' triggered!" + } + catch + { + Write-Host "There was an error while triggering subscription '$subscriptionToTrigger'" + Write-Host $_ + Write-Host $_.ScriptStackTrace + $failedTriggeredSubscription = $true + } +} + +if ($failedTriggeredSubscription) { + Write-Host "At least one subscription failed to be triggered..." + ExitWithExitCode 1 +} + +Write-Host "All subscriptions were triggered successfully!" diff --git a/eng/common/sdl/extract-artifact-packages.ps1 b/eng/common/sdl/extract-artifact-packages.ps1 new file mode 100644 index 000000000..1fdbb1432 --- /dev/null +++ b/eng/common/sdl/extract-artifact-packages.ps1 @@ -0,0 +1,70 @@ +param( + [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where artifact packages are stored + [Parameter(Mandatory=$true)][string] $ExtractPath # Full path to directory where the packages will be extracted +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +$ExtractPackage = { + param( + [string] $PackagePath # Full path to a NuGet package + ) + + if (!(Test-Path $PackagePath)) { + Write-PipelineTaskError "Input file does not exist: $PackagePath" + ExitWithExitCode 1 + } + + $RelevantExtensions = @(".dll", ".exe", ".pdb") + Write-Host -NoNewLine "Extracting" ([System.IO.Path]::GetFileName($PackagePath)) "... " + + $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) + $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId + + Add-Type -AssemblyName System.IO.Compression.FileSystem + + [System.IO.Directory]::CreateDirectory($ExtractPath); + + try { + $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) + + $zip.Entries | + Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} | + ForEach-Object { + $TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.Name + + [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true) + } + } + catch { + + } + finally { + $zip.Dispose() + } + } + function ExtractArtifacts { + if (!(Test-Path $InputPath)) { + Write-Host "Input Path does not exist: $InputPath" + ExitWithExitCode 0 + } + $Jobs = @() + Get-ChildItem "$InputPath\*.nupkg" | + ForEach-Object { + $Jobs += Start-Job -ScriptBlock $ExtractPackage -ArgumentList $_.FullName + } + + foreach ($Job in $Jobs) { + Wait-Job -Id $Job.Id | Receive-Job + } +} + +try { + Measure-Command { ExtractArtifacts } +} +catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 39a8e8083..5837f3d56 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -20,6 +20,16 @@ jobs: downloadType: specific files matchingPattern: "**" downloadPath: $(Build.SourcesDirectory)\artifacts + - powershell: eng/common/sdl/extract-artifact-packages.ps1 + -InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts + -ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts + displayName: Extract Blob Artifacts + continueOnError: ${{ parameters.continueOnError }} + - powershell: eng/common/sdl/extract-artifact-packages.ps1 + -InputPath $(Build.SourcesDirectory)\artifacts\PackageArtifacts + -ExtractPath $(Build.SourcesDirectory)\artifacts\PackageArtifacts + displayName: Extract Package Artifacts + continueOnError: ${{ parameters.continueOnError }} - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' - task: NuGetCommand@2 diff --git a/eng/common/templates/post-build/channels/internal-servicing.yml b/eng/common/templates/post-build/channels/internal-servicing.yml index 99cd59b19..808d46b17 100644 --- a/eng/common/templates/post-build/channels/internal-servicing.yml +++ b/eng/common/templates/post-build/channels/internal-servicing.yml @@ -36,7 +36,7 @@ stages: /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' /p:Configuration=Release - - job: + - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars variables: @@ -111,7 +111,10 @@ stages: -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) enabled: false - + - template: ../trigger-subscription.yml + parameters: + ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} + - stage: IS_PublishValidation displayName: Publish Validation variables: @@ -164,4 +167,4 @@ stages: - template: ../promote-build.yml parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} + ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/public-dev-release.yml b/eng/common/templates/post-build/channels/public-dev-release.yml index dfbc24682..79c6822db 100644 --- a/eng/common/templates/post-build/channels/public-dev-release.yml +++ b/eng/common/templates/post-build/channels/public-dev-release.yml @@ -160,3 +160,7 @@ stages: targetType: inline script: | darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/public-release.yml b/eng/common/templates/post-build/channels/public-release.yml index f23eb3f54..25923020d 100644 --- a/eng/common/templates/post-build/channels/public-release.yml +++ b/eng/common/templates/post-build/channels/public-release.yml @@ -36,7 +36,7 @@ stages: /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' /p:Configuration=Release - - job: + - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars variables: @@ -111,6 +111,9 @@ stages: -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) enabled: false + - template: ../trigger-subscription.yml + parameters: + ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} - stage: PubRel_PublishValidation displayName: Publish Validation diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml index 0ef68c2b0..114477d3a 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -113,3 +113,7 @@ stages: targetType: inline script: | darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com --password $(MaestroAccessToken) --latest-location + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 3d7e6776e..daa799259 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -2,6 +2,7 @@ parameters: enableSourceLinkValidation: true enableSigningValidation: true enableSymbolValidation: true + enableNugetValidation: true SDLValidationParameters: enable: false params: '' @@ -11,6 +12,25 @@ stages: dependsOn: build displayName: Validate jobs: + - ${{ if eq(parameters.enableNugetValidation, 'true') }}: + - job: + displayName: NuGet Validation + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + - ${{ if eq(parameters.enableSigningValidation, 'true') }}: - job: displayName: Signing Validation diff --git a/eng/common/templates/post-build/promote-build.yml b/eng/common/templates/post-build/promote-build.yml index 57241bab8..af48b0b33 100644 --- a/eng/common/templates/post-build/promote-build.yml +++ b/eng/common/templates/post-build/promote-build.yml @@ -18,10 +18,7 @@ jobs: - task: PowerShell@2 displayName: Add Build to Channel inputs: - targetType: inline - script: | - $headers = @{ - "Accept" = "application/json" - "Authorization" = "Bearer $(MaestroAccessToken)" - } - Invoke-RestMethod -Method Post -Headers $headers -Uri https://maestro-prod.westus2.cloudapp.azure.com/api/channels/$(ChannelId)/builds/$(BARBuildId)?api-version=2019-01-16 + filePath: $(Build.SourcesDirectory)/eng/common/post-build/promote-build.ps1 + arguments: -BuildId $(BARBuildId) + -ChannelId $(ChannelId) + -BarToken $(MaestroAccessToken) diff --git a/eng/common/templates/post-build/trigger-subscription.yml b/eng/common/templates/post-build/trigger-subscription.yml new file mode 100644 index 000000000..65259d4e6 --- /dev/null +++ b/eng/common/templates/post-build/trigger-subscription.yml @@ -0,0 +1,11 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Triggering subscriptions + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 + arguments: -SourceRepo $(Build.Repository.Uri) + -ChannelId ${{ parameters.ChannelId }} + -BarToken $(MaestroAccessTokenInt) \ No newline at end of file diff --git a/global.json b/global.json index 778879691..5c4e0127a 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,8 @@ { "tools": { - "dotnet": "3.0.100-preview5-011568" + "dotnet": "3.0.100-preview6-012264" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19326.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19327.39" } } diff --git a/src/redist/targets/DownloadPackage.csproj b/src/redist/targets/DownloadPackage.csproj index 618f9c510..41f96901e 100644 --- a/src/redist/targets/DownloadPackage.csproj +++ b/src/redist/targets/DownloadPackage.csproj @@ -1,5 +1,6 @@ - + + Library false @@ -7,13 +8,13 @@ - + - + - - - - + + + + diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 94a522633..c39adc4ed 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -359,7 +359,7 @@ - Microsoft.NETCore.DotNetAppHost + Microsoft.NETCore.App.Host.$(SharedFrameworkRid) $(IntermediateOutputPath)AppHostRestore\ $(SdkOutputDirectory)AppHostTemplate From 82a93e168935ab152bdacf8cef350fe2843f35aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 13:20:07 +0000 Subject: [PATCH 417/471] Update dependencies from https://github.com/dotnet/cli build 20190627.7 (#2691) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19327.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e970f0808..bd714393f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk a676be89f28eb54ece33ecfa9a7d084dd05346ba - + https://github.com/dotnet/cli - 632222309350feea76c19898c9a838523b65e22f + c4f0a5a3c91f461d96861dff3d0645e4d480f921 diff --git a/eng/Versions.props b/eng/Versions.props index 1ecd3f7b2..095bce962 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19327.6 + 3.0.100-preview7.19327.7 1.0.2-beta5.19326.2 From 397d40473ec64935a20ec0ea6cfafaeb9e6de81a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 13:45:37 +0000 Subject: [PATCH 418/471] Update dependencies from https://github.com/dotnet/cli build 20190628.1 (#2692) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19328.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd714393f..5e5c2ee57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk a676be89f28eb54ece33ecfa9a7d084dd05346ba - + https://github.com/dotnet/cli - c4f0a5a3c91f461d96861dff3d0645e4d480f921 + ef97ea5c0c15504626734b6c4f631927b0fb165d diff --git a/eng/Versions.props b/eng/Versions.props index 095bce962..c1bc99a66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19327.7 + 3.0.100-preview7.19328.1 1.0.2-beta5.19326.2 From 2f4055d459e62c1352d1f79c64b05db11e15dafe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 15:35:24 +0000 Subject: [PATCH 419/471] Update dependencies from https://github.com/dotnet/sdk build 20190628.1 (#2694) - Microsoft.NET.Sdk - 3.0.100-preview7.19328.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e5c2ee57..9a77403f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset f86949fb6f14ffecf2d78f29232f32ad302ad842 - + https://github.com/dotnet/sdk - a676be89f28eb54ece33ecfa9a7d084dd05346ba + 5264a6c94fd106e7d007586c75a09f304be615af https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index c1bc99a66..1d47b0e21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19327.3 + 3.0.100-preview7.19328.1 3.0.0-preview7-27826-20 From 6bf1cfd7568e8c799a82f9cb92e408648374e8a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 19:56:36 +0000 Subject: [PATCH 420/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190628.3 (#2696) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19328.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19328.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19328.3 - dotnet-watch - 3.0.0-preview7.19328.3 - dotnet-dev-certs - 3.0.0-preview7.19328.3 - dotnet-user-secrets - 3.0.0-preview7.19328.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a77403f2..8a93dbaf0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup ee0c7ead1a46f06f98aff9102b785f532b71da9c - + https://github.com/aspnet/AspNetCore - 33849f3381125e697008c846ac78bd0c0fd32e29 + 1c71752b1ff99bfd8dd70f54f127832a1645ae35 - + https://github.com/aspnet/AspNetCore - 33849f3381125e697008c846ac78bd0c0fd32e29 + 1c71752b1ff99bfd8dd70f54f127832a1645ae35 - + https://github.com/aspnet/AspNetCore - 33849f3381125e697008c846ac78bd0c0fd32e29 + 1c71752b1ff99bfd8dd70f54f127832a1645ae35 - + https://github.com/aspnet/AspNetCore - 33849f3381125e697008c846ac78bd0c0fd32e29 + 1c71752b1ff99bfd8dd70f54f127832a1645ae35 - + https://github.com/aspnet/AspNetCore - 33849f3381125e697008c846ac78bd0c0fd32e29 + 1c71752b1ff99bfd8dd70f54f127832a1645ae35 - + https://github.com/aspnet/AspNetCore - 33849f3381125e697008c846ac78bd0c0fd32e29 + 1c71752b1ff99bfd8dd70f54f127832a1645ae35 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 1d47b0e21..18b77122f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19327.12 - 3.0.0-preview7.19327.12 - 3.0.0-preview7.19327.12 - 3.0.0-preview7.19327.12 - 3.0.0-preview7.19327.12 - 3.0.0-preview7.19327.12 + 3.0.0-preview7.19328.3 + 3.0.0-preview7.19328.3 + 3.0.0-preview7.19328.3 + 3.0.0-preview7.19328.3 + 3.0.0-preview7.19328.3 + 3.0.0-preview7.19328.3 From 1da2976baf1f71663875c4ebfb73fd32e14fac3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 21:45:24 +0000 Subject: [PATCH 421/471] Update dependencies from https://github.com/dotnet/cli build 20190628.2 (#2697) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19328.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a93dbaf0..4202111e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 5264a6c94fd106e7d007586c75a09f304be615af - + https://github.com/dotnet/cli - ef97ea5c0c15504626734b6c4f631927b0fb165d + a8688403d2e61f88fb53eeae11dbb54e899a8d96 diff --git a/eng/Versions.props b/eng/Versions.props index 18b77122f..d8db261e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19328.1 + 3.0.100-preview7.19328.2 1.0.2-beta5.19326.2 From f4c0cea5ada1b90c3c8d94d4a1288c47d2ac7518 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 22:22:54 +0000 Subject: [PATCH 422/471] Update dependencies from https://github.com/dotnet/sdk build 20190628.2 (#2699) - Microsoft.NET.Sdk - 3.0.100-preview7.19328.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4202111e4..f7b270f73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset f86949fb6f14ffecf2d78f29232f32ad302ad842 - + https://github.com/dotnet/sdk - 5264a6c94fd106e7d007586c75a09f304be615af + ef7932d094d8cf6bfd567e3de0f852a3abda9fe0 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index d8db261e2..ca45242d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19328.1 + 3.0.100-preview7.19328.2 3.0.0-preview7-27826-20 From 9301e92b805e24d68a9d91ceece4f954ef0f329f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 22:33:36 +0000 Subject: [PATCH 423/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190628.4 (#2698) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19328.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19328.4 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19328.4 - dotnet-watch - 3.0.0-preview7.19328.4 - dotnet-dev-certs - 3.0.0-preview7.19328.4 - dotnet-user-secrets - 3.0.0-preview7.19328.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7b270f73..f89227ec9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup ee0c7ead1a46f06f98aff9102b785f532b71da9c - + https://github.com/aspnet/AspNetCore - 1c71752b1ff99bfd8dd70f54f127832a1645ae35 + 5c81754badb37cd44506e991bad53a70cc9226cc - + https://github.com/aspnet/AspNetCore - 1c71752b1ff99bfd8dd70f54f127832a1645ae35 + 5c81754badb37cd44506e991bad53a70cc9226cc - + https://github.com/aspnet/AspNetCore - 1c71752b1ff99bfd8dd70f54f127832a1645ae35 + 5c81754badb37cd44506e991bad53a70cc9226cc - + https://github.com/aspnet/AspNetCore - 1c71752b1ff99bfd8dd70f54f127832a1645ae35 + 5c81754badb37cd44506e991bad53a70cc9226cc - + https://github.com/aspnet/AspNetCore - 1c71752b1ff99bfd8dd70f54f127832a1645ae35 + 5c81754badb37cd44506e991bad53a70cc9226cc - + https://github.com/aspnet/AspNetCore - 1c71752b1ff99bfd8dd70f54f127832a1645ae35 + 5c81754badb37cd44506e991bad53a70cc9226cc https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index ca45242d4..6aa99676c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19328.3 - 3.0.0-preview7.19328.3 - 3.0.0-preview7.19328.3 - 3.0.0-preview7.19328.3 - 3.0.0-preview7.19328.3 - 3.0.0-preview7.19328.3 + 3.0.0-preview7.19328.4 + 3.0.0-preview7.19328.4 + 3.0.0-preview7.19328.4 + 3.0.0-preview7.19328.4 + 3.0.0-preview7.19328.4 + 3.0.0-preview7.19328.4 From b352dd07bc5e58b14ddaaf8d8349e16ec51ff9f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 23:39:51 +0000 Subject: [PATCH 424/471] Update dependencies from https://github.com/dotnet/toolset build 20190628.2 (#2702) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19328.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f89227ec9..4a44b185d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating bbddc61f0be0bb3379405005a01677f9c59d7193 - + https://github.com/dotnet/toolset - f86949fb6f14ffecf2d78f29232f32ad302ad842 + 751b68df2d1b43b80014fad60162ae8059ce6f61 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6aa99676c..40a3f9f18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19327.10 + 3.0.100-preview7.19328.2 From 180701a199a85b6fa1b4010488a9bf6a608f4d27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2019 00:38:12 +0000 Subject: [PATCH 425/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190628.5 (#2705) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19328.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19328.5 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19328.5 - dotnet-watch - 3.0.0-preview7.19328.5 - dotnet-dev-certs - 3.0.0-preview7.19328.5 - dotnet-user-secrets - 3.0.0-preview7.19328.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a44b185d..955ed1ebf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup ee0c7ead1a46f06f98aff9102b785f532b71da9c - + https://github.com/aspnet/AspNetCore - 5c81754badb37cd44506e991bad53a70cc9226cc + bcb59fa5c9082de1a53234edfecd3b918c5340e6 - + https://github.com/aspnet/AspNetCore - 5c81754badb37cd44506e991bad53a70cc9226cc + bcb59fa5c9082de1a53234edfecd3b918c5340e6 - + https://github.com/aspnet/AspNetCore - 5c81754badb37cd44506e991bad53a70cc9226cc + bcb59fa5c9082de1a53234edfecd3b918c5340e6 - + https://github.com/aspnet/AspNetCore - 5c81754badb37cd44506e991bad53a70cc9226cc + bcb59fa5c9082de1a53234edfecd3b918c5340e6 - + https://github.com/aspnet/AspNetCore - 5c81754badb37cd44506e991bad53a70cc9226cc + bcb59fa5c9082de1a53234edfecd3b918c5340e6 - + https://github.com/aspnet/AspNetCore - 5c81754badb37cd44506e991bad53a70cc9226cc + bcb59fa5c9082de1a53234edfecd3b918c5340e6 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 40a3f9f18..9e113277f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19328.4 - 3.0.0-preview7.19328.4 - 3.0.0-preview7.19328.4 - 3.0.0-preview7.19328.4 - 3.0.0-preview7.19328.4 - 3.0.0-preview7.19328.4 + 3.0.0-preview7.19328.5 + 3.0.0-preview7.19328.5 + 3.0.0-preview7.19328.5 + 3.0.0-preview7.19328.5 + 3.0.0-preview7.19328.5 + 3.0.0-preview7.19328.5 From 71935de7b64dd5f1e34f67c0e02f284e54f0cf34 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Sat, 29 Jun 2019 01:08:28 +0000 Subject: [PATCH 426/471] Update dependencies from https://github.com/dotnet/toolset build 20190628.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19328.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 955ed1ebf..318bf40e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating bbddc61f0be0bb3379405005a01677f9c59d7193 - + https://github.com/dotnet/toolset - 751b68df2d1b43b80014fad60162ae8059ce6f61 + 90a9f0a7ac6543fb0e4547a4beec9c38ef9090d4 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9e113277f..526c30448 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19328.2 + 3.0.100-preview7.19328.3 From 27ef801201868227fd851a2e8d9906de9b00ed2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2019 01:25:04 +0000 Subject: [PATCH 427/471] Update dependencies from https://github.com/dotnet/cli build 20190628.3 (#2703) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19328.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 318bf40e1..83226d96c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk ef7932d094d8cf6bfd567e3de0f852a3abda9fe0 - + https://github.com/dotnet/cli - a8688403d2e61f88fb53eeae11dbb54e899a8d96 + a7f8e0776058c899032bc5d64cd7f98f1c4622cd diff --git a/eng/Versions.props b/eng/Versions.props index 526c30448..576953473 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19328.2 + 3.0.100-preview7.19328.3 1.0.2-beta5.19326.2 From 58796a260bc345ba5167e41c9ccd64af43b40742 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2019 01:40:30 +0000 Subject: [PATCH 428/471] Update dependencies from https://github.com/dotnet/cli build 20190628.8 (#2707) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19328.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83226d96c..8b56835ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk ef7932d094d8cf6bfd567e3de0f852a3abda9fe0 - + https://github.com/dotnet/cli - a7f8e0776058c899032bc5d64cd7f98f1c4622cd + 2fa903a5f0afd1dfa4a2e007ef1b5e00c394a871 diff --git a/eng/Versions.props b/eng/Versions.props index 576953473..85e4dfecc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19328.3 + 3.0.100-preview7.19328.8 1.0.2-beta5.19326.2 From decd467adfcda3c8b095c0dde2985f62d6d0afc4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2019 05:31:28 +0000 Subject: [PATCH 429/471] [master] Update dependencies from dotnet/cli (#2708) * Update dependencies from https://github.com/dotnet/cli build 20190628.9 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19328.9 * Update dependencies from https://github.com/dotnet/cli build 20190628.12 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19328.12 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b56835ed..ed9ba31c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk ef7932d094d8cf6bfd567e3de0f852a3abda9fe0 - + https://github.com/dotnet/cli - 2fa903a5f0afd1dfa4a2e007ef1b5e00c394a871 + 7a120bb24d301f644ace108b50d87506f2c3a701 diff --git a/eng/Versions.props b/eng/Versions.props index 85e4dfecc..2a21e9c86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19328.8 + 3.0.100-preview7.19328.12 1.0.2-beta5.19326.2 From 20c45d735e77467c1e0cf5e51656373319b69213 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2019 07:45:24 +0000 Subject: [PATCH 430/471] Update dependencies from https://github.com/dotnet/cli build 20190628.13 (#2709) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19328.13 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed9ba31c6..d06eab5bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk ef7932d094d8cf6bfd567e3de0f852a3abda9fe0 - + https://github.com/dotnet/cli - 7a120bb24d301f644ace108b50d87506f2c3a701 + 722c6368dc33129b04a4a1f673205176647149dd diff --git a/eng/Versions.props b/eng/Versions.props index 2a21e9c86..d1dd7e7f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19328.12 + 3.0.100-preview7.19328.13 1.0.2-beta5.19326.2 From 1ee9aab9cb43d531f72a042f300546ce1ce3b62e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2019 10:17:27 +0000 Subject: [PATCH 431/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190629.2 (#2710) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19329.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19329.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19329.2 - dotnet-watch - 3.0.0-preview7.19329.2 - dotnet-dev-certs - 3.0.0-preview7.19329.2 - dotnet-user-secrets - 3.0.0-preview7.19329.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d06eab5bb..4d221b748 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup ee0c7ead1a46f06f98aff9102b785f532b71da9c - + https://github.com/aspnet/AspNetCore - bcb59fa5c9082de1a53234edfecd3b918c5340e6 + ef19361731617687698071cd8b3c64d7d68b28ac - + https://github.com/aspnet/AspNetCore - bcb59fa5c9082de1a53234edfecd3b918c5340e6 + ef19361731617687698071cd8b3c64d7d68b28ac - + https://github.com/aspnet/AspNetCore - bcb59fa5c9082de1a53234edfecd3b918c5340e6 + ef19361731617687698071cd8b3c64d7d68b28ac - + https://github.com/aspnet/AspNetCore - bcb59fa5c9082de1a53234edfecd3b918c5340e6 + ef19361731617687698071cd8b3c64d7d68b28ac - + https://github.com/aspnet/AspNetCore - bcb59fa5c9082de1a53234edfecd3b918c5340e6 + ef19361731617687698071cd8b3c64d7d68b28ac - + https://github.com/aspnet/AspNetCore - bcb59fa5c9082de1a53234edfecd3b918c5340e6 + ef19361731617687698071cd8b3c64d7d68b28ac https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index d1dd7e7f8..3b2030c61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19328.5 - 3.0.0-preview7.19328.5 - 3.0.0-preview7.19328.5 - 3.0.0-preview7.19328.5 - 3.0.0-preview7.19328.5 - 3.0.0-preview7.19328.5 + 3.0.0-preview7.19329.2 + 3.0.0-preview7.19329.2 + 3.0.0-preview7.19329.2 + 3.0.0-preview7.19329.2 + 3.0.0-preview7.19329.2 + 3.0.0-preview7.19329.2 From dc63ceb280ae58b943a9739e8f31e97ff6195532 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2019 12:24:51 +0000 Subject: [PATCH 432/471] Update dependencies from https://github.com/dotnet/arcade build 20190628.2 (#2711) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19328.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d221b748..a7057b37b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 247c0290c554a68dd3e560dd88fb0da26353d9d7 + a68bcce61fa64598cbd30c00780b1f6ca8e7a9ef diff --git a/global.json b/global.json index 5c4e0127a..cee267137 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview6-012264" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19327.39" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19328.2" } } From 74c67c68488c080a74f331019172acfb0ed994d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2019 12:25:09 +0000 Subject: [PATCH 433/471] Update dependencies from https://github.com/dotnet/templating build 20190628.2 (#2712) - Microsoft.DotNet.Common.ItemTemplates - 2.0.0-preview.19328.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7057b37b..fca053715 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore ef19361731617687698071cd8b3c64d7d68b28ac - + https://github.com/dotnet/templating - bbddc61f0be0bb3379405005a01677f9c59d7193 + df9d2c8d96844a3ce4c6205d5b1155263a5a66a6 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 3b2030c61..51ad4d247 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19328.13 - 1.0.2-beta5.19326.2 + 2.0.0-preview.19328.2 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From 284c0d1e5de2957f0588175ebfab0b2d7a33e652 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2019 00:55:23 +0000 Subject: [PATCH 434/471] [master] Update dependencies from dotnet/cli (#2713) * Update dependencies from https://github.com/dotnet/cli build 20190629.1 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19329.1 * Update dependencies from https://github.com/dotnet/cli build 20190629.2 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19329.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fca053715..e85e9f882 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk ef7932d094d8cf6bfd567e3de0f852a3abda9fe0 - + https://github.com/dotnet/cli - 722c6368dc33129b04a4a1f673205176647149dd + f6ca75197ea2570427d4c5a5eef7a0695479fccb diff --git a/eng/Versions.props b/eng/Versions.props index 51ad4d247..7201023ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19328.13 + 3.0.100-preview7.19329.2 2.0.0-preview.19328.2 From 1df755a6cb30a476e80e78e52fd941a7c56a4d60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2019 10:33:16 +0000 Subject: [PATCH 435/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190629.3 (#2716) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19329.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19329.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19329.3 - dotnet-watch - 3.0.0-preview7.19329.3 - dotnet-dev-certs - 3.0.0-preview7.19329.3 - dotnet-user-secrets - 3.0.0-preview7.19329.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e85e9f882..8edd175eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup ee0c7ead1a46f06f98aff9102b785f532b71da9c - + https://github.com/aspnet/AspNetCore - ef19361731617687698071cd8b3c64d7d68b28ac + 3b4ca06bbc96e4bd483cb5384e1da7d4a535e715 - + https://github.com/aspnet/AspNetCore - ef19361731617687698071cd8b3c64d7d68b28ac + 3b4ca06bbc96e4bd483cb5384e1da7d4a535e715 - + https://github.com/aspnet/AspNetCore - ef19361731617687698071cd8b3c64d7d68b28ac + 3b4ca06bbc96e4bd483cb5384e1da7d4a535e715 - + https://github.com/aspnet/AspNetCore - ef19361731617687698071cd8b3c64d7d68b28ac + 3b4ca06bbc96e4bd483cb5384e1da7d4a535e715 - + https://github.com/aspnet/AspNetCore - ef19361731617687698071cd8b3c64d7d68b28ac + 3b4ca06bbc96e4bd483cb5384e1da7d4a535e715 - + https://github.com/aspnet/AspNetCore - ef19361731617687698071cd8b3c64d7d68b28ac + 3b4ca06bbc96e4bd483cb5384e1da7d4a535e715 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 7201023ed..318c09f60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19329.2 - 3.0.0-preview7.19329.2 - 3.0.0-preview7.19329.2 - 3.0.0-preview7.19329.2 - 3.0.0-preview7.19329.2 - 3.0.0-preview7.19329.2 + 3.0.0-preview7.19329.3 + 3.0.0-preview7.19329.3 + 3.0.0-preview7.19329.3 + 3.0.0-preview7.19329.3 + 3.0.0-preview7.19329.3 + 3.0.0-preview7.19329.3 From ecd161e5b42eab5f9798b5014b9fe6cb9da3c6bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2019 10:48:42 +0000 Subject: [PATCH 436/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190630.1 (#2717) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19330.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19330.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19330.1 - dotnet-watch - 3.0.0-preview7.19330.1 - dotnet-dev-certs - 3.0.0-preview7.19330.1 - dotnet-user-secrets - 3.0.0-preview7.19330.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8edd175eb..0da2d225f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup ee0c7ead1a46f06f98aff9102b785f532b71da9c - + https://github.com/aspnet/AspNetCore - 3b4ca06bbc96e4bd483cb5384e1da7d4a535e715 + 6dc65b16730abb9cba59e759012211e576f99188 - + https://github.com/aspnet/AspNetCore - 3b4ca06bbc96e4bd483cb5384e1da7d4a535e715 + 6dc65b16730abb9cba59e759012211e576f99188 - + https://github.com/aspnet/AspNetCore - 3b4ca06bbc96e4bd483cb5384e1da7d4a535e715 + 6dc65b16730abb9cba59e759012211e576f99188 - + https://github.com/aspnet/AspNetCore - 3b4ca06bbc96e4bd483cb5384e1da7d4a535e715 + 6dc65b16730abb9cba59e759012211e576f99188 - + https://github.com/aspnet/AspNetCore - 3b4ca06bbc96e4bd483cb5384e1da7d4a535e715 + 6dc65b16730abb9cba59e759012211e576f99188 - + https://github.com/aspnet/AspNetCore - 3b4ca06bbc96e4bd483cb5384e1da7d4a535e715 + 6dc65b16730abb9cba59e759012211e576f99188 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 318c09f60..4bcee8892 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19329.3 - 3.0.0-preview7.19329.3 - 3.0.0-preview7.19329.3 - 3.0.0-preview7.19329.3 - 3.0.0-preview7.19329.3 - 3.0.0-preview7.19329.3 + 3.0.0-preview7.19330.1 + 3.0.0-preview7.19330.1 + 3.0.0-preview7.19330.1 + 3.0.0-preview7.19330.1 + 3.0.0-preview7.19330.1 + 3.0.0-preview7.19330.1 From 0e11205c939ad6d0d711a54ffa8b985369876290 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2019 11:50:23 +0000 Subject: [PATCH 437/471] Update dependencies from https://github.com/dotnet/cli build 20190630.2 (#2718) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19330.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0da2d225f..00aa7fd13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk ef7932d094d8cf6bfd567e3de0f852a3abda9fe0 - + https://github.com/dotnet/cli - f6ca75197ea2570427d4c5a5eef7a0695479fccb + ac11516e7146854c328925a8727ec293edd351d0 diff --git a/eng/Versions.props b/eng/Versions.props index 4bcee8892..ac511a142 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19329.2 + 3.0.100-preview7.19330.2 2.0.0-preview.19328.2 From bb1d5fa7d5d6c0f61451d7ae3d9ec64bbe2b57f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2019 12:29:47 +0000 Subject: [PATCH 438/471] Update dependencies from https://github.com/dotnet/arcade build 20190629.2 (#2719) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19329.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00aa7fd13..db5da1fb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - a68bcce61fa64598cbd30c00780b1f6ca8e7a9ef + 3ebba82f29f338a3cb14f4b3e1b6da0fd69be694 diff --git a/global.json b/global.json index cee267137..b14716aac 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview6-012264" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19328.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19329.2" } } From 716079812c45486b79c420320e15c7e5147f0596 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2019 12:30:05 +0000 Subject: [PATCH 439/471] Update dependencies from https://github.com/dotnet/templating build 20190629.1 (#2720) - Microsoft.DotNet.Common.ItemTemplates - 2.0.0-preview.19329.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db5da1fb8..962d9ea52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore 6dc65b16730abb9cba59e759012211e576f99188 - + https://github.com/dotnet/templating - df9d2c8d96844a3ce4c6205d5b1155263a5a66a6 + ac48d58550544a9adbb9181042baff06edc6e347 https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index ac511a142..053660aff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19330.2 - 2.0.0-preview.19328.2 + 2.0.0-preview.19329.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From d9bb2bf0a10ccdf09bd7b712d5dfa82861442dac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2019 13:25:05 +0000 Subject: [PATCH 440/471] Update dependencies from https://github.com/dotnet/cli build 20190630.3 (#2721) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19330.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 962d9ea52..7469482fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk ef7932d094d8cf6bfd567e3de0f852a3abda9fe0 - + https://github.com/dotnet/cli - ac11516e7146854c328925a8727ec293edd351d0 + f73cbf3b7675d45ea648d1556fc04fdec4013cfb diff --git a/eng/Versions.props b/eng/Versions.props index 053660aff..c0a9b7513 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19330.2 + 3.0.100-preview7.19330.3 2.0.0-preview.19329.1 From 608eea80bc7f9e084b59417d3651b8a2bfe61031 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2019 13:40:31 +0000 Subject: [PATCH 441/471] Update dependencies from https://github.com/dotnet/cli build 20190630.4 (#2722) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19330.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7469482fa..fe9777b28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk ef7932d094d8cf6bfd567e3de0f852a3abda9fe0 - + https://github.com/dotnet/cli - f73cbf3b7675d45ea648d1556fc04fdec4013cfb + 12c50ece37d84008bdfeeb6498e1e7f8699e40a8 diff --git a/eng/Versions.props b/eng/Versions.props index c0a9b7513..7ae8eead3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19330.3 + 3.0.100-preview7.19330.4 2.0.0-preview.19329.1 From 4c695a012e9d67bfc117eac694e77787037f109c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2019 13:56:21 +0000 Subject: [PATCH 442/471] Update dependencies from https://github.com/dotnet/sdk build 20190630.1 (#2723) - Microsoft.NET.Sdk - 3.0.100-preview7.19330.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe9777b28..26c29bfac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 90a9f0a7ac6543fb0e4547a4beec9c38ef9090d4 - + https://github.com/dotnet/sdk - ef7932d094d8cf6bfd567e3de0f852a3abda9fe0 + 68c9529fe390ab0a13d8d554b04ee93af7fdad5d https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 7ae8eead3..7b8f23742 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19328.2 + 3.0.100-preview7.19330.1 3.0.0-preview7-27826-20 From 6045ff64f90c216ea73991141baa4ffca297052c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2019 18:03:24 +0000 Subject: [PATCH 443/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190630.2 (#2724) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19330.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19330.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19330.2 - dotnet-watch - 3.0.0-preview7.19330.2 - dotnet-dev-certs - 3.0.0-preview7.19330.2 - dotnet-user-secrets - 3.0.0-preview7.19330.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26c29bfac..ff926c87d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup ee0c7ead1a46f06f98aff9102b785f532b71da9c - + https://github.com/aspnet/AspNetCore - 6dc65b16730abb9cba59e759012211e576f99188 + d6d12507dc2524ec55754974c77f32ce7c17bbdb - + https://github.com/aspnet/AspNetCore - 6dc65b16730abb9cba59e759012211e576f99188 + d6d12507dc2524ec55754974c77f32ce7c17bbdb - + https://github.com/aspnet/AspNetCore - 6dc65b16730abb9cba59e759012211e576f99188 + d6d12507dc2524ec55754974c77f32ce7c17bbdb - + https://github.com/aspnet/AspNetCore - 6dc65b16730abb9cba59e759012211e576f99188 + d6d12507dc2524ec55754974c77f32ce7c17bbdb - + https://github.com/aspnet/AspNetCore - 6dc65b16730abb9cba59e759012211e576f99188 + d6d12507dc2524ec55754974c77f32ce7c17bbdb - + https://github.com/aspnet/AspNetCore - 6dc65b16730abb9cba59e759012211e576f99188 + d6d12507dc2524ec55754974c77f32ce7c17bbdb https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 7b8f23742..afe6e40eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19330.1 - 3.0.0-preview7.19330.1 - 3.0.0-preview7.19330.1 - 3.0.0-preview7.19330.1 - 3.0.0-preview7.19330.1 - 3.0.0-preview7.19330.1 + 3.0.0-preview7.19330.2 + 3.0.0-preview7.19330.2 + 3.0.0-preview7.19330.2 + 3.0.0-preview7.19330.2 + 3.0.0-preview7.19330.2 + 3.0.0-preview7.19330.2 From 87b5c2f259685dc94d317ed9ddee4b267835d734 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2019 19:35:06 +0000 Subject: [PATCH 444/471] Update dependencies from https://github.com/dotnet/cli build 20190630.5 (#2725) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19330.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff926c87d..b9df596e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 68c9529fe390ab0a13d8d554b04ee93af7fdad5d - + https://github.com/dotnet/cli - 12c50ece37d84008bdfeeb6498e1e7f8699e40a8 + 301d5c7c873fb2c19415a7e7314183a637541df0 diff --git a/eng/Versions.props b/eng/Versions.props index afe6e40eb..0fa84f8e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19330.4 + 3.0.100-preview7.19330.5 2.0.0-preview.19329.1 From 88913afc32701a424d4987349cd4dc4dee7852c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2019 19:50:30 +0000 Subject: [PATCH 445/471] Update dependencies from https://github.com/dotnet/cli build 20190630.6 (#2726) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19330.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9df596e2..09ba2a164 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 68c9529fe390ab0a13d8d554b04ee93af7fdad5d - + https://github.com/dotnet/cli - 301d5c7c873fb2c19415a7e7314183a637541df0 + 0d46d47a483335ad4bc46836dec8af555aef9b31 diff --git a/eng/Versions.props b/eng/Versions.props index 0fa84f8e2..8143d5ceb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19330.5 + 3.0.100-preview7.19330.6 2.0.0-preview.19329.1 From b06979ac9f349697722e763ef486c469730ce5bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 01:55:40 +0000 Subject: [PATCH 446/471] Update dependencies from https://github.com/dotnet/toolset build 20190630.1 (#2727) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19330.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09ba2a164..5593274c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating ac48d58550544a9adbb9181042baff06edc6e347 - + https://github.com/dotnet/toolset - 90a9f0a7ac6543fb0e4547a4beec9c38ef9090d4 + 2536cbc1705bc26a56938b2a7c8db3016e0b33dc https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 8143d5ceb..62077dc33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19328.3 + 3.0.100-preview7.19330.1 From d9b3bded52b555a6e56d54caa618570787c482fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 03:10:25 +0000 Subject: [PATCH 447/471] Update dependencies from https://github.com/dotnet/cli build 20190630.7 (#2729) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19330.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5593274c7..0cbb84c42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 68c9529fe390ab0a13d8d554b04ee93af7fdad5d - + https://github.com/dotnet/cli - 0d46d47a483335ad4bc46836dec8af555aef9b31 + 7e0a6e19ab1d7fbd0da776d448af42c3b24b67c7 diff --git a/eng/Versions.props b/eng/Versions.props index 62077dc33..2c00a4820 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19330.6 + 3.0.100-preview7.19330.7 2.0.0-preview.19329.1 From f673dbd5a1d8e7c0ac8603e053b62f0afa2bda6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 12:25:31 +0000 Subject: [PATCH 448/471] Update dependencies from https://github.com/dotnet/templating build 20190630.1 (#2731) - Microsoft.DotNet.Common.ItemTemplates - 2.0.0-preview.19330.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0cbb84c42..4cab2606f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/aspnet/AspNetCore d6d12507dc2524ec55754974c77f32ce7c17bbdb - + https://github.com/dotnet/templating - ac48d58550544a9adbb9181042baff06edc6e347 + e49047593d9a8f71e48cf4283ed4debceb76409b https://github.com/dotnet/toolset diff --git a/eng/Versions.props b/eng/Versions.props index 2c00a4820..c44f4e8ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 3.0.100-preview7.19330.7 - 2.0.0-preview.19329.1 + 2.0.0-preview.19330.1 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 0.2.0 From 6267f145d39c4d8035f2d0c2f6cd973769aa199c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 12:30:16 +0000 Subject: [PATCH 449/471] Update dependencies from https://github.com/dotnet/arcade build 20190630.1 (#2730) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19330.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cab2606f..82330311c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 3ebba82f29f338a3cb14f4b3e1b6da0fd69be694 + 89fab80685c91024c8f9e21f1c37f62580f648f8 diff --git a/global.json b/global.json index b14716aac..f66327607 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview6-012264" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19329.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19330.1" } } From 167133731c0a05d558164443adb5ac10b1ee999c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 13:14:11 +0000 Subject: [PATCH 450/471] [master] Update dependencies from aspnet/AspNetCore (#2728) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190630.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19330.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19330.4 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19330.4 - dotnet-watch - 3.0.0-preview7.19330.4 - dotnet-dev-certs - 3.0.0-preview7.19330.4 - dotnet-user-secrets - 3.0.0-preview7.19330.4 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190701.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19351.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19351.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19351.2 - dotnet-watch - 3.0.0-preview7.19351.2 - dotnet-dev-certs - 3.0.0-preview7.19351.2 - dotnet-user-secrets - 3.0.0-preview7.19351.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82330311c..e06fd518b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup ee0c7ead1a46f06f98aff9102b785f532b71da9c - + https://github.com/aspnet/AspNetCore - d6d12507dc2524ec55754974c77f32ce7c17bbdb + 60a8f2348e09f577b05568aba6ee6e5c9e4d4e81 - + https://github.com/aspnet/AspNetCore - d6d12507dc2524ec55754974c77f32ce7c17bbdb + 60a8f2348e09f577b05568aba6ee6e5c9e4d4e81 - + https://github.com/aspnet/AspNetCore - d6d12507dc2524ec55754974c77f32ce7c17bbdb + 60a8f2348e09f577b05568aba6ee6e5c9e4d4e81 - + https://github.com/aspnet/AspNetCore - d6d12507dc2524ec55754974c77f32ce7c17bbdb + 60a8f2348e09f577b05568aba6ee6e5c9e4d4e81 - + https://github.com/aspnet/AspNetCore - d6d12507dc2524ec55754974c77f32ce7c17bbdb + 60a8f2348e09f577b05568aba6ee6e5c9e4d4e81 - + https://github.com/aspnet/AspNetCore - d6d12507dc2524ec55754974c77f32ce7c17bbdb + 60a8f2348e09f577b05568aba6ee6e5c9e4d4e81 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index c44f4e8ad..c3dde1fca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19330.2 - 3.0.0-preview7.19330.2 - 3.0.0-preview7.19330.2 - 3.0.0-preview7.19330.2 - 3.0.0-preview7.19330.2 - 3.0.0-preview7.19330.2 + 3.0.0-preview7.19351.2 + 3.0.0-preview7.19351.2 + 3.0.0-preview7.19351.2 + 3.0.0-preview7.19351.2 + 3.0.0-preview7.19351.2 + 3.0.0-preview7.19351.2 From f711d8f443dc929e874851fe837fa0f376ddd7f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 13:30:27 +0000 Subject: [PATCH 451/471] Update dependencies from https://github.com/dotnet/cli build 20190701.1 (#2732) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19351.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e06fd518b..5b1d6d3fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 68c9529fe390ab0a13d8d554b04ee93af7fdad5d - + https://github.com/dotnet/cli - 7e0a6e19ab1d7fbd0da776d448af42c3b24b67c7 + 328ca6643782c70549f7526aa647b32001cc5af7 diff --git a/eng/Versions.props b/eng/Versions.props index c3dde1fca..a05f8378a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19330.7 + 3.0.100-preview7.19351.1 2.0.0-preview.19330.1 From 7d0ff548b5388ba464845b74277107d26317ea0c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 13:46:28 +0000 Subject: [PATCH 452/471] Update dependencies from https://github.com/dotnet/cli build 20190701.2 (#2733) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19351.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b1d6d3fe..23bcec7d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 68c9529fe390ab0a13d8d554b04ee93af7fdad5d - + https://github.com/dotnet/cli - 328ca6643782c70549f7526aa647b32001cc5af7 + 8b8f8662d703a3d4dac989c6d0c8c668f7bc60b3 diff --git a/eng/Versions.props b/eng/Versions.props index a05f8378a..d95de96a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19351.1 + 3.0.100-preview7.19351.2 2.0.0-preview.19330.1 From ed9713173291c934bcd24bfe6f20337b61e80f1c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 14:15:26 +0000 Subject: [PATCH 453/471] Update dependencies from https://github.com/dotnet/cli build 20190701.3 (#2734) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19351.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 23bcec7d9..01784a8cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 68c9529fe390ab0a13d8d554b04ee93af7fdad5d - + https://github.com/dotnet/cli - 8b8f8662d703a3d4dac989c6d0c8c668f7bc60b3 + 2d4d3e49de4cb340b018ca951ee8b0b75f78e963 diff --git a/eng/Versions.props b/eng/Versions.props index d95de96a4..ccbcd3cae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19351.2 + 3.0.100-preview7.19351.3 2.0.0-preview.19330.1 From 6a536ed202d812790bb77a0166137b07bd14bd81 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 15:13:00 +0000 Subject: [PATCH 454/471] Update dependencies from https://github.com/dotnet/sdk build 20190701.1 (#2735) - Microsoft.NET.Sdk - 3.0.100-preview7.19351.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01784a8cf..4bde91bbc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 2536cbc1705bc26a56938b2a7c8db3016e0b33dc - + https://github.com/dotnet/sdk - 68c9529fe390ab0a13d8d554b04ee93af7fdad5d + 46e1f004a34fe8ed6f608d20d5f8b0b862a245c1 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index ccbcd3cae..41ea836e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19330.1 + 3.0.100-preview7.19351.1 3.0.0-preview7-27826-20 From 57f2b7cb7c19e720b6ec173e3dc0026d1df9d0e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 16:00:52 +0000 Subject: [PATCH 455/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190701.3 (#2736) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19351.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19351.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19351.3 - dotnet-watch - 3.0.0-preview7.19351.3 - dotnet-dev-certs - 3.0.0-preview7.19351.3 - dotnet-user-secrets - 3.0.0-preview7.19351.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4bde91bbc..afc88be49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup ee0c7ead1a46f06f98aff9102b785f532b71da9c - + https://github.com/aspnet/AspNetCore - 60a8f2348e09f577b05568aba6ee6e5c9e4d4e81 + 635da5b73abdb5f6b1e3a5595c3a988385967272 - + https://github.com/aspnet/AspNetCore - 60a8f2348e09f577b05568aba6ee6e5c9e4d4e81 + 635da5b73abdb5f6b1e3a5595c3a988385967272 - + https://github.com/aspnet/AspNetCore - 60a8f2348e09f577b05568aba6ee6e5c9e4d4e81 + 635da5b73abdb5f6b1e3a5595c3a988385967272 - + https://github.com/aspnet/AspNetCore - 60a8f2348e09f577b05568aba6ee6e5c9e4d4e81 + 635da5b73abdb5f6b1e3a5595c3a988385967272 - + https://github.com/aspnet/AspNetCore - 60a8f2348e09f577b05568aba6ee6e5c9e4d4e81 + 635da5b73abdb5f6b1e3a5595c3a988385967272 - + https://github.com/aspnet/AspNetCore - 60a8f2348e09f577b05568aba6ee6e5c9e4d4e81 + 635da5b73abdb5f6b1e3a5595c3a988385967272 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 41ea836e6..c70e577fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19351.2 - 3.0.0-preview7.19351.2 - 3.0.0-preview7.19351.2 - 3.0.0-preview7.19351.2 - 3.0.0-preview7.19351.2 - 3.0.0-preview7.19351.2 + 3.0.0-preview7.19351.3 + 3.0.0-preview7.19351.3 + 3.0.0-preview7.19351.3 + 3.0.0-preview7.19351.3 + 3.0.0-preview7.19351.3 + 3.0.0-preview7.19351.3 From 143bd43fcf1d6cfd3581316b4ccb0f34b472ad3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 17:30:31 +0000 Subject: [PATCH 456/471] Update dependencies from https://github.com/dotnet/cli build 20190701.4 (#2737) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19351.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index afc88be49..83722333d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 46e1f004a34fe8ed6f608d20d5f8b0b862a245c1 - + https://github.com/dotnet/cli - 2d4d3e49de4cb340b018ca951ee8b0b75f78e963 + f02ca2efda62b92021d046adc6723910cb066ab6 diff --git a/eng/Versions.props b/eng/Versions.props index c70e577fe..f3c73eee0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19351.3 + 3.0.100-preview7.19351.4 2.0.0-preview.19330.1 From 4415bd8eab681fb5659c0f4e6facc2c31c38a7b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 19:59:07 +0000 Subject: [PATCH 457/471] Update dependencies from https://github.com/aspnet/AspNetCore build 20190701.4 (#2740) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview7.19351.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview7.19351.4 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview7.19351.4 - dotnet-watch - 3.0.0-preview7.19351.4 - dotnet-dev-certs - 3.0.0-preview7.19351.4 - dotnet-user-secrets - 3.0.0-preview7.19351.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83722333d..ee671d2c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup ee0c7ead1a46f06f98aff9102b785f532b71da9c - + https://github.com/aspnet/AspNetCore - 635da5b73abdb5f6b1e3a5595c3a988385967272 + 8057775f5891275632d0b8deda9f71975481be0e - + https://github.com/aspnet/AspNetCore - 635da5b73abdb5f6b1e3a5595c3a988385967272 + 8057775f5891275632d0b8deda9f71975481be0e - + https://github.com/aspnet/AspNetCore - 635da5b73abdb5f6b1e3a5595c3a988385967272 + 8057775f5891275632d0b8deda9f71975481be0e - + https://github.com/aspnet/AspNetCore - 635da5b73abdb5f6b1e3a5595c3a988385967272 + 8057775f5891275632d0b8deda9f71975481be0e - + https://github.com/aspnet/AspNetCore - 635da5b73abdb5f6b1e3a5595c3a988385967272 + 8057775f5891275632d0b8deda9f71975481be0e - + https://github.com/aspnet/AspNetCore - 635da5b73abdb5f6b1e3a5595c3a988385967272 + 8057775f5891275632d0b8deda9f71975481be0e https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index f3c73eee0..3f6436784 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview7.19351.3 - 3.0.0-preview7.19351.3 - 3.0.0-preview7.19351.3 - 3.0.0-preview7.19351.3 - 3.0.0-preview7.19351.3 - 3.0.0-preview7.19351.3 + 3.0.0-preview7.19351.4 + 3.0.0-preview7.19351.4 + 3.0.0-preview7.19351.4 + 3.0.0-preview7.19351.4 + 3.0.0-preview7.19351.4 + 3.0.0-preview7.19351.4 From d6603c2aa904c2c2040f6b7f06c5da908467cfe9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 20:10:56 +0000 Subject: [PATCH 458/471] [master] Update dependencies from dotnet/cli (#2742) * Update dependencies from https://github.com/dotnet/cli build 20190701.5 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19351.5 * Update dependencies from https://github.com/dotnet/cli build 20190701.6 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19351.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee671d2c6..00e881923 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 46e1f004a34fe8ed6f608d20d5f8b0b862a245c1 - + https://github.com/dotnet/cli - f02ca2efda62b92021d046adc6723910cb066ab6 + 1cb79ead112bb3c77231b6e435c64a4c4e69b0ed diff --git a/eng/Versions.props b/eng/Versions.props index 3f6436784..325e02315 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19351.4 + 3.0.100-preview7.19351.6 2.0.0-preview.19330.1 From 7e09593e7cae6bb9ace07da6277b1ed9cc8258bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 22:41:38 +0000 Subject: [PATCH 459/471] Update dependencies from https://github.com/dotnet/core-setup build 20190701.07 (#2744) - Microsoft.NETCore.App - 3.0.0-preview8-27901-07 - Microsoft.WindowsDesktop.App - 3.0.0-preview8-27901-07 - NETStandard.Library.Ref - 2.1.0-preview8-27901-07 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview7.19328.6 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview8.19329.4 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00e881923..992e78b3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - ee0c7ead1a46f06f98aff9102b785f532b71da9c + f8c97c34e80df0ce59dbdb36bfa11b1457842e9c - + https://github.com/dotnet/core-setup - ee0c7ead1a46f06f98aff9102b785f532b71da9c + f8c97c34e80df0ce59dbdb36bfa11b1457842e9c - + https://github.com/dotnet/core-setup - ee0c7ead1a46f06f98aff9102b785f532b71da9c + f8c97c34e80df0ce59dbdb36bfa11b1457842e9c https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 1cb79ead112bb3c77231b6e435c64a4c4e69b0ed - + https://github.com/dotnet/winforms - 9b0ec7bb6e82818a4ac80702a9cd5c45f5d2ffde + e6eae242229390ee477d70ba8424f266b801cb56 - + https://github.com/dotnet/wpf - 214d5f749dd3c5ff79579e9395ccd817d23134d8 + 17156fbea922c15ce2a77e66d798642a7ab8a607 diff --git a/eng/Versions.props b/eng/Versions.props index 325e02315..c537108c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview7.19325.3 + 4.8.0-preview7.19328.6 - 3.0.0-preview7.19326.12 + 3.0.0-preview8.19329.4 @@ -47,7 +47,7 @@ 3.0.100-preview7.19351.1 - 3.0.0-preview7-27826-20 + 3.0.0-preview8-27901-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview7-27826-20 + 2.1.0-preview8-27901-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview7-27826-20 + 3.0.0-preview8-27901-07 $(MicrosoftWindowsDesktopAppPackageVersion) From 47dde3907029b6efcc00afe4343e915be644e77d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 23:45:27 +0000 Subject: [PATCH 460/471] Update dependencies from https://github.com/dotnet/cli build 20190701.7 (#2746) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19351.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 992e78b3c..bfffa7cd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 46e1f004a34fe8ed6f608d20d5f8b0b862a245c1 - + https://github.com/dotnet/cli - 1cb79ead112bb3c77231b6e435c64a4c4e69b0ed + fa571fdeed91011008ea32dd40c335cd7b80a6ab diff --git a/eng/Versions.props b/eng/Versions.props index c537108c2..16b984327 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19351.6 + 3.0.100-preview7.19351.7 2.0.0-preview.19330.1 From e273dbad9f9d2f69533f6e1c045a23bbd7b5f5e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 23:53:24 +0000 Subject: [PATCH 461/471] Update dependencies from https://github.com/dotnet/toolset build 20190701.3 (#2747) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19351.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfffa7cd1..d82a7dde2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e49047593d9a8f71e48cf4283ed4debceb76409b - + https://github.com/dotnet/toolset - 2536cbc1705bc26a56938b2a7c8db3016e0b33dc + a75492eb4d209ba79e4a8b8c154f1035f80504df https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 16b984327..71509dfbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19330.1 + 3.0.100-preview7.19351.3 From 5705bb179d4100f721a6120928c9ee03c194ebc0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2019 00:25:37 +0000 Subject: [PATCH 462/471] Update dependencies from https://github.com/dotnet/toolset build 20190701.4 (#2748) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19351.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d82a7dde2..f188d1e19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e49047593d9a8f71e48cf4283ed4debceb76409b - + https://github.com/dotnet/toolset - a75492eb4d209ba79e4a8b8c154f1035f80504df + 0211cf50a29c2e16dbb27e965b1b48bded6f6345 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 71509dfbe..cde9a7f09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19351.3 + 3.0.100-preview7.19351.4 From fe4ddf9bab94cb234b9a5464f59ec2dc9692b69d Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 2 Jul 2019 01:40:13 +0000 Subject: [PATCH 463/471] Update dependencies from https://github.com/dotnet/cli build 20190701.8 - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19351.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f188d1e19..0ceaccfd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk 46e1f004a34fe8ed6f608d20d5f8b0b862a245c1 - + https://github.com/dotnet/cli - fa571fdeed91011008ea32dd40c335cd7b80a6ab + 30506b4d24faddb5f54a6480d7f269c73c1a7d17 diff --git a/eng/Versions.props b/eng/Versions.props index cde9a7f09..eb10fe6dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19351.7 + 3.0.100-preview7.19351.8 2.0.0-preview.19330.1 From 59c8877563a1611014b65547b12b9757d5617afe Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 2 Jul 2019 01:57:29 +0000 Subject: [PATCH 464/471] Update dependencies from https://github.com/dotnet/toolset build 20190701.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19351.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f188d1e19..d13438bd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e49047593d9a8f71e48cf4283ed4debceb76409b - + https://github.com/dotnet/toolset - 0211cf50a29c2e16dbb27e965b1b48bded6f6345 + 2a52256f3976bf478b28a6b6e7c033dcc3313635 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index cde9a7f09..9151dd4d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19351.4 + 3.0.100-preview7.19351.5 From 317ce94cb98aedecd766a616324e5219e903cb72 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 2 Jul 2019 02:56:59 +0000 Subject: [PATCH 465/471] Update dependencies from https://github.com/dotnet/sdk build 20190701.3 - Microsoft.NET.Sdk - 3.0.100-preview7.19351.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f188d1e19..2f58ca2f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 0211cf50a29c2e16dbb27e965b1b48bded6f6345 - + https://github.com/dotnet/sdk - 46e1f004a34fe8ed6f608d20d5f8b0b862a245c1 + e01aac6709b8cd81522fa23677a8e49d004983ae https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index cde9a7f09..c7bbabdc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 3.0.100-preview7.19351.1 + 3.0.100-preview7.19351.3 3.0.0-preview8-27901-07 From c2b4118f564a9ee3894686656944f18b431f7201 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 2 Jul 2019 03:13:21 +0000 Subject: [PATCH 466/471] Update dependencies from https://github.com/dotnet/toolset build 20190701.6 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19351.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d13438bd1..5a2abc61d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e49047593d9a8f71e48cf4283ed4debceb76409b - + https://github.com/dotnet/toolset - 2a52256f3976bf478b28a6b6e7c033dcc3313635 + 84e133f3ec7d0d1e2af3719fa0b3cb62a4d9c333 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9151dd4d0..90fcba24e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19351.5 + 3.0.100-preview7.19351.6 From 43d69fac0686a943cebdf461cecb4b7309840688 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2019 03:58:40 +0000 Subject: [PATCH 467/471] Update dependencies from https://github.com/dotnet/core-setup build 20190701.08 (#2755) - Microsoft.NETCore.App - 3.0.0-preview8-27901-08 - Microsoft.WindowsDesktop.App - 3.0.0-preview8-27901-08 - NETStandard.Library.Ref - 2.1.0-preview8-27901-08 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a4ca67aa..2308a1fc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - f8c97c34e80df0ce59dbdb36bfa11b1457842e9c + 788f9afff7b5c4cbb2115c688eabf4560bd334f8 - + https://github.com/dotnet/core-setup - f8c97c34e80df0ce59dbdb36bfa11b1457842e9c + 788f9afff7b5c4cbb2115c688eabf4560bd334f8 - + https://github.com/dotnet/core-setup - f8c97c34e80df0ce59dbdb36bfa11b1457842e9c + 788f9afff7b5c4cbb2115c688eabf4560bd334f8 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 4457b176b..2b00eab0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,7 +47,7 @@ 3.0.100-preview7.19351.3 - 3.0.0-preview8-27901-07 + 3.0.0-preview8-27901-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -55,11 +55,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview8-27901-07 + 2.1.0-preview8-27901-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview8-27901-07 + 3.0.0-preview8-27901-08 $(MicrosoftWindowsDesktopAppPackageVersion) From 237a3c8ba2cdff672ecffd6b92ce9a9204d3a8c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2019 05:00:25 +0000 Subject: [PATCH 468/471] Update dependencies from https://github.com/dotnet/cli build 20190701.9 (#2756) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview7.19351.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2308a1fc9..27a325f90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/sdk e01aac6709b8cd81522fa23677a8e49d004983ae - + https://github.com/dotnet/cli - 30506b4d24faddb5f54a6480d7f269c73c1a7d17 + 9a1bfd48934d87d02731eac7238f193ab9350c41 diff --git a/eng/Versions.props b/eng/Versions.props index 2b00eab0d..e3427c047 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-preview7.19351.8 + 3.0.100-preview7.19351.9 2.0.0-preview.19330.1 From 7d9fa50badc270f8b072aed484cdd6645343a7e4 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 2 Jul 2019 05:01:22 +0000 Subject: [PATCH 469/471] Update dependencies from https://github.com/dotnet/toolset build 20190701.7 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview7.19351.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a2abc61d..5eddfb563 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e49047593d9a8f71e48cf4283ed4debceb76409b - + https://github.com/dotnet/toolset - 84e133f3ec7d0d1e2af3719fa0b3cb62a4d9c333 + 4dd3ebe8036004016a2275e1b83af1adcc0b2a8a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 90fcba24e..1edac574f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19351.6 + 3.0.100-preview7.19351.7 From 0351c2323a64405e658ddce962e2eda5c4730d8b Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 2 Jul 2019 05:28:46 +0000 Subject: [PATCH 470/471] Update dependencies from https://github.com/dotnet/toolset build 20190701.9 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview8.19351.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5eddfb563..364edfcc5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e49047593d9a8f71e48cf4283ed4debceb76409b - + https://github.com/dotnet/toolset - 4dd3ebe8036004016a2275e1b83af1adcc0b2a8a + d73cb191abd22cfceb5aac2efdd52baba0598109 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 1edac574f..c80b7d036 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview7.19351.7 + 3.0.100-preview8.19351.9 From 670d13b4447b807d6f5a7492c521527a01424fe4 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 1 Jul 2019 22:36:33 -0700 Subject: [PATCH 471/471] Skipping a failing test. Already reached out to the templating team to investigate. --- test/EndToEnd/GivenUnixPlatform.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/EndToEnd/GivenUnixPlatform.cs b/test/EndToEnd/GivenUnixPlatform.cs index 83e377f7a..bb93b72fe 100644 --- a/test/EndToEnd/GivenUnixPlatform.cs +++ b/test/EndToEnd/GivenUnixPlatform.cs @@ -10,7 +10,7 @@ namespace EndToEnd.Tests { public class GivenUnixPlatform : TestBase { - [UnixOnlyTheory] + [UnixOnlyTheory(Skip="https://github.com/dotnet/templating/issues/1979")] [InlineData("wpf")] [InlineData("winforms")] public void ItDoesNotIncludeWindowsOnlyProjectTemplates(string template)