From 032926e8fc9d9d34643e2bf6e4207a7a167df661 Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 21 Aug 2019 18:51:43 -0700 Subject: [PATCH 001/170] 3.1.1xx branding --- src/CopyToLatest/targets/BranchInfo.props | 2 +- src/redist/targets/Versions.targets | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CopyToLatest/targets/BranchInfo.props b/src/CopyToLatest/targets/BranchInfo.props index d103b00f0..7a1921c15 100644 --- a/src/CopyToLatest/targets/BranchInfo.props +++ b/src/CopyToLatest/targets/BranchInfo.props @@ -1,5 +1,5 @@ - release/3.0.1xx + release/3.1.1xx diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index 862b56369..1990e7e51 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -1,10 +1,10 @@ 3 - 0 + 1 1 00 - rc1 + alpha1 From f1c62d315e04c29feedb3596456670479ccd7859 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 23 Aug 2019 13:41:03 -0700 Subject: [PATCH 002/170] Correct branding --- 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 1990e7e51..cb5b34976 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -4,7 +4,7 @@ 1 1 00 - alpha1 + preview1 From 0c67172bafe250e36707f6b30c03f403b3017aa5 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 3 Sep 2019 14:33:11 -0700 Subject: [PATCH 003/170] Updates for 3.1.1xx --- src/redist/targets/Branding.targets | 7 ++++--- src/redist/targets/GenerateMSIs.targets | 6 ++---- src/redist/targets/Signing.targets | 1 - .../windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec | 1 - src/redist/targets/packaging/windows/clisdk/dotnet.wxs | 7 +------ .../targets/packaging/windows/clisdk/generatenupkg.ps1 | 5 ++--- 6 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets index e70d058c2..4a6c57f77 100644 --- a/src/redist/targets/Branding.targets +++ b/src/redist/targets/Branding.targets @@ -3,6 +3,7 @@ cli Microsoft .NET Core SDK $(CliBrandingVersion) + Microsoft .NET Core Toolset $(CliBrandingVersion) .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime $(MicrosoftNETCoreAppPackageVersion) Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppPackageVersion) @@ -12,9 +13,9 @@ Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreAppPackageVersion) Microsoft.NETCore.App $(SharedFrameworkName) - Microsoft .NET Core 3.0 Templates - Microsoft .NET Core 2.2 Templates - Microsoft .NET Core 2.1 Templates + Microsoft .NET Core 3.0 Templates $(CliBrandingVersion) + Microsoft .NET Core 2.2 Templates $(CliBrandingVersion) + Microsoft .NET Core 2.1 Templates $(CliBrandingVersion) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 4f060e4e5..2fd3ea9d3 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -38,7 +38,6 @@ $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension) - $(ArtifactsShippingPackagesDir)d$(Architecture)-1.cab Dotnet_CLI $(ArtifactsShippingPackagesDir)dotnet-30templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-22templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) @@ -136,7 +135,7 @@ '$(SdkInternalLayoutPath.TrimEnd('\'))' ^ '$(SdkMSIInstallerFile)' ^ '$(WixRoot)' ^ - '$(SdkBrandName)' ^ + '$(ToolsetBrandName)' ^ '$(MsiVersion)' ^ '$(SDKBundleVersion)' ^ '$(NugetVersion)' ^ @@ -274,8 +273,7 @@ '$(ToolsetInstallerNuspecFile)' ^ '$(ToolsetInstallerNupkgFile)' ^ '$(Architecture)' ^ - '$(MajorMinorVersion)' ^ - '$(SdkMSICabFile)'" /> + '$(MajorMinorVersion)'" /> - $(InternalCertificateId) diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec index 1c71d7a34..0291b8034 100644 --- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec @@ -14,6 +14,5 @@ - diff --git a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs index ef0adfd73..e3be35ece 100644 --- a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs +++ b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs @@ -10,12 +10,7 @@ - - - - - - + diff --git a/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1 b/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1 index 9fda65872..9b33b4056 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1 @@ -8,8 +8,7 @@ param( [Parameter(Mandatory=$true)][string]$NuspecFile, [Parameter(Mandatory=$true)][string]$NupkgFile, [Parameter(Mandatory=$false)][string]$Architecture, - [Parameter(Mandatory=$false)][string]$MmVersion, - [Parameter(Mandatory=$false)][string]$CabPath + [Parameter(Mandatory=$false)][string]$MmVersion ) $NuGetDir = Join-Path $BinDir "nuget" @@ -34,5 +33,5 @@ if (Test-Path $NupkgFile) { Remove-Item -Force $NupkgFile } -& $NuGetExe pack $NuspecFile -Version $NugetVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties PAYLOAD_FILES=$ContentPath`;DOTNET_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR_MINOR=$MmVersion +& $NuGetExe pack $NuspecFile -Version $NugetVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties PAYLOAD_FILES=$ContentPath`;ARCH=$Architecture`;MAJOR_MINOR=$MmVersion Exit $LastExitCode From 4b7dd8edfb6f0eea3db53abcccb66b7e1911197f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Sep 2019 23:29:22 +0000 Subject: [PATCH 004/170] Update dependencies from https://github.com/dotnet/core-setup build 20190904.13 - Microsoft.NETCore.App - 3.1.0-preview1.19454.13 - NETStandard.Library.Ref - 2.1.0-preview1.19454.13 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19454.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 ea444aff6..9c4d1806b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - f385116c74c1513e7e241f0586675486e9b25115 + 46108b6c1aad209a359a4a3d28e1a3b214f33e4b - + https://github.com/dotnet/core-setup - f385116c74c1513e7e241f0586675486e9b25115 + 46108b6c1aad209a359a4a3d28e1a3b214f33e4b - + https://github.com/dotnet/core-setup - f385116c74c1513e7e241f0586675486e9b25115 + 46108b6c1aad209a359a4a3d28e1a3b214f33e4b https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index df7300974..26f16c841 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19420-08 + 3.1.0-preview1.19454.13 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19420-08 + 2.1.0-preview1.19454.13 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19420-08 + 3.1.0-preview1.19454.13 $(MicrosoftWindowsDesktopAppPackageVersion) From 6e26d4bb198e467e4463d52b0effbf688a7ea987 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Sep 2019 01:23:44 +0000 Subject: [PATCH 005/170] Update dependencies from https://github.com/dotnet/core-setup build 20190904.16 - Microsoft.NETCore.App - 3.1.0-preview1.19454.16 - NETStandard.Library.Ref - 2.1.0-preview1.19454.16 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19454.16 --- 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 9c4d1806b..3ec90b2c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 46108b6c1aad209a359a4a3d28e1a3b214f33e4b + 93e1324ce55c1bbd01206eff6bd659bdf34f8fe1 - + https://github.com/dotnet/core-setup - 46108b6c1aad209a359a4a3d28e1a3b214f33e4b + 93e1324ce55c1bbd01206eff6bd659bdf34f8fe1 - + https://github.com/dotnet/core-setup - 46108b6c1aad209a359a4a3d28e1a3b214f33e4b + 93e1324ce55c1bbd01206eff6bd659bdf34f8fe1 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 26f16c841..07ab80ac6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19454.13 + 3.1.0-preview1.19454.16 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19454.13 + 2.1.0-preview1.19454.16 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19454.13 + 3.1.0-preview1.19454.16 $(MicrosoftWindowsDesktopAppPackageVersion) From b613daeae880ff917a9ae82ba412162dfccb5f69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2019 13:41:47 +0000 Subject: [PATCH 006/170] Update dependencies from https://github.com/dotnet/arcade build 20190904.31 (#4580) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19454.31 --- eng/Version.Details.xml | 4 +- eng/common/darc-init.ps1 | 4 +- eng/common/darc-init.sh | 6 +- eng/common/init-tools-native.sh | 4 +- eng/common/native/CommonLibrary.psm1 | 2 + eng/common/native/install-cmake-test.sh | 117 ++++++++++++ eng/common/native/install-cmake.sh | 2 +- eng/common/performance/perfhelixpublish.proj | 29 ++- eng/common/performance/performance-setup.ps1 | 21 ++- eng/common/performance/performance-setup.sh | 78 ++++++-- eng/common/post-build/darc-gather-drop.ps1 | 10 + eng/common/post-build/dotnetsymbol-init.ps1 | 29 --- eng/common/post-build/sourcelink-cli-init.ps1 | 29 --- .../post-build/sourcelink-validation.ps1 | 84 ++++++--- eng/common/post-build/symbols-validation.ps1 | 20 +- eng/common/sdl/execute-all-sdl-tools.ps1 | 17 +- eng/common/sdl/init-sdl.ps1 | 3 + eng/common/sdl/packages.config | 4 +- eng/common/sdl/run-sdl.ps1 | 34 ++-- eng/common/templates/job/execute-sdl.yml | 17 +- eng/common/templates/job/job.yml | 6 +- ...lic-dev-release.yml => netcore-dev-30.yml} | 73 +++++--- .../post-build/channels/netcore-dev-31.yml | 165 +++++++++++++++++ .../post-build/channels/netcore-dev-5.yml | 165 +++++++++++++++++ ...-servicing.yml => netcore-internal-30.yml} | 59 +++--- ...lic-release.yml => netcore-release-30.yml} | 59 +++--- .../channels/netcore-release-31.yml | 160 ++++++++++++++++ .../channels/netcore-tools-latest.yml | 172 ++++++++++++++++++ .../channels/public-validation-release.yml | 51 ++++-- .../templates/post-build/common-variables.yml | 23 +++ .../templates/post-build/darc-gather-drop.yml | 2 +- .../templates/post-build/post-build.yml | 65 ++++++- .../templates/post-build/promote-build.yml | 2 +- eng/common/tools.ps1 | 11 +- eng/common/tools.sh | 21 ++- global.json | 2 +- 36 files changed, 1278 insertions(+), 272 deletions(-) create mode 100644 eng/common/native/install-cmake-test.sh delete mode 100644 eng/common/post-build/dotnetsymbol-init.ps1 delete mode 100644 eng/common/post-build/sourcelink-cli-init.ps1 rename eng/common/templates/post-build/channels/{public-dev-release.yml => netcore-dev-30.yml} (72%) create mode 100644 eng/common/templates/post-build/channels/netcore-dev-31.yml create mode 100644 eng/common/templates/post-build/channels/netcore-dev-5.yml rename eng/common/templates/post-build/channels/{internal-servicing.yml => netcore-internal-30.yml} (77%) rename eng/common/templates/post-build/channels/{public-release.yml => netcore-release-30.yml} (74%) create mode 100644 eng/common/templates/post-build/channels/netcore-release-31.yml create mode 100644 eng/common/templates/post-build/channels/netcore-tools-latest.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea444aff6..c990b13b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 8b670142ae1b65aa4d834257b0b64d4f69f30eb8 + 00d8aa82b488f321204a0e69a81399af9df276a1 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 8854d979f..46d175fdf 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,9 +1,9 @@ param ( $darcVersion = $null, - $versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16" + $versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16", + $verbosity = "m" ) -$verbosity = "m" . $PSScriptRoot\tools.ps1 function InstallDarcCli ($darcVersion) { diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index abdd0bc05..242429bca 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -3,6 +3,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' versionEndpoint="https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16" +verbosity=m while [[ $# > 0 ]]; do opt="$(echo "$1" | awk '{print tolower($0)}')" @@ -15,6 +16,10 @@ while [[ $# > 0 ]]; do versionEndpoint=$2 shift ;; + --verbosity) + verbosity=$2 + shift + ;; *) echo "Invalid argument: $1" usage @@ -34,7 +39,6 @@ while [[ -h "$source" ]]; do [[ $source != /* ]] && source="$scriptroot/$source" done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -verbosity=m . "$scriptroot/tools.sh" diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh index 5f2e77f44..4dafaaca1 100755 --- a/eng/common/init-tools-native.sh +++ b/eng/common/init-tools-native.sh @@ -70,8 +70,7 @@ function ReadGlobalJsonNativeTools { # Only extract the contents of the object. local native_tools_list=$(echo $native_tools_section | awk -F"[{}]" '{print $2}') native_tools_list=${native_tools_list//[\" ]/} - native_tools_list=${native_tools_list//,/$'\n'} - native_tools_list="$(echo -e "${native_tools_list}" | tr -d '[[:space:]]')" + native_tools_list=$( echo "$native_tools_list" | sed 's/\s//g' | sed 's/,/\n/g' ) local old_IFS=$IFS while read -r line; do @@ -108,6 +107,7 @@ else installer_command+=" --baseuri $base_uri" installer_command+=" --installpath $install_bin" installer_command+=" --version $tool_version" + echo $installer_command if [[ $force = true ]]; then installer_command+=" --force" diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1 index 2a08d5246..41416862d 100644 --- a/eng/common/native/CommonLibrary.psm1 +++ b/eng/common/native/CommonLibrary.psm1 @@ -152,6 +152,8 @@ function Get-File { } else { Write-Verbose "Downloading $Uri" + # Don't display the console progress UI - it's a huge perf hit + $ProgressPreference = 'SilentlyContinue' while($Attempt -Lt $DownloadRetries) { try { diff --git a/eng/common/native/install-cmake-test.sh b/eng/common/native/install-cmake-test.sh new file mode 100644 index 000000000..53ddf4e68 --- /dev/null +++ b/eng/common/native/install-cmake-test.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. $scriptroot/common-library.sh + +base_uri= +install_path= +version= +clean=false +force=false +download_retries=5 +retry_wait_time_seconds=30 + +while (($# > 0)); do + lowerI="$(echo $1 | awk '{print tolower($0)}')" + case $lowerI in + --baseuri) + base_uri=$2 + shift 2 + ;; + --installpath) + install_path=$2 + shift 2 + ;; + --version) + version=$2 + shift 2 + ;; + --clean) + clean=true + shift 1 + ;; + --force) + force=true + shift 1 + ;; + --downloadretries) + download_retries=$2 + shift 2 + ;; + --retrywaittimeseconds) + retry_wait_time_seconds=$2 + shift 2 + ;; + --help) + echo "Common settings:" + echo " --baseuri Base file directory or Url wrom which to acquire tool archives" + echo " --installpath Base directory to install native tool to" + echo " --clean Don't install the tool, just clean up the current install of the tool" + echo " --force Force install of tools even if they previously exist" + echo " --help Print help and exit" + echo "" + echo "Advanced settings:" + echo " --downloadretries Total number of retry attempts" + echo " --retrywaittimeseconds Wait time between retry attempts in seconds" + echo "" + exit 0 + ;; + esac +done + +tool_name="cmake-test" +tool_os=$(GetCurrentOS) +tool_folder=$(echo $tool_os | awk '{print tolower($0)}') +tool_arch="x86_64" +tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch" +tool_install_directory="$install_path/$tool_name/$version" +tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name" +shim_path="$install_path/$tool_name.sh" +uri="${base_uri}/$tool_folder/$tool_name/$tool_name_moniker.tar.gz" + +# Clean up tool and installers +if [[ $clean = true ]]; then + echo "Cleaning $tool_install_directory" + if [[ -d $tool_install_directory ]]; then + rm -rf $tool_install_directory + fi + + echo "Cleaning $shim_path" + if [[ -f $shim_path ]]; then + rm -rf $shim_path + fi + + tool_temp_path=$(GetTempPathFileName $uri) + echo "Cleaning $tool_temp_path" + if [[ -f $tool_temp_path ]]; then + rm -rf $tool_temp_path + fi + + exit 0 +fi + +# Install tool +if [[ -f $tool_file_path ]] && [[ $force = false ]]; then + echo "$tool_name ($version) already exists, skipping install" + exit 0 +fi + +DownloadAndExtract $uri $tool_install_directory $force $download_retries $retry_wait_time_seconds + +if [[ $? != 0 ]]; then + echo "Installation failed" >&2 + exit 1 +fi + +# Generate Shim +# Always rewrite shims so that we are referencing the expected version +NewScriptShim $shim_path $tool_file_path true + +if [[ $? != 0 ]]; then + echo "Shim generation failed" >&2 + exit 1 +fi + +exit 0 \ No newline at end of file diff --git a/eng/common/native/install-cmake.sh b/eng/common/native/install-cmake.sh index 293af6017..5f1a182fa 100755 --- a/eng/common/native/install-cmake.sh +++ b/eng/common/native/install-cmake.sh @@ -69,7 +69,7 @@ tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch" tool_install_directory="$install_path/$tool_name/$version" tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name" shim_path="$install_path/$tool_name.sh" -uri="${base_uri}/$tool_folder/cmake/$tool_name_moniker.tar.gz" +uri="${base_uri}/$tool_folder/$tool_name/$tool_name_moniker.tar.gz" # Clean up tool and installers if [[ $clean = true ]]; then diff --git a/eng/common/performance/perfhelixpublish.proj b/eng/common/performance/perfhelixpublish.proj index 05e5f0989..e5826b532 100644 --- a/eng/common/performance/perfhelixpublish.proj +++ b/eng/common/performance/perfhelixpublish.proj @@ -5,8 +5,14 @@ --dotnet-versions %DOTNET_VERSION% --cli-source-info args --cli-branch %PERFLAB_BRANCH% --cli-commit-sha %PERFLAB_HASH% --cli-repository https://github.com/%PERFLAB_REPO% --cli-source-timestamp %PERFLAB_BUILDTIMESTAMP% py -3 %HELIX_CORRELATION_PAYLOAD%\Core_Root\CoreRun.exe + %HELIX_CORRELATION_PAYLOAD%\Baseline_Core_Root\CoreRun.exe $(HelixPreCommands);call %HELIX_CORRELATION_PAYLOAD%\performance\tools\machine-setup.cmd %HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts + %HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts_Baseline + %HELIX_CORRELATION_PAYLOAD%\performance\src\tools\ResultsComparer\ResultsComparer.csproj + %HELIX_CORRELATION_PAYLOAD%\performance\tools\dotnet\$(Architecture)\dotnet.exe + %25%25 + %HELIX_WORKITEM_ROOT%\testResults.xml @@ -24,14 +30,24 @@ --dotnet-versions $DOTNET_VERSION --cli-source-info args --cli-branch $PERFLAB_BRANCH --cli-commit-sha $PERFLAB_HASH --cli-repository https://github.com/$PERFLAB_REPO --cli-source-timestamp $PERFLAB_BUILDTIMESTAMP python3 $(BaseDirectory)/Core_Root/corerun + $(BaseDirectory)/Baseline_Core_Root/corerun $(HelixPreCommands);chmod +x $(PerformanceDirectory)/tools/machine-setup.sh;. $(PerformanceDirectory)/tools/machine-setup.sh $(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts + $(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts_Baseline + $(PerformanceDirectory)/src/tools/ResultsComparer/ResultsComparer.csproj + $(PerformanceDirectory)/tools/dotnet/$(Architecture)/dotnet + %25 + $HELIX_WORKITEM_ROOT/testResults.xml --corerun $(CoreRun) + + --corerun $(BaselineCoreRun) + + $(Python) $(WorkItemCommand) --incremental no --architecture $(Architecture) -f $(_Framework) $(PerfLabArguments) @@ -57,20 +73,29 @@ + + false + + $(WorkItemDirectory) - $(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)" + $(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)" + $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)" + $(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults);$(FinalCommand) 4:00 + $(WorkItemDirectory) - $(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory)" + $(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument)" + $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)" + $(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults) 4:00 diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 7e5441f79..268986246 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -1,8 +1,9 @@ Param( [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, [string] $CoreRootDirectory, + [string] $BaselineCoreRootDirectory, [string] $Architecture="x64", - [string] $Framework="netcoreapp3.0", + [string] $Framework="netcoreapp5.0", [string] $CompilationMode="Tiered", [string] $Repository=$env:BUILD_REPOSITORY_NAME, [string] $Branch=$env:BUILD_SOURCEBRANCH, @@ -12,11 +13,13 @@ Param( [string] $Csproj="src\benchmarks\micro\MicroBenchmarks.csproj", [string] $Kind="micro", [switch] $Internal, + [switch] $Compare, [string] $Configurations="CompilationMode=$CompilationMode" ) $RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") $UseCoreRun = ($CoreRootDirectory -ne [string]::Empty) +$UseBaselineCoreRun = ($BaselineCoreRootDirectory -ne [string]::Empty) $PayloadDirectory = (Join-Path $SourceDirectory "Payload") $PerformanceDirectory = (Join-Path $PayloadDirectory "performance") @@ -29,11 +32,17 @@ $HelixSourcePrefix = "pr" $Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open" if ($Framework.StartsWith("netcoreapp")) { - $Queue = "Windows.10.Amd64.ClientRS4.Open" + $Queue = "Windows.10.Amd64.ClientRS5.Open" +} + +if ($Compare) { + $Queue = "Windows.10.Amd64.19H1.Tiger.Perf.Open" + $PerfLabArguments = "" + $ExtraBenchmarkDotNetArguments = "" } if ($Internal) { - $Queue = "Windows.10.Amd64.ClientRS5.Perf" + $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" $PerfLabArguments = "--upload-to-perflab-container" $ExtraBenchmarkDotNetArguments = "" $Creator = "" @@ -56,6 +65,10 @@ if ($UseCoreRun) { $NewCoreRoot = (Join-Path $PayloadDirectory "Core_Root") Move-Item -Path $CoreRootDirectory -Destination $NewCoreRoot } +if ($UseBaselineCoreRun) { + $NewBaselineCoreRoot = (Join-Path $PayloadDirectory "Baseline_Core_Root") + Move-Item -Path $BaselineCoreRootDirectory -Destination $NewBaselineCoreRoot +} $DocsDir = (Join-Path $PerformanceDirectory "docs") robocopy $DocsDir $WorkItemDirectory @@ -80,7 +93,9 @@ Write-PipelineSetVariable -Name 'TargetCsproj' -Value "$Csproj" -IsMultiJobVaria Write-PipelineSetVariable -Name 'Kind' -Value "$Kind" -IsMultiJobVariable $false Write-PipelineSetVariable -Name 'Architecture' -Value "$Architecture" -IsMultiJobVariable $false Write-PipelineSetVariable -Name 'UseCoreRun' -Value "$UseCoreRun" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'UseBaselineCoreRun' -Value "$UseBaselineCoreRun" -IsMultiJobVariable $false Write-PipelineSetVariable -Name 'RunFromPerfRepo' -Value "$RunFromPerformanceRepo" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'Compare' -Value "$Compare" -IsMultiJobVariable $false # Helix Arguments Write-PipelineSetVariable -Name 'Creator' -Value "$Creator" -IsMultiJobVariable $false diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index 126da5f76..550b3ebf1 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -2,20 +2,23 @@ source_directory=$BUILD_SOURCESDIRECTORY core_root_directory= +baseline_core_root_directory= architecture=x64 -framework=netcoreapp3.0 +framework=netcoreapp5.0 compilation_mode=tiered repository=$BUILD_REPOSITORY_NAME branch=$BUILD_SOURCEBRANCH commit_sha=$BUILD_SOURCEVERSION build_number=$BUILD_BUILDNUMBER internal=false +compare=false kind="micro" run_categories="coreclr corefx" csproj="src\benchmarks\micro\MicroBenchmarks.csproj" configurations= run_from_perf_repo=false use_core_run=true +use_baseline_core_run=true while (($# > 0)); do lowerI="$(echo $1 | awk '{print tolower($0)}')" @@ -28,6 +31,10 @@ while (($# > 0)); do core_root_directory=$2 shift 2 ;; + --baselinecorerootdirectory) + baseline_core_root_directory=$2 + shift 2 + ;; --architecture) architecture=$2 shift 2 @@ -72,6 +79,10 @@ while (($# > 0)); do internal=true shift 1 ;; + --compare) + compare=true + shift 1 + ;; --configurations) configurations=$2 shift 2 @@ -114,6 +125,10 @@ if [ -z "$core_root_directory" ]; then use_core_run=false fi +if [ -z "$baseline_core_root_directory" ]; then + use_baseline_core_run=false +fi + payload_directory=$source_directory/Payload performance_directory=$payload_directory/performance workitem_directory=$source_directory/workitem @@ -123,6 +138,19 @@ queue=Ubuntu.1804.Amd64.Open creator=$BUILD_DEFINITIONNAME helix_source_prefix="pr" +if [[ "$compare" == true ]]; then + extra_benchmark_dotnet_arguments= + perflab_arguments= + + # No open queues for arm64 + if [[ "$architecture" = "arm64" ]]; then + echo "Compare not available for arm64" + exit 1 + fi + + queue=Ubuntu.1804.Amd64.Tiger.Perf.Open +fi + if [[ "$internal" == true ]]; then perflab_arguments="--upload-to-perflab-container" helix_source_prefix="official" @@ -132,7 +160,7 @@ if [[ "$internal" == true ]]; then if [[ "$architecture" = "arm64" ]]; then queue=Ubuntu.1804.Arm64.Perf else - queue=Ubuntu.1804.Amd64.Perf + queue=Ubuntu.1804.Amd64.Tiger.Perf fi fi @@ -156,21 +184,33 @@ if [[ "$use_core_run" = true ]]; then mv $core_root_directory $new_core_root fi +if [[ "$use_baseline_core_run" = true ]]; then + new_baseline_core_root=$payload_directory/Baseline_Core_Root + mv $baseline_core_root_directory $new_baseline_core_root +fi + +ci=true + +_script_dir=$(pwd)/eng/common +. "$_script_dir/pipeline-logging-functions.sh" + # Make sure all of our variables are available for future steps -echo "##vso[task.setvariable variable=UseCoreRun]$use_core_run" -echo "##vso[task.setvariable variable=Architecture]$architecture" -echo "##vso[task.setvariable variable=PayloadDirectory]$payload_directory" -echo "##vso[task.setvariable variable=PerformanceDirectory]$performance_directory" -echo "##vso[task.setvariable variable=WorkItemDirectory]$workitem_directory" -echo "##vso[task.setvariable variable=Queue]$queue" -echo "##vso[task.setvariable variable=SetupArguments]$setup_arguments" -echo "##vso[task.setvariable variable=Python]python3" -echo "##vso[task.setvariable variable=PerfLabArguments]$perflab_arguments" -echo "##vso[task.setvariable variable=ExtraBenchmarkDotNetArguments]$extra_benchmark_dotnet_arguments" -echo "##vso[task.setvariable variable=BDNCategories]$run_categories" -echo "##vso[task.setvariable variable=TargetCsproj]$csproj" -echo "##vso[task.setvariable variable=RunFromPerfRepo]$run_from_perf_repo" -echo "##vso[task.setvariable variable=Creator]$creator" -echo "##vso[task.setvariable variable=HelixSourcePrefix]$helix_source_prefix" -echo "##vso[task.setvariable variable=Kind]$kind" -echo "##vso[task.setvariable variable=_BuildConfig]$architecture.$kind.$framework" \ No newline at end of file +Write-PipelineSetVariable -name "UseCoreRun" -value "$use_core_run" -is_multi_job_variable false +Write-PipelineSetVariable -name "UseBaselineCoreRun" -value "$use_baseline_core_run" -is_multi_job_variable false +Write-PipelineSetVariable -name "Architecture" -value "$architecture" -is_multi_job_variable false +Write-PipelineSetVariable -name "PayloadDirectory" -value "$payload_directory" -is_multi_job_variable false +Write-PipelineSetVariable -name "PerformanceDirectory" -value "$performance_directory" -is_multi_job_variable false +Write-PipelineSetVariable -name "WorkItemDirectory" -value "$workitem_directory" -is_multi_job_variable false +Write-PipelineSetVariable -name "Queue" -value "$queue" -is_multi_job_variable false +Write-PipelineSetVariable -name "SetupArguments" -value "$setup_arguments" -is_multi_job_variable false +Write-PipelineSetVariable -name "Python" -value "$python3" -is_multi_job_variable false +Write-PipelineSetVariable -name "PerfLabArguments" -value "$perflab_arguments" -is_multi_job_variable false +Write-PipelineSetVariable -name "ExtraBenchmarkDotNetArguments" -value "$extra_benchmark_dotnet_arguments" -is_multi_job_variable false +Write-PipelineSetVariable -name "BDNCategories" -value "$run_categories" -is_multi_job_variable false +Write-PipelineSetVariable -name "TargetCsproj" -value "$csproj" -is_multi_job_variable false +Write-PipelineSetVariable -name "RunFromPerfRepo" -value "$run_from_perf_repo" -is_multi_job_variable false +Write-PipelineSetVariable -name "Creator" -value "$creator" -is_multi_job_variable false +Write-PipelineSetVariable -name "HelixSourcePrefix" -value "$helix_source_prefix" -is_multi_job_variable false +Write-PipelineSetVariable -name "Kind" -value "$kind" -is_multi_job_variable false +Write-PipelineSetVariable -name "_BuildConfig" -value "$architecture.$kind.$framework" -is_multi_job_variable false +Write-PipelineSetVariable -name "Compare" -value "$compare" -is_multi_job_variable false diff --git a/eng/common/post-build/darc-gather-drop.ps1 b/eng/common/post-build/darc-gather-drop.ps1 index 93a0bd832..89854d3c1 100644 --- a/eng/common/post-build/darc-gather-drop.ps1 +++ b/eng/common/post-build/darc-gather-drop.ps1 @@ -19,7 +19,17 @@ try { ExitWithExitCode $exitCode } + # For now, only use a dry run. + # Ideally we would change darc to enable a quick request that + # would check whether the file exists that you can download it, + # and that it won't conflict with other files. + # https://github.com/dotnet/arcade/issues/3674 + # Right now we can't remove continue-on-error because we ocassionally will have + # dependencies that have no associated builds (e.g. an old dependency). + # We need to add an option to baseline specific dependencies away, or add them manually + # to the BAR. darc gather-drop --non-shipping ` + --dry-run ` --continue-on-error ` --id $BarBuildId ` --output-dir $DropLocation ` diff --git a/eng/common/post-build/dotnetsymbol-init.ps1 b/eng/common/post-build/dotnetsymbol-init.ps1 deleted file mode 100644 index e7659b98c..000000000 --- a/eng/common/post-build/dotnetsymbol-init.ps1 +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 9eaa25b3b..000000000 --- a/eng/common/post-build/sourcelink-cli-init.ps1 +++ /dev/null @@ -1,29 +0,0 @@ -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 index 41e01ae6e..bbfdacca1 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -1,8 +1,8 @@ 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=$false)][string] $GHRepoName, # GitHub name of the repo including the Org. E.g., dotnet/arcade + [Parameter(Mandatory=$false)][string] $GHCommit, # GitHub commit SHA used to build the packages [Parameter(Mandatory=$true)][string] $SourcelinkCliVersion # Version of SourceLink CLI to use ) @@ -13,6 +13,12 @@ param( # all files present in the repo at a specific commit point. $global:RepoFiles = @{} +# Maximum number of jobs to run in parallel +$MaxParallelJobs = 6 + +# Wait time between check for system load +$SecondsBetweenLoadChecks = 10 + $ValidatePackage = { param( [string] $PackagePath # Full path to a Symbols.NuGet package @@ -22,8 +28,8 @@ $ValidatePackage = { # Ensure input file exist if (!(Test-Path $PackagePath)) { - Write-PipelineTaskError "Input file does not exist: $PackagePath" - ExitWithExitCode 1 + Write-Host "Input file does not exist: $PackagePath" + return 1 } # Extensions for which we'll look for SourceLink information @@ -38,7 +44,7 @@ $ValidatePackage = { Add-Type -AssemblyName System.IO.Compression.FileSystem - [System.IO.Directory]::CreateDirectory($ExtractPath); + [System.IO.Directory]::CreateDirectory($ExtractPath) | Out-Null try { $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) @@ -138,16 +144,18 @@ $ValidatePackage = { if ($FailedFiles -eq 0) { Write-Host "Passed." + return 0 } else { - Write-PipelineTaskError "$PackagePath has broken SourceLink links." + Write-Host "$PackagePath has broken SourceLink links." + return 1 } } function ValidateSourceLinkLinks { - if (!($GHRepoName -Match "^[^\s\/]+/[^\s\/]+$")) { + if ($GHRepoName -ne "" -and !($GHRepoName -Match "^[^\s\/]+/[^\s\/]+$")) { if (!($GHRepoName -Match "^[^\s-]+-[^\s]+$")) { - Write-PipelineTaskError "GHRepoName should be in the format / or -" + Write-PipelineTaskError "GHRepoName should be in the format / or -. '$GHRepoName'" ExitWithExitCode 1 } else { @@ -155,30 +163,33 @@ function ValidateSourceLinkLinks { } } - if (!($GHCommit -Match "^[0-9a-fA-F]{40}$")) { - Write-PipelineTaskError "GHCommit should be a 40 chars hexadecimal string" + if ($GHCommit -ne "" -and !($GHCommit -Match "^[0-9a-fA-F]{40}$")) { + Write-PipelineTaskError "GHCommit should be a 40 chars hexadecimal string. '$GHCommit'" ExitWithExitCode 1 } - $RepoTreeURL = -Join("http://api.github.com/repos/", $GHRepoName, "/git/trees/", $GHCommit, "?recursive=1") - $CodeExtensions = @(".cs", ".vb", ".fs", ".fsi", ".fsx", ".fsscript") + if ($GHRepoName -ne "" -and $GHCommit -ne "") { + $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 + 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) + foreach ($file in $Data) { + $Extension = [System.IO.Path]::GetExtension($file.path) - if ($CodeExtensions.Contains($Extension)) { - $RepoFiles[$file.path] = 1 + if ($CodeExtensions.Contains($Extension)) { + $RepoFiles[$file.path] = 1 + } } } + catch { + Write-Host "Problems downloading the list of files from the repo. Url used: $RepoTreeURL . Execution will proceed without caching." + } } - catch { - Write-PipelineTaskError "Problems downloading the list of files from the repo. Url used: $RepoTreeURL" - Write-Host $_ - ExitWithExitCode 1 + elseif ($GHRepoName -ne "" -or $GHCommit -ne "") { + Write-Host "For using the http caching mechanism both GHRepoName and GHCommit should be informed." } if (Test-Path $ExtractPath) { @@ -186,14 +197,33 @@ function ValidateSourceLinkLinks { } # Process each NuGet package in parallel - $Jobs = @() Get-ChildItem "$InputPath\*.symbols.nupkg" | ForEach-Object { - $Jobs += Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName + Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName | Out-Null + $NumJobs = @(Get-Job -State 'Running').Count + + while ($NumJobs -ge $MaxParallelJobs) { + Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again." + sleep $SecondsBetweenLoadChecks + $NumJobs = @(Get-Job -State 'Running').Count + } + + foreach ($Job in @(Get-Job -State 'Completed')) { + Receive-Job -Id $Job.Id + Remove-Job -Id $Job.Id + } } - foreach ($Job in $Jobs) { - Wait-Job -Id $Job.Id | Receive-Job + $ValidationFailures = 0 + foreach ($Job in @(Get-Job)) { + $jobResult = Wait-Job -Id $Job.Id | Receive-Job + if ($jobResult -ne "0") { + $ValidationFailures++ + } + } + if ($ValidationFailures -gt 0) { + Write-PipelineTaskError " $ValidationFailures package(s) failed validation." + ExitWithExitCode 1 } } diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index d5ec51b15..096ac321d 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -37,10 +37,10 @@ function FirstMatchingSymbolDescriptionOrDefault { # DWARF file for a .dylib $DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf") - $dotnetsymbolExe = "$env:USERPROFILE\.dotnet\tools" - $dotnetsymbolExe = Resolve-Path "$dotnetsymbolExe\dotnet-symbol.exe" + $dotnetSymbolExe = "$env:USERPROFILE\.dotnet\tools" + $dotnetSymbolExe = Resolve-Path "$dotnetSymbolExe\dotnet-symbol.exe" - & $dotnetsymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null + & $dotnetSymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null if (Test-Path $PdbPath) { return "PDB" @@ -159,25 +159,25 @@ function CheckSymbolsAvailable { } } -function Installdotnetsymbol { - $dotnetsymbolPackageName = "dotnet-symbol" +function InstallDotnetSymbol { + $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." + 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 "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 "minimal" --global + & "$dotnet" tool install $dotnetSymbolPackageName --version $dotnetSymbolVersion --verbosity "minimal" --global } } try { - Installdotnetsymbol + InstallDotnetSymbol CheckSymbolsAvailable } diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index aab7589f2..01799d63f 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -45,6 +45,7 @@ if ($GuardianPackageName) { $guardianCliLocation = $GuardianCliLocation } +$workingDirectory = (Split-Path $SourceDirectory -Parent) $ValidPath = Test-Path $guardianCliLocation if ($ValidPath -eq $False) @@ -53,13 +54,13 @@ if ($ValidPath -eq $False) exit 1 } -& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $ArtifactsDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel -$gdnFolder = Join-Path $ArtifactsDirectory ".gdn" +& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel +$gdnFolder = Join-Path $workingDirectory ".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 + 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 $workingDirectory --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 $workingDirectory --logger-level $GuardianLoggerLevel if ($LASTEXITCODE -ne 0) { Write-Host "Guardian tsa-onboard failed with exit code $LASTEXITCODE." exit $LASTEXITCODE @@ -71,10 +72,10 @@ 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 -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams + & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams } if ($SourceToolsList -and $SourceToolsList.Count -gt 0) { - & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams + & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams } if ($UpdateBaseline) { @@ -86,8 +87,8 @@ if ($TsaPublish) { 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 + 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 $workingDirectory --logger-level $GuardianLoggerLevel" + & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel if ($LASTEXITCODE -ne 0) { Write-Host "Guardian tsa-publish failed with exit code $LASTEXITCODE." exit $LASTEXITCODE diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index 26e01c067..c737eb0e7 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -11,6 +11,9 @@ $ErrorActionPreference = "Stop" Set-StrictMode -Version 2.0 $LASTEXITCODE = 0 +# Don't display the console progress UI - it's a huge perf hit +$ProgressPreference = 'SilentlyContinue' + # 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(":$AzureDevOpsAccessToken")) $escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index fb9b71286..256ffbfb9 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + - + diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1 index d7b856445..9bc25314a 100644 --- a/eng/common/sdl/run-sdl.ps1 +++ b/eng/common/sdl/run-sdl.ps1 @@ -25,43 +25,35 @@ if ($ValidPath -eq $False) exit 1 } +$configParam = @("--config") + 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 `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})" - & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams}) + Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory < $TargetDirectory `" `" OutputType < pre `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})" + & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory < $TargetDirectory " "OutputType < pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams}) 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 `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})" - & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target : $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams}) + Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target < $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})" + & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target < $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams}) 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 - } - } + $configParam+=$gdnConfigFile } +Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam" +& $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam +if ($LASTEXITCODE -ne 0) { + Write-Host "Guardian run for $ToolsList using $configParam failed with exit code $LASTEXITCODE." + exit $LASTEXITCODE +} diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 5837f3d56..a7f996419 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -1,7 +1,10 @@ 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; + # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named + # 'continueOnError', the parameter value is not correctly picked up. + # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter + sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; dependsOn: '' # Optional: dependencies of the job jobs: @@ -10,6 +13,8 @@ jobs: displayName: Run SDL tool variables: - group: DotNet-VSTS-Bot + pool: + name: Hosted VS2017 steps: - checkout: self clean: true @@ -24,12 +29,12 @@ jobs: -InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts displayName: Extract Blob Artifacts - continueOnError: ${{ parameters.continueOnError }} + continueOnError: ${{ parameters.sdlContinueOnError }} - 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 }} + continueOnError: ${{ parameters.sdlContinueOnError }} - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' - task: NuGetCommand@2 @@ -43,12 +48,12 @@ jobs: - ${{ if ne(parameters.overrideParameters, '') }}: - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 ${{ parameters.overrideParameters }} displayName: Execute SDL - continueOnError: ${{ parameters.continueOnError }} + continueOnError: ${{ parameters.sdlContinueOnError }} - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 - -GuardianPackageName Microsoft.Guardian.Cli.0.6.0 + -GuardianPackageName Microsoft.Guardian.Cli.0.7.2 -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} displayName: Execute SDL - continueOnError: ${{ parameters.continueOnError }} + continueOnError: ${{ parameters.sdlContinueOnError }} diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 1814e0ab6..8db456bb7 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -37,6 +37,9 @@ parameters: # Optional: Enable publishing to the build asset registry enablePublishBuildAssets: false + # Optional: Prevent gather/push manifest from executing when using publishing pipelines + enablePublishUsingPipelines: false + # Optional: Include PublishTestResults task enablePublishTestResults: false @@ -187,7 +190,7 @@ jobs: continueOnError: true condition: always() - - ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(variables['_PublishUsingPipelines'], 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: CopyFiles@2 displayName: Gather Asset Manifests inputs: @@ -195,6 +198,7 @@ jobs: TargetFolder: '$(Build.StagingDirectory)/AssetManifests' continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + - task: PublishBuildArtifacts@1 displayName: Push Asset Manifests inputs: diff --git a/eng/common/templates/post-build/channels/public-dev-release.yml b/eng/common/templates/post-build/channels/netcore-dev-30.yml similarity index 72% rename from eng/common/templates/post-build/channels/public-dev-release.yml rename to eng/common/templates/post-build/channels/netcore-dev-30.yml index b0f085b14..3ce7ce4d6 100644 --- a/eng/common/templates/post-build/channels/public-dev-release.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-30.yml @@ -1,40 +1,51 @@ parameters: enableSymbolValidation: true + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false stages: -- stage: Publish +- stage: NetCore_Dev30_Publish dependsOn: validate variables: - template: ../common-variables.yml - displayName: Developer Channel + displayName: .NET Core 3.0 Dev Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_30_Channel_Id)) variables: - group: DotNet-Symbol-Server-Pats pool: vmImage: 'windows-2019' steps: - task: DownloadBuildArtifacts@0 - displayName: Download Artifacts + displayName: Download Blob Artifacts inputs: - downloadType: specific files - matchingPattern: "*Artifacts*" + artifactName: 'BlobArtifacts' + continueOnError: true + + - task: DownloadBuildArtifacts@0 + displayName: Download PDB Artifacts + inputs: + artifactName: 'PDBArtifacts' + continueOnError: true - 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:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' /p:Configuration=Release + ${{ parameters.symbolPublishingAdditionalParameters }} - job: displayName: Publish Assets @@ -46,7 +57,7 @@ stages: 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) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_30_Channel_Id)) pool: vmImage: 'windows-2019' steps: @@ -74,7 +85,7 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ChannelId=$(PublicDevRelease_30_Channel_Id) /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) @@ -82,17 +93,23 @@ stages: /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='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - + /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='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + ${{ parameters.artifactsPublishingAdditionalParameters }} + - task: NuGetCommand@2 displayName: Publish Packages to AzDO Feed condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') @@ -106,16 +123,16 @@ stages: displayName: Publish Blobs to AzDO Feed inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 - arguments: -FeedName $(AzDoFeedName) + arguments: -FeedName $(AzDoFeedName) -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) enabled: false -- stage: PublishValidation - displayName: Publish Validation +- stage: NetCore_Dev30_Publish_Validation + displayName: .NET Core 3.0 Dev Publish Validation variables: - - template: ../common-variables.yml + - template: ../common-variables.yml jobs: - template: ../setup-maestro-vars.yml @@ -123,7 +140,7 @@ stages: - job: displayName: Symbol Availability dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_30_Channel_Id)) pool: vmImage: 'windows-2019' steps: @@ -143,6 +160,6 @@ stages: parameters: ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} - - template: ../promote-build.yml - parameters: + - template: ../promote-build.yml + parameters: ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml new file mode 100644 index 000000000..d40aaacc4 --- /dev/null +++ b/eng/common/templates/post-build/channels/netcore-dev-31.yml @@ -0,0 +1,165 @@ +parameters: + enableSymbolValidation: true + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false + +stages: +- stage: NetCore_Dev31_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: .NET Core 3.1 Dev Publishing + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Symbol Publishing + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) + variables: + - group: DotNet-Symbol-Server-Pats + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + artifactName: 'BlobArtifacts' + continueOnError: true + + - task: DownloadBuildArtifacts@0 + displayName: Download PDB Artifacts + inputs: + artifactName: 'PDBArtifacts' + continueOnError: true + + - 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:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + /p:Configuration=Release + ${{ parameters.symbolPublishingAdditionalParameters }} + + - job: + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - 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'], format('[{0}]', variables.PublicDevRelease_31_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=$(PublicDevRelease_31_Channel_Id) + /p:ArtifactsCategory=$(_DotNetArtifactsCategory) + /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='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + ${{ parameters.artifactsPublishingAdditionalParameters }} + + - 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: NetCore_Dev31_Publish_Validation + displayName: .NET Core 3.1 Dev 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'], format('[{0}]', variables.PublicDevRelease_31_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) + + - template: ../darc-gather-drop.yml + parameters: + ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml new file mode 100644 index 000000000..584185c2a --- /dev/null +++ b/eng/common/templates/post-build/channels/netcore-dev-5.yml @@ -0,0 +1,165 @@ +parameters: + enableSymbolValidation: true + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false + +stages: +- stage: NetCore_Dev5_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: .NET Core 5 Dev Publishing + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Symbol Publishing + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) + variables: + - group: DotNet-Symbol-Server-Pats + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + artifactName: 'BlobArtifacts' + continueOnError: true + + - task: DownloadBuildArtifacts@0 + displayName: Download PDB Artifacts + inputs: + artifactName: 'PDBArtifacts' + continueOnError: true + + - 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:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + /p:Configuration=Release + ${{ parameters.symbolPublishingAdditionalParameters }} + + - job: + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - 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'], format('[{0}]', variables.NetCore_5_Dev_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=$(NetCore_5_Dev_Channel_Id) + /p:ArtifactsCategory=$(_DotNetArtifactsCategory) + /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='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + ${{ parameters.artifactsPublishingAdditionalParameters }} + + - 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: NetCore_Dev5_Publish_Validation + displayName: .NET Core 5 Dev 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'], format('[{0}]', variables.NetCore_5_Dev_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) + + - template: ../darc-gather-drop.yml + parameters: + ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/internal-servicing.yml b/eng/common/templates/post-build/channels/netcore-internal-30.yml similarity index 77% rename from eng/common/templates/post-build/channels/internal-servicing.yml rename to eng/common/templates/post-build/channels/netcore-internal-30.yml index 12fd2b465..8bf88fd49 100644 --- a/eng/common/templates/post-build/channels/internal-servicing.yml +++ b/eng/common/templates/post-build/channels/netcore-internal-30.yml @@ -1,40 +1,50 @@ parameters: enableSymbolValidation: true + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' stages: -- stage: IS_Publish +- stage: NetCore_30_Internal_Servicing_Publishing dependsOn: validate variables: - template: ../common-variables.yml - displayName: Internal Servicing + displayName: .NET Core 3.0 Internal Servicing Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) variables: - group: DotNet-Symbol-Server-Pats pool: vmImage: 'windows-2019' steps: - task: DownloadBuildArtifacts@0 - displayName: Download Artifacts + displayName: Download Blob Artifacts inputs: - downloadType: specific files - matchingPattern: "*Artifacts*" + artifactName: 'BlobArtifacts' + continueOnError: true + + - task: DownloadBuildArtifacts@0 + displayName: Download PDB Artifacts + inputs: + artifactName: 'PDBArtifacts' + continueOnError: true - 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:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' /p:Configuration=Release + ${{ parameters.symbolPublishingAdditionalParameters }} - job: publish_assets displayName: Publish Assets @@ -46,7 +56,7 @@ stages: 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) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) pool: vmImage: 'windows-2019' steps: @@ -74,7 +84,7 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ChannelId=$(InternalServicing_30_Channel_Id) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) @@ -85,14 +95,15 @@ stages: /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url) /p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url) /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' - /p:Configuration=Release - + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' + /p:Configuration=Release + ${{ parameters.artifactsPublishingAdditionalParameters }} + - task: NuGetCommand@2 displayName: Publish Packages to AzDO Feed condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') @@ -106,7 +117,7 @@ stages: displayName: Publish Blobs to AzDO Feed inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 - arguments: -FeedName $(AzDoFeedName) + arguments: -FeedName $(AzDoFeedName) -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) enabled: false @@ -114,11 +125,11 @@ stages: - template: ../trigger-subscription.yml parameters: ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} - -- stage: IS_PublishValidation - displayName: Publish Validation + +- stage: NetCore_30_Internal_Servicing_Publish_Validation + displayName: .NET Core 3.0 Internal Servicing Publish Validation variables: - - template: ../common-variables.yml + - template: ../common-variables.yml jobs: - template: ../setup-maestro-vars.yml @@ -126,7 +137,7 @@ stages: - job: displayName: Symbol Availability dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) pool: vmImage: 'windows-2019' steps: diff --git a/eng/common/templates/post-build/channels/public-release.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml similarity index 74% rename from eng/common/templates/post-build/channels/public-release.yml rename to eng/common/templates/post-build/channels/netcore-release-30.yml index 4c63fb43f..dc9541d9e 100644 --- a/eng/common/templates/post-build/channels/public-release.yml +++ b/eng/common/templates/post-build/channels/netcore-release-30.yml @@ -1,40 +1,50 @@ parameters: enableSymbolValidation: true + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' stages: -- stage: PubRel_Publish +- stage: NetCore_Release30_Publish dependsOn: validate variables: - template: ../common-variables.yml - displayName: Public Release + displayName: .NET Core 3.0 Release Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicRelease_30_Channel_Id) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) variables: - group: DotNet-Symbol-Server-Pats pool: vmImage: 'windows-2019' steps: - task: DownloadBuildArtifacts@0 - displayName: Download Artifacts + displayName: Download Blob Artifacts inputs: - downloadType: specific files - matchingPattern: "*Artifacts*" + artifactName: 'BlobArtifacts' + continueOnError: true + + - task: DownloadBuildArtifacts@0 + displayName: Download PDB Artifacts + inputs: + artifactName: 'PDBArtifacts' + continueOnError: true - 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:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' /p:Configuration=Release + ${{ parameters.symbolPublishingAdditionalParameters }} - job: publish_assets displayName: Publish Assets @@ -46,7 +56,7 @@ stages: 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) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) pool: vmImage: 'windows-2019' steps: @@ -74,25 +84,27 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + 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:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName) /p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1) /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url) /p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url) /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' - /p:Configuration=Release - + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' + /p:Configuration=Release + ${{ parameters.artifactsPublishingAdditionalParameters }} + - task: NuGetCommand@2 displayName: Publish Packages to AzDO Feed condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') @@ -106,7 +118,7 @@ stages: displayName: Publish Blobs to AzDO Feed inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 - arguments: -FeedName $(AzDoFeedName) + arguments: -FeedName $(AzDoFeedName) -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) enabled: false @@ -115,10 +127,10 @@ stages: parameters: ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} -- stage: PubRel_PublishValidation - displayName: Publish Validation +- stage: NetCore_Release30_Publish_Validation + displayName: .NET Core 3.0 Release Publish Validation variables: - - template: ../common-variables.yml + - template: ../common-variables.yml jobs: - template: ../setup-maestro-vars.yml @@ -126,7 +138,8 @@ stages: - job: displayName: Symbol Availability dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicRelease_30_Channel_Id) + condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)), + contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id))) pool: vmImage: 'windows-2019' steps: diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/netcore-release-31.yml new file mode 100644 index 000000000..4dcf4ba9c --- /dev/null +++ b/eng/common/templates/post-build/channels/netcore-release-31.yml @@ -0,0 +1,160 @@ +parameters: + enableSymbolValidation: true + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' + +stages: +- stage: NetCore_Release31_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: .NET Core 3.1 Release Publishing + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Symbol Publishing + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + variables: + - group: DotNet-Symbol-Server-Pats + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + artifactName: 'BlobArtifacts' + continueOnError: true + + - task: DownloadBuildArtifacts@0 + displayName: Download PDB Artifacts + inputs: + artifactName: 'PDBArtifacts' + continueOnError: true + + - 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:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + /p:Configuration=Release + ${{ parameters.symbolPublishingAdditionalParameters }} + + - job: publish_assets + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - 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'], format('[{0}]', variables.PublicRelease_31_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_31_Channel_Id) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName) + /p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1) + /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url) + /p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url) + /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' + /p:Configuration=Release + ${{ parameters.artifactsPublishingAdditionalParameters }} + + - 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 + + - template: ../trigger-subscription.yml + parameters: + ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} + +- stage: NetCore_Release31_Publish_Validation + displayName: .NET Core 3.1 Release 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: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)), + contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_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) + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml new file mode 100644 index 000000000..4d9f197d4 --- /dev/null +++ b/eng/common/templates/post-build/channels/netcore-tools-latest.yml @@ -0,0 +1,172 @@ +parameters: + enableSymbolValidation: true + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false + publishToAzureDevOpsFeeds: false + azureDevOpsToolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + +stages: +- stage: NetCore_Tools_Latest_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: .NET Tools - Latest Publishing + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Symbol Publishing + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) + variables: + - group: DotNet-Symbol-Server-Pats + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + artifactName: 'BlobArtifacts' + continueOnError: true + + - task: DownloadBuildArtifacts@0 + displayName: Download PDB Artifacts + inputs: + artifactName: 'PDBArtifacts' + continueOnError: true + + - 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:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + /p:Configuration=Release + ${{ parameters.symbolPublishingAdditionalParameters }} + + - job: + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - 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'], format('[{0}]', variables.NetCore_Tools_Latest_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=$(NetCore_Tools_Latest_Channel_Id) + /p:ArtifactsCategory=$(_DotNetArtifactsCategory) + /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='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} + /p:AzureDevOpsStaticShippingFeed=${{ parameters.azureDevOpsToolsFeed }} + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed=${{ parameters.azureDevOpsToolsFeed }} + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw) + ${{ parameters.artifactsPublishingAdditionalParameters }} + + - 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: NetCore_Tools_Latest_PublishValidation + displayName: .NET Tools - Latest 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'], format('[{0}]', variables.NetCore_Tools_Latest_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) + + - template: ../darc-gather-drop.yml + parameters: + ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.NetCore_Tools_Latest_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 1089ac5fa..e306fa87b 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -1,9 +1,15 @@ +parameters: + artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false + publishToAzureDevOpsFeeds: false + azureDevOpsToolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + stages: - stage: PVR_Publish dependsOn: validate variables: - template: ../common-variables.yml - displayName: Validation Channel + displayName: .NET Tools - Validation Publishing jobs: - template: ../setup-maestro-vars.yml @@ -17,7 +23,7 @@ stages: 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) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicValidationRelease_30_Channel_Id)) pool: vmImage: 'windows-2019' steps: @@ -45,7 +51,7 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ChannelId=$(PublicValidationRelease_30_Channel_Id) /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) @@ -53,16 +59,27 @@ stages: /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='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' - /p:Configuration=Release + /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='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' + /p:Configuration=Release + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} + /p:AzureDevOpsStaticShippingFeed=${{ parameters.azureDevOpsToolsFeed }} + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed=${{ parameters.azureDevOpsToolsFeed }} + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + ${{ parameters.artifactsPublishingAdditionalParameters }} - task: NuGetCommand@2 displayName: Publish Packages to AzDO Feed @@ -77,14 +94,14 @@ stages: displayName: Publish Blobs to AzDO Feed inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 - arguments: -FeedName $(AzDoFeedName) + arguments: -FeedName $(AzDoFeedName) -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) enabled: false - stage: PVR_PublishValidation - displayName: Publish Validation + displayName: .NET Tools - Validation Publish Validation variables: - template: ../common-variables.yml jobs: @@ -94,6 +111,6 @@ stages: parameters: ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} - - template: ../promote-build.yml - parameters: + - 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 bd0bc5e4d..49712b3a6 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,14 +1,27 @@ variables: - group: Publish-Build-Assets + - group: DotNet-DotNetCli-Storage # .NET Core 3 Dev - name: PublicDevRelease_30_Channel_Id value: 3 + # .NET Core 3.1 Dev + - name: PublicDevRelease_31_Channel_Id + value: 260 + + # .NET Core 5 Dev + - name: NetCore_5_Dev_Channel_Id + value: 131 + # .NET Tools - Validation - name: PublicValidationRelease_30_Channel_Id value: 9 + # .NET Tools - Latest + - name: NetCore_Tools_Latest_Channel_Id + value: 2 + # .NET Core 3.0 Internal Servicing - name: InternalServicing_30_Channel_Id value: 184 @@ -17,6 +30,10 @@ variables: - name: PublicRelease_30_Channel_Id value: 19 + # .NET Core 3.1 Release + - name: PublicRelease_31_Channel_Id + value: 129 + # Whether the build is internal or not - name: IsInternalBuild value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} @@ -37,3 +54,9 @@ variables: value: 3.0.0 - name: SymbolToolVersion value: 1.0.1 + + # Default locations for Installers and checksums + - name: ChecksumsBlobFeedUrl + value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json + - name: InstallersBlobFeedUrl + value: https://dotnetcli.blob.core.windows.net/dotnet/index.json diff --git a/eng/common/templates/post-build/darc-gather-drop.yml b/eng/common/templates/post-build/darc-gather-drop.yml index f4e3bfcf5..3268ccaa5 100644 --- a/eng/common/templates/post-build/darc-gather-drop.yml +++ b/eng/common/templates/post-build/darc-gather-drop.yml @@ -5,7 +5,7 @@ jobs: - job: gatherDrop displayName: Gather Drop dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], ${{ parameters.ChannelId }}) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.ChannelId }})) variables: - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 0872db4ed..ae376b774 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -1,12 +1,21 @@ parameters: - enableSourceLinkValidation: true + enableSourceLinkValidation: false enableSigningValidation: true - enableSymbolValidation: true + enableSymbolValidation: false enableNugetValidation: true + publishInstallersAndChecksums: false + enableAzDONuGetFeeds: true SDLValidationParameters: enable: false + continueOnError: false params: '' + # These parameters let the user customize the call to sdk-task.ps1 for publishing + # symbols & general artifacts as well as for signing validation + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' + signingValidationAdditionalParameters: '' + # Which stages should finish execution before post-build stages start dependsOn: [build] @@ -52,7 +61,9 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine dotnet /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:Configuration=Release + /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:Configuration=Release + ${{ parameters.signingValidationAdditionalParameters }} - ${{ if eq(parameters.enableSourceLinkValidation, 'true') }}: - job: @@ -77,18 +88,60 @@ stages: -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true - ${{ if eq(parameters.SDLValidationParameters.enable, 'true') }}: - template: /eng/common/templates/job/execute-sdl.yml parameters: additionalParameters: ${{ parameters.SDLValidationParameters.params }} + continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} -- template: \eng\common\templates\post-build\channels\public-dev-release.yml +- template: \eng\common\templates\post-build\channels\netcore-dev-5.yml parameters: enableSymbolValidation: ${{ parameters.enableSymbolValidation }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + +- template: \eng\common\templates\post-build\channels\netcore-dev-30.yml + parameters: + enableSymbolValidation: ${{ parameters.enableSymbolValidation }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + +- template: \eng\common\templates\post-build\channels\netcore-dev-31.yml + parameters: + enableSymbolValidation: ${{ parameters.enableSymbolValidation }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + +- template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml + parameters: + enableSymbolValidation: ${{ parameters.enableSymbolValidation }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }} - template: \eng\common\templates\post-build\channels\public-validation-release.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }} -- template: \eng\common\templates\post-build\channels\public-release.yml +- template: \eng\common\templates\post-build\channels\netcore-release-30.yml + parameters: + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} -- template: \eng\common\templates\post-build\channels\internal-servicing.yml +- template: \eng\common\templates\post-build\channels\netcore-release-31.yml + parameters: + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + +- template: \eng\common\templates\post-build\channels\netcore-internal-30.yml + parameters: + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} diff --git a/eng/common/templates/post-build/promote-build.yml b/eng/common/templates/post-build/promote-build.yml index 9387c583b..6b479c3b8 100644 --- a/eng/common/templates/post-build/promote-build.yml +++ b/eng/common/templates/post-build/promote-build.yml @@ -5,7 +5,7 @@ jobs: - job: displayName: Promote Build dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], ${{ parameters.ChannelId }}) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.ChannelId }})) variables: - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 8fe2b11ad..bb5638930 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -39,6 +39,10 @@ # installed on the machine instead of downloading one. [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } +# Enable repos to use a particular version of the on-line dotnet-install scripts. +# default URL: https://dot.net/v1/dotnet-install.ps1 +[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { "v1" } + # True to use global NuGet cache instead of restoring packages to repository-local directory. [bool]$useGlobalNuGetCache = if (Test-Path variable:useGlobalNuGetCache) { $useGlobalNuGetCache } else { !$ci } @@ -159,7 +163,8 @@ function GetDotNetInstallScript([string] $dotnetRoot) { $installScript = Join-Path $dotnetRoot "dotnet-install.ps1" if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot - Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile $installScript + $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit + Invoke-WebRequest "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" -OutFile $installScript } return $installScript @@ -278,6 +283,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Create-Directory $packageDir Write-Host "Downloading $packageName $packageVersion" + $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Invoke-WebRequest "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/$packageName/$packageVersion/" -OutFile $packagePath Unzip $packagePath $packageDir } @@ -518,6 +524,9 @@ function MSBuild-Core() { if ($warnAsError) { $cmdArgs += " /warnaserror /p:TreatWarningsAsErrors=true" } + else { + $cmdArgs += " /p:TreatWarningsAsErrors=false" + } foreach ($arg in $args) { if ($arg -ne $null -and $arg.Trim() -ne "") { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 738bb5669..94a1edd7d 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -45,6 +45,10 @@ warn_as_error=${warn_as_error:-true} # installed on the machine instead of downloading one. use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} +# Enable repos to use a particular version of the on-line dotnet-install scripts. +# default URL: https://dot.net/v1/dotnet-install.sh +dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} + # True to use global NuGet cache instead of restoring packages to repository-local directory. if [[ "$ci" == true ]]; then use_global_nuget_cache=${use_global_nuget_cache:-false} @@ -195,7 +199,7 @@ function InstallDotNet { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://dot.net/v1/dotnet-install.sh" + local install_script_url="https://dot.net/$dotnetInstallScriptVersion/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" @@ -204,12 +208,19 @@ function GetDotNetInstallScript { # Use curl if available, otherwise use wget if command -v curl > /dev/null; then - curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" - else - wget -q -O "$install_script" "$install_script_url" + curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." + ExitWithExitCode $exit_code + } + else + wget -q -O "$install_script" "$install_script_url" || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." + ExitWithExitCode $exit_code + } fi fi - # return value _GetDotNetInstallScript="$install_script" } diff --git a/global.json b/global.json index 6c742c4eb..e42dbcdd6 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.19377.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19454.31" } } From 3e900bd026de22140a07227629a6d65c1b16e80b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2019 18:59:29 +0000 Subject: [PATCH 007/170] Update dependencies from https://github.com/dotnet/arcade build 20190905.3 (#4591) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19455.3 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/post-build/common-variables.yml | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c990b13b8..69db0a20a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 00d8aa82b488f321204a0e69a81399af9df276a1 + fee4ebe849050a385a4999e4c84fa61c1dc234bb diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 49712b3a6..f62c097b3 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -8,7 +8,7 @@ variables: # .NET Core 3.1 Dev - name: PublicDevRelease_31_Channel_Id - value: 260 + value: 128 # .NET Core 5 Dev - name: NetCore_5_Dev_Channel_Id diff --git a/global.json b/global.json index e42dbcdd6..8ee431ef6 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.19454.31" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19455.3" } } From 245ef6dcfab2c1967efade11afee55eeebd31029 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Sep 2019 21:30:29 +0000 Subject: [PATCH 008/170] Update dependencies from https://github.com/dotnet/core-setup build 20190905.15 - Microsoft.NETCore.App - 3.1.0-preview1.19455.15 - NETStandard.Library.Ref - 2.1.0-preview1.19455.15 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19455.15 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview9.19417.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19417.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 3ec90b2c7..56b77ea96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 93e1324ce55c1bbd01206eff6bd659bdf34f8fe1 + 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 - + https://github.com/dotnet/core-setup - 93e1324ce55c1bbd01206eff6bd659bdf34f8fe1 + 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 - + https://github.com/dotnet/core-setup - 93e1324ce55c1bbd01206eff6bd659bdf34f8fe1 + 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 71744d3163293fc31cd1c1917929cf172d22bcaa - + https://github.com/dotnet/winforms - 8b19141d6b0b221167bd7d1731cbc6aa9898da75 + dd6650900f5af7283c6af6ec85de4d8d51f28961 - + https://github.com/dotnet/wpf - 105b673bddd8665580a94878db12ac97af8fa794 + ffc3fbd836fb6ff3c28e50fec67be5b55c8b6542 diff --git a/eng/Versions.props b/eng/Versions.props index 07ab80ac6..3f8ad32e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview9.19415.10 + 4.8.0-preview9.19417.1 - 3.0.0-preview9.19416.2 + 3.0.0-preview9.19417.4 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19454.16 + 3.1.0-preview1.19455.15 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19454.16 + 2.1.0-preview1.19455.15 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19454.16 + 3.1.0-preview1.19455.15 $(MicrosoftWindowsDesktopAppPackageVersion) From 209114cb1ead081d2cb4e0cf8c5728594ca95266 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Sep 2019 21:45:47 +0000 Subject: [PATCH 009/170] Update dependencies from https://github.com/dotnet/core-setup build 20190905.16 - Microsoft.NETCore.App - 3.1.0-preview1.19455.16 - NETStandard.Library.Ref - 2.1.0-preview1.19455.16 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19455.16 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview9.19417.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19417.4 (parent: Microsoft.WindowsDesktop.App) --- 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 56b77ea96..f11c02370 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 - + https://github.com/dotnet/core-setup 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 - + https://github.com/dotnet/core-setup 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 diff --git a/eng/Versions.props b/eng/Versions.props index 3f8ad32e6..347d96ab7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19455.15 + 3.1.0-preview1.19455.16 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19455.15 + 2.1.0-preview1.19455.16 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19455.15 + 3.1.0-preview1.19455.16 $(MicrosoftWindowsDesktopAppPackageVersion) From 859ed08637837772832741d76ef8d46849ed0bfc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Sep 2019 03:50:28 +0000 Subject: [PATCH 010/170] Update dependencies from https://github.com/dotnet/core-setup build 20190905.25 - Microsoft.NETCore.App - 3.1.0-preview1.19455.25 - NETStandard.Library.Ref - 2.1.0-preview1.19455.25 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19455.25 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview9.19417.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19417.4 (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 f11c02370..be6d56ecd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 + db11b05953ca56752b3da4cce203472c40fa6c3c - + https://github.com/dotnet/core-setup - 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 + db11b05953ca56752b3da4cce203472c40fa6c3c - + https://github.com/dotnet/core-setup - 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 + db11b05953ca56752b3da4cce203472c40fa6c3c https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 347d96ab7..7ebe9d507 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19455.16 + 3.1.0-preview1.19455.25 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19455.16 + 2.1.0-preview1.19455.25 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19455.16 + 3.1.0-preview1.19455.25 $(MicrosoftWindowsDesktopAppPackageVersion) From 00efa2c3941683e6daf20c949ce60dec1d730efd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Sep 2019 09:05:29 +0000 Subject: [PATCH 011/170] Update dependencies from https://github.com/dotnet/core-setup build 20190905.31 - Microsoft.NETCore.App - 3.1.0-preview1.19455.31 - NETStandard.Library.Ref - 2.1.0-preview1.19455.31 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19455.31 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview9.19417.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19417.4 (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 be6d56ecd..e939068ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - db11b05953ca56752b3da4cce203472c40fa6c3c + 7194756bb3b052f1550dd50d3e229b350d348da2 - + https://github.com/dotnet/core-setup - db11b05953ca56752b3da4cce203472c40fa6c3c + 7194756bb3b052f1550dd50d3e229b350d348da2 - + https://github.com/dotnet/core-setup - db11b05953ca56752b3da4cce203472c40fa6c3c + 7194756bb3b052f1550dd50d3e229b350d348da2 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 7ebe9d507..840cb4f46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19455.25 + 3.1.0-preview1.19455.31 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19455.25 + 2.1.0-preview1.19455.31 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19455.25 + 3.1.0-preview1.19455.31 $(MicrosoftWindowsDesktopAppPackageVersion) From 42e9c6cb337eb119f8e775507de1a9c90bd05e0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2019 13:34:23 +0000 Subject: [PATCH 012/170] Update dependencies from https://github.com/dotnet/arcade build 20190905.21 (#4613) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19455.21 --- eng/Version.Details.xml | 4 +- eng/common/templates/job/job.yml | 5 +- .../templates/job/publish-build-assets.yml | 7 ++ .../post-build/channels/netcore-dev-30.yml | 65 +++++++--------- .../post-build/channels/netcore-dev-31.yml | 45 +++++------ .../post-build/channels/netcore-dev-5.yml | 71 +++++++++--------- .../channels/netcore-internal-30.yml | 60 +++++++-------- .../channels/netcore-release-30.yml | 61 +++++++-------- .../channels/netcore-release-31.yml | 56 +++++++------- .../channels/netcore-tools-latest.yml | 74 ++++++++----------- .../channels/public-validation-release.yml | 67 +++++++---------- .../templates/post-build/common-variables.yml | 24 +++++- .../templates/post-build/post-build.yml | 1 + global.json | 2 +- 14 files changed, 246 insertions(+), 296 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69db0a20a..fd223f5bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - fee4ebe849050a385a4999e4c84fa61c1dc234bb + e99f81b0e3289cfd851be0d927c1fcffa43af6b5 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 8db456bb7..ffda80a19 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,7 +24,7 @@ parameters: workspace: '' -# Job base template specific parameters + # Job base template specific parameters # Optional: Enable installing Microbuild plugin # if 'true', these "variables" must be specified in the variables object or as part of the queue matrix # _TeamName - the name of your team @@ -151,6 +151,9 @@ jobs: continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: NuGetAuthenticate@0 + - ${{ each step in parameters.steps }}: - ${{ step }} diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 9e77ef1b5..b722975f9 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -47,6 +47,10 @@ jobs: downloadPath: '$(Build.StagingDirectory)/Download' condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: NuGetAuthenticate@0 + - task: PowerShell@2 displayName: Publish Build Assets inputs: @@ -59,6 +63,7 @@ jobs: /p:Configuration=$(_BuildConfig) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -67,12 +72,14 @@ jobs: 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 $(IsStableBuild) + - task: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.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/netcore-dev-30.yml b/eng/common/templates/post-build/channels/netcore-dev-30.yml index 3ce7ce4d6..16e4eff7d 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-30.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-30.yml @@ -47,7 +47,7 @@ stages: /p:Configuration=Release ${{ parameters.symbolPublishingAdditionalParameters }} - - job: + - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars variables: @@ -79,30 +79,41 @@ stages: buildType: current artifactName: AssetManifests + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 - displayName: Add Assets Location + displayName: Publish Assets env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(PublicDevRelease_30_Channel_Id) + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /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='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release + /p:StaticInternalFeed=$(StaticInternalFeed) + /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) @@ -110,24 +121,6 @@ stages: /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) ${{ parameters.artifactsPublishingAdditionalParameters }} - - 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: NetCore_Dev30_Publish_Validation displayName: .NET Core 3.0 Dev Publish Validation @@ -156,10 +149,6 @@ stages: filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) - - template: ../darc-gather-drop.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} - - template: ../promote-build.yml parameters: ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml index d40aaacc4..52322b128 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-31.yml @@ -79,22 +79,33 @@ stages: buildType: current artifactName: AssetManifests + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 - displayName: Add Assets Location + displayName: Publish Assets env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(PublicDevRelease_31_Channel_Id) /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /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:StaticInternalFeed=$(StaticInternalFeed) + /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' @@ -110,24 +121,6 @@ stages: /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) ${{ parameters.artifactsPublishingAdditionalParameters }} - - 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: NetCore_Dev31_Publish_Validation displayName: .NET Core 3.1 Dev Publish Validation @@ -156,10 +149,6 @@ stages: filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) - - template: ../darc-gather-drop.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} - - template: ../promote-build.yml parameters: ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml index 584185c2a..4d77d2669 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-5.yml @@ -3,6 +3,7 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false + publishToAzureDevOpsFeeds: true stages: - stage: NetCore_Dev5_Publish @@ -47,7 +48,7 @@ stages: /p:Configuration=Release ${{ parameters.symbolPublishingAdditionalParameters }} - - job: + - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars variables: @@ -79,55 +80,53 @@ stages: buildType: current artifactName: AssetManifests + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 - displayName: Add Assets Location + displayName: Publish Assets env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(NetCore_5_Dev_Channel_Id) + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /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='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:StaticInternalFeed=$(StaticInternalFeed) + /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw) ${{ parameters.artifactsPublishingAdditionalParameters }} - - 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: NetCore_Dev5_Publish_Validation displayName: .NET Core 5 Dev Publish Validation @@ -156,10 +155,6 @@ stages: filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) - - template: ../darc-gather-drop.yml - parameters: - ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} - - template: ../promote-build.yml parameters: ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/netcore-internal-30.yml index 8bf88fd49..ad3650127 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/netcore-internal-30.yml @@ -78,50 +78,42 @@ stages: buildType: current artifactName: AssetManifests + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 - displayName: Add Assets Location + displayName: Publish Assets env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(InternalServicing_30_Channel_Id) + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName) - /p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1) - /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url) - /p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url) - /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' - /p:Configuration=Release + /p:StaticInternalFeed=$(StaticInternalFeed) + /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release ${{ parameters.artifactsPublishingAdditionalParameters }} - - 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 - - template: ../trigger-subscription.yml parameters: ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml index dc9541d9e..8c4bb6005 100644 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ b/eng/common/templates/post-build/channels/netcore-release-30.yml @@ -78,51 +78,42 @@ stages: buildType: current artifactName: AssetManifests + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 - displayName: Publish + displayName: Publish Assets env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(PublicRelease_30_Channel_Id) + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName) - /p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1) - /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url) - /p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url) - /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' - /p:Configuration=Release + /p:StaticInternalFeed=$(StaticInternalFeed) + /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release ${{ parameters.artifactsPublishingAdditionalParameters }} - - 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 - - template: ../trigger-subscription.yml parameters: ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/netcore-release-31.yml index 4dcf4ba9c..cfe6386da 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/netcore-release-31.yml @@ -78,51 +78,48 @@ stages: buildType: current artifactName: AssetManifests + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 - displayName: Publish + displayName: Publish Assets env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(PublicRelease_31_Channel_Id) + /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) + /p:StaticInternalFeed=$(StaticInternalFeed) + /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName) - /p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1) - /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url) - /p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url) - /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) ${{ parameters.artifactsPublishingAdditionalParameters }} - - 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 - - template: ../trigger-subscription.yml parameters: ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} @@ -138,8 +135,7 @@ stages: - job: displayName: Symbol Availability dependsOn: setupMaestroVars - condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)), - contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id))) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) pool: vmImage: 'windows-2019' steps: diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml index 4d9f197d4..83dbdeea1 100644 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ b/eng/common/templates/post-build/channels/netcore-tools-latest.yml @@ -3,8 +3,7 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false - publishToAzureDevOpsFeeds: false - azureDevOpsToolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + publishToAzureDevOpsFeeds: true stages: - stage: NetCore_Tools_Latest_Publish @@ -49,7 +48,7 @@ stages: /p:Configuration=Release ${{ parameters.symbolPublishingAdditionalParameters }} - - job: + - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars variables: @@ -81,60 +80,53 @@ stages: buildType: current artifactName: AssetManifests + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 - displayName: Add Assets Location + displayName: Publish Assets env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(NetCore_Tools_Latest_Channel_Id) + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /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='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:StaticInternalFeed=$(StaticInternalFeed) + /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} - /p:AzureDevOpsStaticShippingFeed=${{ parameters.azureDevOpsToolsFeed }} + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed=${{ parameters.azureDevOpsToolsFeed }} + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw) ${{ parameters.artifactsPublishingAdditionalParameters }} - - - 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: NetCore_Tools_Latest_PublishValidation displayName: .NET Tools - Latest Publish Validation @@ -163,10 +155,6 @@ stages: filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) - - template: ../darc-gather-drop.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} - - template: ../promote-build.yml parameters: ChannelId: ${{ variables.NetCore_Tools_Latest_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 e306fa87b..a5fcdc581 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -1,8 +1,7 @@ parameters: artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false - publishToAzureDevOpsFeeds: false - azureDevOpsToolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + publishToAzureDevOpsFeeds: true stages: - stage: PVR_Publish @@ -13,7 +12,7 @@ stages: jobs: - template: ../setup-maestro-vars.yml - - job: + - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars variables: @@ -45,60 +44,48 @@ stages: buildType: current artifactName: AssetManifests + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 - displayName: Add Assets Location + displayName: Publish Assets env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(PublicValidationRelease_30_Channel_Id) + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) /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='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} - /p:AzureDevOpsStaticShippingFeed=${{ parameters.azureDevOpsToolsFeed }} + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed=${{ parameters.azureDevOpsToolsFeed }} + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - - 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 displayName: .NET Tools - Validation Publish Validation @@ -107,10 +94,6 @@ stages: jobs: - template: ../setup-maestro-vars.yml - - template: ../darc-gather-drop.yml - parameters: - ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} - - 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 f62c097b3..c13476449 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,6 +1,7 @@ variables: - group: Publish-Build-Assets - group: DotNet-DotNetCli-Storage + - group: DotNet-MSRC-Storage # .NET Core 3 Dev - name: PublicDevRelease_30_Channel_Id @@ -38,10 +39,6 @@ variables: - name: IsInternalBuild value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} - # Storage account name for proxy-backed feeds - - name: ProxyBackedFeedsAccountName - value: dotnetfeed - # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint value: "https://maestro-prod.westus2.cloudapp.azure.com" @@ -55,8 +52,27 @@ variables: - name: SymbolToolVersion value: 1.0.1 + # Feed Configurations + # These should include the suffix "/index.json" + + # Configuration for the feed where packages from internal non-stable builds will be published to + - name: StaticInternalFeed + value: 'https://dnceng.pkgs.visualstudio.com/_packaging/dotnet-core-internal/nuget/v3/index.json' + # Default locations for Installers and checksums + # Public Locations - name: ChecksumsBlobFeedUrl value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json - name: InstallersBlobFeedUrl value: https://dotnetcli.blob.core.windows.net/dotnet/index.json + + # Private Locations + - name: InternalChecksumsBlobFeedUrl + value: https://dotnetclichecksumsmsrc.blob.core.windows.net/dotnet/index.json + - name: InternalChecksumsBlobFeedKey + value: $(dotnetclichecksumsmsrc-storage-key) + + - name: InternalInstallersBlobFeedUrl + value: https://dotnetclimsrc.blob.core.windows.net/dotnet/index.json + - name: InternalInstallersBlobFeedKey + value: $(dotnetclimsrc-access-key) diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ae376b774..5770bb21c 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -102,6 +102,7 @@ stages: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }} - template: \eng\common\templates\post-build\channels\netcore-dev-30.yml parameters: diff --git a/global.json b/global.json index 8ee431ef6..c124f18e1 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.19455.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19455.21" } } From eae6863f64267f2f351842ff622a6bd56a77cca0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Sep 2019 00:50:29 +0000 Subject: [PATCH 013/170] Update dependencies from https://github.com/dotnet/core-setup build 20190906.22 - Microsoft.NETCore.App - 3.1.0-preview1.19456.22 - NETStandard.Library.Ref - 2.1.0-preview1.19456.22 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19456.22 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19455.20 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc1.19455.14 (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 e939068ba..7ac492a6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 7194756bb3b052f1550dd50d3e229b350d348da2 + 321d01390849836541c2caac6d124c75ef961578 - + https://github.com/dotnet/core-setup - 7194756bb3b052f1550dd50d3e229b350d348da2 + 321d01390849836541c2caac6d124c75ef961578 - + https://github.com/dotnet/core-setup - 7194756bb3b052f1550dd50d3e229b350d348da2 + 321d01390849836541c2caac6d124c75ef961578 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 71744d3163293fc31cd1c1917929cf172d22bcaa - + https://github.com/dotnet/winforms - dd6650900f5af7283c6af6ec85de4d8d51f28961 + 9104c48ca015b5a4c8e029c330af6d68bc11b0b8 - + https://github.com/dotnet/wpf - ffc3fbd836fb6ff3c28e50fec67be5b55c8b6542 + 1c3dd24d7188899a5f12d1caa31630f66bd4c2fd diff --git a/eng/Versions.props b/eng/Versions.props index 840cb4f46..cf57ec2be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview9.19417.1 + 4.8.0-rc1.19455.20 - 3.0.0-preview9.19417.4 + 3.0.0-rc1.19455.14 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19455.31 + 3.1.0-preview1.19456.22 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19455.31 + 2.1.0-preview1.19456.22 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19455.31 + 3.1.0-preview1.19456.22 $(MicrosoftWindowsDesktopAppPackageVersion) From 16b99878e57756b083638fa86bd97319d99818dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Sep 2019 11:30:32 +0000 Subject: [PATCH 014/170] Update dependencies from https://github.com/dotnet/core-setup build 20190907.3 - Microsoft.NETCore.App - 3.1.0-preview1.19457.3 - NETStandard.Library.Ref - 2.1.0-preview1.19457.3 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19457.3 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19455.20 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc1.19455.14 (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 7ac492a6d..4da405e4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 321d01390849836541c2caac6d124c75ef961578 + 010434a4dca048793d5cd720a67a2748f91c037f - + https://github.com/dotnet/core-setup - 321d01390849836541c2caac6d124c75ef961578 + 010434a4dca048793d5cd720a67a2748f91c037f - + https://github.com/dotnet/core-setup - 321d01390849836541c2caac6d124c75ef961578 + 010434a4dca048793d5cd720a67a2748f91c037f https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index cf57ec2be..ec7eb9527 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19456.22 + 3.1.0-preview1.19457.3 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19456.22 + 2.1.0-preview1.19457.3 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19456.22 + 3.1.0-preview1.19457.3 $(MicrosoftWindowsDesktopAppPackageVersion) From 91dcc0434bb313af3feeb88ead47ce6d93ba6b9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Sep 2019 13:18:27 +0000 Subject: [PATCH 015/170] Update dependencies from https://github.com/dotnet/arcade build 20190906.10 (#4643) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19456.10 --- eng/Version.Details.xml | 4 ++-- eng/common/build.ps1 | 4 ++++ eng/common/performance/performance-setup.ps1 | 2 +- eng/common/performance/performance-setup.sh | 2 +- eng/common/templates/job/performance.yml | 6 +++-- .../post-build/channels/netcore-dev-30.yml | 21 ----------------- .../post-build/channels/netcore-dev-31.yml | 21 ----------------- .../post-build/channels/netcore-dev-5.yml | 23 +------------------ .../channels/netcore-internal-30.yml | 21 ----------------- .../channels/netcore-release-30.yml | 22 ------------------ .../channels/netcore-release-31.yml | 21 ----------------- .../channels/netcore-tools-latest.yml | 21 ----------------- .../templates/post-build/post-build.yml | 4 ---- global.json | 2 +- 14 files changed, 14 insertions(+), 160 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd223f5bc..0e4034fb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - e99f81b0e3289cfd851be0d927c1fcffa43af6b5 + 2d393243ba4a0c95c2c18aa266df6e0f43ffe22d diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index feb58d141..e001ccb48 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -85,6 +85,10 @@ function Build { # Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons. # Explicitly set the type as string[] because otherwise PowerShell would make this char[] if $properties is empty. [string[]] $msbuildArgs = $properties + + # Resolve relative project paths into full paths + $projects = ($projects.Split(';').ForEach({Resolve-Path $_}) -join ';') + $msbuildArgs += "/p:Projects=$projects" $properties = $msbuildArgs } diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 268986246..ec41965fc 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -17,7 +17,7 @@ Param( [string] $Configurations="CompilationMode=$CompilationMode" ) -$RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") +$RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") -or ($Repository -eq "dotnet-performance") $UseCoreRun = ($CoreRootDirectory -ne [string]::Empty) $UseBaselineCoreRun = ($BaselineCoreRootDirectory -ne [string]::Empty) diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index 550b3ebf1..2f2092166 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -113,7 +113,7 @@ while (($# > 0)); do esac done -if [[ "$repository" == "dotnet/performance" ]]; then +if [ "$repository" == "dotnet/performance" ] || [ "$repository" == "dotnet-performance" ]; then run_from_perf_repo=true fi diff --git a/eng/common/templates/job/performance.yml b/eng/common/templates/job/performance.yml index ef809253d..f877fd7a8 100644 --- a/eng/common/templates/job/performance.yml +++ b/eng/common/templates/job/performance.yml @@ -5,6 +5,7 @@ parameters: displayName: '' # optional -- display name for the job. Will use jobName if not passed pool: '' # required -- name of the Build pool container: '' # required -- name of the container + osGroup: '' # required -- operating system for the job extraSetupParameters: '' # optional -- extra arguments to pass to the setup script frameworks: ['netcoreapp3.0'] # optional -- list of frameworks to run against continueOnError: 'false' # optional -- determines whether to continue the build if the step errors @@ -44,12 +45,13 @@ jobs: - HelixPreCommand: '' - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if eq(variables['Agent.Os'], 'Windows_NT') }}: + - ${{ if eq( parameters.osGroup, 'Windows_NT') }}: - HelixPreCommand: 'set "PERFLAB_UPLOAD_TOKEN=$(PerfCommandUploadToken)"' - IsInternal: -Internal - - ${{ if ne(variables['Agent.Os'], 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - HelixPreCommand: 'export PERFLAB_UPLOAD_TOKEN="$(PerfCommandUploadTokenLinux)"' - IsInternal: --internal + - group: DotNet-HelixApi-Access - group: dotnet-benchview diff --git a/eng/common/templates/post-build/channels/netcore-dev-30.yml b/eng/common/templates/post-build/channels/netcore-dev-30.yml index 16e4eff7d..7984f06d1 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-30.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-30.yml @@ -1,5 +1,4 @@ parameters: - enableSymbolValidation: true symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false @@ -129,26 +128,6 @@ stages: jobs: - template: ../setup-maestro-vars.yml - - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: - - job: - displayName: Symbol Availability - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', 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) - - template: ../promote-build.yml parameters: ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml index 52322b128..bcedd0f07 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-31.yml @@ -1,5 +1,4 @@ parameters: - enableSymbolValidation: true symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false @@ -129,26 +128,6 @@ stages: jobs: - template: ../setup-maestro-vars.yml - - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: - - job: - displayName: Symbol Availability - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_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) - - template: ../promote-build.yml parameters: ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml index 4d77d2669..18432cc60 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-5.yml @@ -1,5 +1,4 @@ parameters: - enableSymbolValidation: true symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false @@ -124,7 +123,7 @@ stages: /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw) + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -135,26 +134,6 @@ stages: jobs: - template: ../setup-maestro-vars.yml - - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: - - job: - displayName: Symbol Availability - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_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) - - template: ../promote-build.yml parameters: ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/netcore-internal-30.yml index ad3650127..36e1d1188 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/netcore-internal-30.yml @@ -1,5 +1,4 @@ parameters: - enableSymbolValidation: true symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' @@ -125,26 +124,6 @@ stages: jobs: - template: ../setup-maestro-vars.yml - - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: - - job: - displayName: Symbol Availability - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', 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) - - template: ../promote-build.yml parameters: ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml index 8c4bb6005..abae985ab 100644 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ b/eng/common/templates/post-build/channels/netcore-release-30.yml @@ -1,5 +1,4 @@ parameters: - enableSymbolValidation: true symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' @@ -125,27 +124,6 @@ stages: jobs: - template: ../setup-maestro-vars.yml - - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: - - job: - displayName: Symbol Availability - dependsOn: setupMaestroVars - condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)), - contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_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) - - template: ../promote-build.yml parameters: ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/netcore-release-31.yml index cfe6386da..b2a6c7659 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/netcore-release-31.yml @@ -1,5 +1,4 @@ parameters: - enableSymbolValidation: true symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' @@ -131,26 +130,6 @@ stages: jobs: - template: ../setup-maestro-vars.yml - - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: - - job: - displayName: Symbol Availability - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_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) - - template: ../promote-build.yml parameters: ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml index 83dbdeea1..36f6dea62 100644 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ b/eng/common/templates/post-build/channels/netcore-tools-latest.yml @@ -1,5 +1,4 @@ parameters: - enableSymbolValidation: true symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false @@ -135,26 +134,6 @@ stages: jobs: - template: ../setup-maestro-vars.yml - - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: - - job: - displayName: Symbol Availability - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_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) - - template: ../promote-build.yml parameters: ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 5770bb21c..e473cadbc 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -98,7 +98,6 @@ stages: - template: \eng\common\templates\post-build\channels\netcore-dev-5.yml parameters: - enableSymbolValidation: ${{ parameters.enableSymbolValidation }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -106,21 +105,18 @@ stages: - template: \eng\common\templates\post-build\channels\netcore-dev-30.yml parameters: - enableSymbolValidation: ${{ parameters.enableSymbolValidation }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - template: \eng\common\templates\post-build\channels\netcore-dev-31.yml parameters: - enableSymbolValidation: ${{ parameters.enableSymbolValidation }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml parameters: - enableSymbolValidation: ${{ parameters.enableSymbolValidation }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} diff --git a/global.json b/global.json index c124f18e1..d4c7a87ee 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.19455.21" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19456.10" } } From 7b0c1272179b7a4ec2e2992ba30a7f0971deb409 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Sep 2019 18:10:29 +0000 Subject: [PATCH 016/170] Update dependencies from https://github.com/dotnet/core-setup build 20190907.10 - Microsoft.NETCore.App - 3.1.0-preview1.19457.10 - NETStandard.Library.Ref - 2.1.0-preview1.19457.10 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19457.10 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19455.20 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc1.19455.14 (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 4da405e4c..59c23f566 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 010434a4dca048793d5cd720a67a2748f91c037f + e82ca592278b19fa8359c30ecbbc80cf0ae9e4ac - + https://github.com/dotnet/core-setup - 010434a4dca048793d5cd720a67a2748f91c037f + e82ca592278b19fa8359c30ecbbc80cf0ae9e4ac - + https://github.com/dotnet/core-setup - 010434a4dca048793d5cd720a67a2748f91c037f + e82ca592278b19fa8359c30ecbbc80cf0ae9e4ac https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index ec7eb9527..a1aa9de97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19457.3 + 3.1.0-preview1.19457.10 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19457.3 + 2.1.0-preview1.19457.10 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19457.3 + 3.1.0-preview1.19457.10 $(MicrosoftWindowsDesktopAppPackageVersion) From d76a831b4fdb5d17084ee469da5cffecd559f193 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Sep 2019 13:26:52 +0000 Subject: [PATCH 017/170] Update dependencies from https://github.com/dotnet/arcade build 20190907.1 (#4667) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19457.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 0e4034fb5..3947a4290 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 2d393243ba4a0c95c2c18aa266df6e0f43ffe22d + c27945fc559ee636139d9f460db71242b16483e6 diff --git a/global.json b/global.json index d4c7a87ee..e6fff8422 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.19456.10" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19457.1" } } From 7d91a04e9bf16efe88b2c53e86e0c17132f20e71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 8 Sep 2019 16:25:28 +0000 Subject: [PATCH 018/170] Update dependencies from https://github.com/dotnet/core-setup build 20190908.3 - Microsoft.NETCore.App - 3.1.0-preview1.19458.3 - NETStandard.Library.Ref - 2.1.0-preview1.19458.3 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19458.3 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19455.20 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc1.19455.14 (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 59c23f566..918a5b3d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - e82ca592278b19fa8359c30ecbbc80cf0ae9e4ac + 3f71391d25658ef00495eb76526e6cbac9e48a0b - + https://github.com/dotnet/core-setup - e82ca592278b19fa8359c30ecbbc80cf0ae9e4ac + 3f71391d25658ef00495eb76526e6cbac9e48a0b - + https://github.com/dotnet/core-setup - e82ca592278b19fa8359c30ecbbc80cf0ae9e4ac + 3f71391d25658ef00495eb76526e6cbac9e48a0b https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index a1aa9de97..db3157eb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19457.10 + 3.1.0-preview1.19458.3 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19457.10 + 2.1.0-preview1.19458.3 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19457.10 + 3.1.0-preview1.19458.3 $(MicrosoftWindowsDesktopAppPackageVersion) From 98b63bd94726c12ce21587aee11642d8c5a329a5 Mon Sep 17 00:00:00 2001 From: William Li Date: Sun, 8 Sep 2019 09:52:38 -0700 Subject: [PATCH 019/170] Add release/3.1.xx download to readme (#4618) --- README.md | 86 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 73 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 02d22a5a8..088dd9012 100644 --- a/README.md +++ b/README.md @@ -51,19 +51,19 @@ With development builds, internal NuGet feeds are necessary for some scenarios ( ``` -| Platform | Master
(3.0.x Runtime) | Release/3.0.1XX
(3.0.x Runtime) | Release/3.0.100-preview8
(3.0.x Runtime) | Release/2.2.3XX
(2.2.x Runtime) | Release/2.2.2XX
(2.2.x Runtime) | Release/2.2.1XX
(2.2.x Runtime) | Release/2.1.7XX
(2.1.7 Runtime) | Release/2.1.6XX
(2.1.6 Runtime) | Release/2.1.5XX
(2.1.5 Runtime) | -|---------|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:| -| **Windows x64** | [![][win-x64-badge-master]][win-x64-version-master]
[Installer][win-x64-installer-master] - [Checksum][win-x64-installer-checksum-master]
[zip][win-x64-zip-master] - [Checksum][win-x64-zip-checksum-master] | [![][win-x64-badge-3.0.1xx]][win-x64-version-3.0.1xx]
[Installer][win-x64-installer-3.0.1xx] - [Checksum][win-x64-installer-checksum-3.0.1xx]
[zip][win-x64-zip-3.0.1xx] - [Checksum][win-x64-zip-checksum-3.0.1xx] | [![][win-x64-badge-3.0.100-preview8]][win-x64-version-3.0.100-preview8]
[Installer][win-x64-installer-3.0.100-preview8] - [Checksum][win-x64-installer-checksum-3.0.100-preview8]
[zip][win-x64-zip-3.0.100-preview8] - [Checksum][win-x64-zip-checksum-3.0.100-preview8] | [![][win-x64-badge-2.2.3XX]][win-x64-version-2.2.3XX]
[Installer][win-x64-installer-2.2.3XX] - [Checksum][win-x64-installer-checksum-2.2.3XX]
[zip][win-x64-zip-2.2.3XX] - [Checksum][win-x64-zip-checksum-2.2.3XX] |[![][win-x64-badge-2.2.2XX]][win-x64-version-2.2.2XX]
[Installer][win-x64-installer-2.2.2XX] - [Checksum][win-x64-installer-checksum-2.2.2XX]
[zip][win-x64-zip-2.2.2XX] - [Checksum][win-x64-zip-checksum-2.2.2XX] |[![][win-x64-badge-2.2.1XX]][win-x64-version-2.2.1XX]
[Installer][win-x64-installer-2.2.1XX] - [Checksum][win-x64-installer-checksum-2.2.1XX]
[zip][win-x64-zip-2.2.1XX] - [Checksum][win-x64-zip-checksum-2.2.1XX] |[![][win-x64-badge-2.1.7XX]][win-x64-version-2.1.7XX]
[Installer][win-x64-installer-2.1.7XX] - [Checksum][win-x64-installer-checksum-2.1.7XX]
[zip][win-x64-zip-2.1.7XX] - [Checksum][win-x64-zip-checksum-2.1.7XX] | [![][win-x64-badge-2.1.6XX]][win-x64-version-2.1.6XX]
[Installer][win-x64-installer-2.1.6XX] - [Checksum][win-x64-installer-checksum-2.1.6XX]
[zip][win-x64-zip-2.1.6XX] - [Checksum][win-x64-zip-checksum-2.1.6XX] | [![][win-x64-badge-2.1.5XX]][win-x64-version-2.1.5XX]
[Installer][win-x64-installer-2.1.5XX] - [Checksum][win-x64-installer-checksum-2.1.5XX]
[zip][win-x64-zip-2.1.5XX] - [Checksum][win-x64-zip-checksum-2.1.5XX] | -| **Windows x86** | [![][win-x86-badge-master]][win-x86-version-master]
[Installer][win-x86-installer-master] - [Checksum][win-x86-installer-checksum-master]
[zip][win-x86-zip-master] - [Checksum][win-x86-zip-checksum-master] | [![][win-x86-badge-3.0.1xx]][win-x86-version-3.0.1xx]
[Installer][win-x86-installer-3.0.1xx] - [Checksum][win-x86-installer-checksum-3.0.1xx]
[zip][win-x86-zip-3.0.1xx] - [Checksum][win-x86-zip-checksum-3.0.1xx] | [![][win-x86-badge-3.0.100-preview8]][win-x86-version-3.0.100-preview8]
[Installer][win-x86-installer-3.0.100-preview8] - [Checksum][win-x86-installer-checksum-3.0.100-preview8]
[zip][win-x86-zip-3.0.100-preview8] - [Checksum][win-x86-zip-checksum-3.0.100-preview8] | [![][win-x86-badge-2.2.3XX]][win-x86-version-2.2.3XX]
[Installer][win-x86-installer-2.2.3XX] - [Checksum][win-x86-installer-checksum-2.2.3XX]
[zip][win-x86-zip-2.2.3XX] - [Checksum][win-x86-zip-checksum-2.2.3XX] |[![][win-x86-badge-2.2.2XX]][win-x86-version-2.2.2XX]
[Installer][win-x86-installer-2.2.2XX] - [Checksum][win-x86-installer-checksum-2.2.2XX]
[zip][win-x86-zip-2.2.2XX] - [Checksum][win-x86-zip-checksum-2.2.2XX] |[![][win-x86-badge-2.2.1XX]][win-x86-version-2.2.1XX]
[Installer][win-x86-installer-2.2.1XX] - [Checksum][win-x86-installer-checksum-2.2.1XX]
[zip][win-x86-zip-2.2.1XX] - [Checksum][win-x86-zip-checksum-2.2.1XX] |[![][win-x86-badge-2.1.7XX]][win-x86-version-2.1.7XX]
[Installer][win-x86-installer-2.1.7XX] - [Checksum][win-x86-installer-checksum-2.1.7XX]
[zip][win-x86-zip-2.1.7XX] - [Checksum][win-x86-zip-checksum-2.1.7XX] | [![][win-x86-badge-2.1.6XX]][win-x86-version-2.1.6XX]
[Installer][win-x86-installer-2.1.6XX] - [Checksum][win-x86-installer-checksum-2.1.6XX]
[zip][win-x86-zip-2.1.6XX] - [Checksum][win-x86-zip-checksum-2.1.6XX] | [![][win-x86-badge-2.1.5XX]][win-x86-version-2.1.5XX]
[Installer][win-x86-installer-2.1.5XX] - [Checksum][win-x86-installer-checksum-2.1.5XX]
[zip][win-x86-zip-2.1.5XX] - [Checksum][win-x86-zip-checksum-2.1.5XX] | -| **macOS** | [![][osx-badge-master]][osx-version-master]
[Installer][osx-installer-master] - [Checksum][osx-installer-checksum-master]
[tar.gz][osx-targz-master] - [Checksum][osx-targz-checksum-master] | [![][osx-badge-3.0.1xx]][osx-version-3.0.1xx]
[Installer][osx-installer-3.0.1xx] - [Checksum][osx-installer-checksum-3.0.1xx]
[tar.gz][osx-targz-3.0.1xx] - [Checksum][osx-targz-checksum-3.0.1xx] | [![][osx-badge-3.0.100-preview8]][osx-version-3.0.100-preview8]
[Installer][osx-installer-3.0.100-preview8] - [Checksum][osx-installer-checksum-3.0.100-preview8]
[tar.gz][osx-targz-3.0.100-preview8] - [Checksum][osx-targz-checksum-3.0.100-preview8] | [![][osx-badge-2.2.3XX]][osx-version-2.2.3XX]
[Installer][osx-installer-2.2.3XX] - [Checksum][osx-installer-checksum-2.2.3XX]
[tar.gz][osx-targz-2.2.3XX] - [Checksum][osx-targz-checksum-2.2.3XX] |[![][osx-badge-2.2.2XX]][osx-version-2.2.2XX]
[Installer][osx-installer-2.2.2XX] - [Checksum][osx-installer-checksum-2.2.2XX]
[tar.gz][osx-targz-2.2.2XX] - [Checksum][osx-targz-checksum-2.2.2XX] |[![][osx-badge-2.2.1XX]][osx-version-2.2.1XX]
[Installer][osx-installer-2.2.1XX] - [Checksum][osx-installer-checksum-2.2.1XX]
[tar.gz][osx-targz-2.2.1XX] - [Checksum][osx-targz-checksum-2.2.1XX] |[![][osx-badge-2.1.7XX]][osx-version-2.1.7XX]
[Installer][osx-installer-2.1.7XX] - [Checksum][osx-installer-checksum-2.1.7XX]
[tar.gz][osx-targz-2.1.7XX] - [Checksum][osx-targz-checksum-2.1.7XX] | [![][osx-badge-2.1.6XX]][osx-version-2.1.6XX]
[Installer][osx-installer-2.1.6XX] - [Checksum][osx-installer-checksum-2.1.6XX]
[tar.gz][osx-targz-2.1.6XX] - [Checksum][osx-targz-checksum-2.1.6XX] | [![][osx-badge-2.1.5XX]][osx-version-2.1.5XX]
[Installer][osx-installer-2.1.5XX] - [Checksum][osx-installer-checksum-2.1.5XX]
[tar.gz][osx-targz-2.1.5XX] - [Checksum][osx-targz-checksum-2.1.5XX] | -| **Linux x64** | [![][linux-badge-master]][linux-version-master]
[DEB Installer][linux-DEB-installer-master] - [Checksum][linux-DEB-installer-checksum-master]
[RPM Installer][linux-RPM-installer-master] - [Checksum][linux-RPM-installer-checksum-master]
_see installer note below_1
[tar.gz][linux-targz-master] - [Checksum][linux-targz-checksum-master] | [![][linux-badge-3.0.1xx]][linux-version-3.0.1xx]
[DEB Installer][linux-DEB-installer-3.0.1xx] - [Checksum][linux-DEB-installer-checksum-3.0.1xx]
[RPM Installer][linux-RPM-installer-3.0.1xx] - [Checksum][linux-RPM-installer-checksum-3.0.1xx]
_see installer note below_1
[tar.gz][linux-targz-3.0.1xx] - [Checksum][linux-targz-checksum-3.0.1xx] | [![][linux-badge-3.0.100-preview8]][linux-version-3.0.100-preview8]
[DEB Installer][linux-DEB-installer-3.0.100-preview8] - [Checksum][linux-DEB-installer-checksum-3.0.100-preview8]
[RPM Installer][linux-RPM-installer-3.0.100-preview8] - [Checksum][linux-RPM-installer-checksum-3.0.100-preview8]
_see installer note below_1
[tar.gz][linux-targz-3.0.100-preview8] - [Checksum][linux-targz-checksum-3.0.100-preview8] | [![][linux-badge-2.2.3xx]][linux-version-2.2.3xx]
[DEB Installer][linux-DEB-installer-2.2.3XX] - [Checksum][linux-DEB-installer-checksum-2.2.3XX]
[RPM Installer][linux-RPM-installer-2.2.3XX] - [Checksum][linux-RPM-installer-checksum-2.2.3XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.3XX] - [Checksum][linux-targz-checksum-2.2.3XX] |[![][linux-badge-2.2.2xx]][linux-version-2.2.2xx]
[DEB Installer][linux-DEB-installer-2.2.2XX] - [Checksum][linux-DEB-installer-checksum-2.2.2XX]
[RPM Installer][linux-RPM-installer-2.2.2XX] - [Checksum][linux-RPM-installer-checksum-2.2.2XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.2XX] - [Checksum][linux-targz-checksum-2.2.2XX] |[![][linux-badge-2.2.1xx]][linux-version-2.2.1xx]
[DEB Installer][linux-DEB-installer-2.2.1XX] - [Checksum][linux-DEB-installer-checksum-2.2.1XX]
[RPM Installer][linux-RPM-installer-2.2.1XX] - [Checksum][linux-RPM-installer-checksum-2.2.1XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.1XX] - [Checksum][linux-targz-checksum-2.2.1XX] |[![][linux-badge-2.1.7XX]][linux-version-2.1.7XX]
[DEB Installer][linux-DEB-installer-2.1.7XX] - [Checksum][linux-DEB-installer-checksum-2.1.7XX]
[RPM Installer][linux-RPM-installer-2.1.7XX] - [Checksum][linux-RPM-installer-checksum-2.1.7XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.7XX] - [Checksum][linux-targz-checksum-2.1.7XX] | [![][linux-badge-2.1.6XX]][linux-version-2.1.6XX]
[DEB Installer][linux-DEB-installer-2.1.6XX] - [Checksum][linux-DEB-installer-checksum-2.1.6XX]
[RPM Installer][linux-RPM-installer-2.1.6XX] - [Checksum][linux-RPM-installer-checksum-2.1.6XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.6XX] - [Checksum][linux-targz-checksum-2.1.6XX] | [![][linux-badge-2.1.5XX]][linux-version-2.1.5XX]
[DEB Installer][linux-DEB-installer-2.1.5XX] - [Checksum][linux-DEB-installer-checksum-2.1.5XX]
[RPM Installer][linux-RPM-installer-2.1.5XX] - [Checksum][linux-RPM-installer-checksum-2.1.5XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.5XX] - [Checksum][linux-targz-checksum-2.1.5XX] | -| **Linux arm** | [![][linux-arm-badge-master]][linux-arm-version-master]
[tar.gz][linux-arm-targz-master] - [Checksum][linux-arm-targz-checksum-master] | [![][linux-arm-badge-3.0.1xx]][linux-arm-version-3.0.1xx]
[tar.gz][linux-arm-targz-3.0.1xx] - [Checksum][linux-arm-targz-checksum-3.0.1xx] | [![][linux-arm-badge-3.0.100-preview8]][linux-arm-version-3.0.100-preview8]
[tar.gz][linux-arm-targz-3.0.100-preview8] - [Checksum][linux-arm-targz-checksum-3.0.100-preview8] | [![][linux-arm-badge-2.2.3XX]][linux-arm-version-2.2.3XX]
[tar.gz][linux-arm-targz-2.2.3XX] - [Checksum][linux-arm-targz-checksum-2.2.3XX] |[![][linux-arm-badge-2.2.2XX]][linux-arm-version-2.2.2XX]
[tar.gz][linux-arm-targz-2.2.2XX] - [Checksum][linux-arm-targz-checksum-2.2.2XX] |[![][linux-arm-badge-2.2.1XX]][linux-arm-version-2.2.1XX]
[tar.gz][linux-arm-targz-2.2.1XX] - [Checksum][linux-arm-targz-checksum-2.2.1XX] |[![][linux-arm-badge-2.1.7XX]][linux-arm-version-2.1.7XX]
[tar.gz][linux-arm-targz-2.1.7XX] - [Checksum][linux-arm-targz-checksum-2.1.7XX] | [![][linux-arm-badge-2.1.6XX]][linux-arm-version-2.1.6XX]
[tar.gz][linux-arm-targz-2.1.6XX] - [Checksum][linux-arm-targz-checksum-2.1.6XX] | [![][linux-arm-badge-2.1.5XX]][linux-arm-version-2.1.5XX]
[tar.gz][linux-arm-targz-2.1.5XX] - [Checksum][linux-arm-targz-checksum-2.1.5XX] | -| **Linux arm64** | [![][linux-arm64-badge-master]][linux-arm64-version-master]
[tar.gz][linux-arm64-targz-master] - [Checksum][linux-arm64-targz-checksum-master] | [![][linux-arm64-badge-3.0.1xx]][linux-arm64-version-3.0.1xx]
[tar.gz][linux-arm64-targz-3.0.1xx] - [Checksum][linux-arm64-targz-checksum-3.0.1xx] | [![][linux-arm64-badge-3.0.100-preview8]][linux-arm64-version-3.0.100-preview8]
[tar.gz][linux-arm64-targz-3.0.100-preview8] - [Checksum][linux-arm64-targz-checksum-3.0.100-preview8] | [![][linux-arm64-badge-2.2.3XX]][linux-arm64-version-2.2.3XX]
[tar.gz][linux-arm64-targz-2.2.3XX] - [Checksum][linux-arm64-targz-checksum-2.2.3XX] |[![][linux-arm64-badge-2.2.2XX]][linux-arm64-version-2.2.2XX]
[tar.gz][linux-arm64-targz-2.2.2XX] - [Checksum][linux-arm64-targz-checksum-2.2.2XX] |[![][linux-arm64-badge-2.2.1XX]][linux-arm64-version-2.2.1XX]
[tar.gz][linux-arm64-targz-2.2.1XX] - [Checksum][linux-arm64-targz-checksum-2.2.1XX] |[![][linux-arm64-badge-2.1.7XX]][linux-arm64-version-2.1.7XX]
[tar.gz][linux-arm64-targz-2.1.7XX] - [Checksum][linux-arm64-targz-checksum-2.1.7XX] | [![][linux-arm64-badge-2.1.6XX]][linux-arm64-version-2.1.6XX]
[tar.gz][linux-arm64-targz-2.1.6XX] - [Checksum][linux-arm64-targz-checksum-2.1.6XX] | [![][linux-arm64-badge-2.1.5XX]][linux-arm64-version-2.1.5XX]
[tar.gz][linux-arm64-targz-2.1.5XX] - [Checksum][linux-arm64-targz-checksum-2.1.5XX] | -| **RHEL 6** | [![][rhel-6-badge-master]][rhel-6-version-master]
[tar.gz][rhel-6-targz-master] - [Checksum][rhel-6-targz-checksum-master] | [![][rhel-6-badge-3.0.1xx]][rhel-6-version-3.0.1xx]
[tar.gz][rhel-6-targz-3.0.1xx] - [Checksum][rhel-6-targz-checksum-3.0.1xx] | [![][rhel-6-badge-3.0.100-preview8]][rhel-6-version-3.0.100-preview8]
[tar.gz][rhel-6-targz-3.0.100-preview8] - [Checksum][rhel-6-targz-checksum-3.0.100-preview8] | [![][rhel-6-badge-2.2.3XX]][rhel-6-version-2.2.3XX]
[tar.gz][rhel-6-targz-2.2.3XX] - [Checksum][rhel-6-targz-checksum-2.2.3XX] | [![][rhel-6-badge-2.2.2XX]][rhel-6-version-2.2.2XX]
[tar.gz][rhel-6-targz-2.2.2XX] - [Checksum][rhel-6-targz-checksum-2.2.2XX] | [![][rhel-6-badge-2.2.1XX]][rhel-6-version-2.2.1XX]
[tar.gz][rhel-6-targz-2.2.1XX] - [Checksum][rhel-6-targz-checksum-2.2.1XX] | [![][rhel-6-badge-2.1.7XX]][rhel-6-version-2.1.7XX]
[tar.gz][rhel-6-targz-2.1.7XX] - [Checksum][rhel-6-targz-checksum-2.1.7XX] | [![][rhel-6-badge-2.1.6XX]][rhel-6-version-2.1.6XX]
[tar.gz][rhel-6-targz-2.1.6XX] - [Checksum][rhel-6-targz-checksum-2.1.6XX] | [![][rhel-6-badge-2.1.5XX]][rhel-6-version-2.1.5XX]
[tar.gz][rhel-6-targz-2.1.5XX] - [Checksum][rhel-6-targz-checksum-2.1.5XX] | -| **Linux-musl** | [![][linux-musl-badge-master]][linux-musl-version-master]
[tar.gz][linux-musl-targz-master] - [Checksum][linux-musl-targz-checksum-master] | [![][linux-musl-badge-3.0.1xx]][linux-musl-version-3.0.1xx]
[tar.gz][linux-musl-targz-3.0.1xx] - [Checksum][linux-musl-targz-checksum-3.0.1xx] | [![][linux-musl-badge-3.0.100-preview8]][linux-musl-version-3.0.100-preview8]
[tar.gz][linux-musl-targz-3.0.100-preview8] - [Checksum][linux-musl-targz-checksum-3.0.100-preview8] | [![][linux-musl-badge-2.2.3XX]][linux-musl-version-2.2.3XX]
[tar.gz][linux-musl-targz-2.2.3XX] - [Checksum][linux-musl-targz-checksum-2.2.3XX] |[![][linux-musl-badge-2.2.2XX]][linux-musl-version-2.2.2XX]
[tar.gz][linux-musl-targz-2.2.2XX] - [Checksum][linux-musl-targz-checksum-2.2.2XX] |[![][linux-musl-badge-2.2.1XX]][linux-musl-version-2.2.1XX]
[tar.gz][linux-musl-targz-2.2.1XX] - [Checksum][linux-musl-targz-checksum-2.2.1XX] |[![][linux-musl-badge-2.1.7XX]][linux-musl-version-2.1.7XX]
[tar.gz][linux-musl-targz-2.1.7XX] - [Checksum][linux-musl-targz-checksum-2.1.7XX] | [![][linux-musl-badge-2.1.6XX]][linux-musl-version-2.1.6XX]
[tar.gz][linux-musl-targz-2.1.6XX] - [Checksum][linux-musl-targz-checksum-2.1.6XX] | [![][linux-musl-badge-2.1.5XX]][linux-musl-version-2.1.5XX]
[tar.gz][linux-musl-targz-2.1.5XX] - [Checksum][linux-musl-targz-checksum-2.1.5XX] | -| **Windows arm** | [![][win-arm-badge-master]][win-arm-version-master]
[zip][win-arm-zip-master] - [Checksum][win-arm-zip-checksum-master] | [![][win-arm-badge-3.0.1xx]][win-arm-version-3.0.1xx]
[zip][win-arm-zip-3.0.1xx] - [Checksum][win-arm-zip-checksum-3.0.1xx] | [![][win-arm-badge-3.0.100-preview8]][win-arm-version-3.0.100-preview8]
[zip][win-arm-zip-3.0.100-preview8] - [Checksum][win-arm-zip-checksum-3.0.100-preview8] | [![][win-arm-badge-2.2.3XX]][win-arm-version-2.2.3XX]
[zip][win-arm-zip-2.2.3XX] - [Checksum][win-arm-zip-checksum-2.2.3XX] | [![][win-arm-badge-2.2.2XX]][win-arm-version-2.2.2XX]
[zip][win-arm-zip-2.2.2XX] - [Checksum][win-arm-zip-checksum-2.2.2XX] | [![][win-arm-badge-2.2.1XX]][win-arm-version-2.2.1XX]
[zip][win-arm-zip-2.2.1XX] - [Checksum][win-arm-zip-checksum-2.2.1XX] | **N/A** | **N/A** | **N/A** | -| **FreeBSD x64** | [![][freebsd-x64-badge-master]][freebsd-x64-version-master]
[tar.gz][freebsd-x64-zip-master] - [Checksum][freebsd-x64-zip-checksum-master] | [![][freebsd-x64-badge-3.0.1xx]][freebsd-x64-version-3.0.1xx]
[tar.gz][freebsd-x64-zip-3.0.1xx] - [Checksum][freebsd-x64-zip-checksum-3.0.1xx] | [![][freebsd-x64-badge-3.0.100-preview8]][freebsd-x64-version-3.0.100-preview8]
[tar.gz][freebsd-x64-zip-3.0.100-preview8] - [Checksum][freebsd-x64-zip-checksum-3.0.100-preview8] | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | -| **Constituent Repo Shas** | **N/A** | [Git SHAs][sdk-shas-2.2.1XX] | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | +| Platform | Master
(3.0.x Runtime) | Release/3.1.1XX
(3.1.x Runtime) | Release/3.0.1XX
(3.0.x Runtime) | Release/3.0.100-preview8
(3.0.x Runtime) | Release/2.2.3XX
(2.2.x Runtime) | Release/2.2.2XX
(2.2.x Runtime) | Release/2.2.1XX
(2.2.x Runtime) | Release/2.1.7XX
(2.1.7 Runtime) | Release/2.1.6XX
(2.1.6 Runtime) | Release/2.1.5XX
(2.1.5 Runtime) | +|---------|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:| +| **Windows x64** | [![][win-x64-badge-master]][win-x64-version-master]
[Installer][win-x64-installer-master] - [Checksum][win-x64-installer-checksum-master]
[zip][win-x64-zip-master] - [Checksum][win-x64-zip-checksum-master] | [![][win-x64-badge-3.1.1xx]][win-x64-version-3.1.1xx]
[Installer][win-x64-installer-3.1.1xx] - [Checksum][win-x64-installer-checksum-3.1.1xx]
[zip][win-x64-zip-3.1.1xx] - [Checksum][win-x64-zip-checksum-3.1.1xx] | [![][win-x64-badge-3.0.1xx]][win-x64-version-3.0.1xx]
[Installer][win-x64-installer-3.0.1xx] - [Checksum][win-x64-installer-checksum-3.0.1xx]
[zip][win-x64-zip-3.0.1xx] - [Checksum][win-x64-zip-checksum-3.0.1xx] | [![][win-x64-badge-3.0.100-preview8]][win-x64-version-3.0.100-preview8]
[Installer][win-x64-installer-3.0.100-preview8] - [Checksum][win-x64-installer-checksum-3.0.100-preview8]
[zip][win-x64-zip-3.0.100-preview8] - [Checksum][win-x64-zip-checksum-3.0.100-preview8] | [![][win-x64-badge-2.2.3XX]][win-x64-version-2.2.3XX]
[Installer][win-x64-installer-2.2.3XX] - [Checksum][win-x64-installer-checksum-2.2.3XX]
[zip][win-x64-zip-2.2.3XX] - [Checksum][win-x64-zip-checksum-2.2.3XX] |[![][win-x64-badge-2.2.2XX]][win-x64-version-2.2.2XX]
[Installer][win-x64-installer-2.2.2XX] - [Checksum][win-x64-installer-checksum-2.2.2XX]
[zip][win-x64-zip-2.2.2XX] - [Checksum][win-x64-zip-checksum-2.2.2XX] |[![][win-x64-badge-2.2.1XX]][win-x64-version-2.2.1XX]
[Installer][win-x64-installer-2.2.1XX] - [Checksum][win-x64-installer-checksum-2.2.1XX]
[zip][win-x64-zip-2.2.1XX] - [Checksum][win-x64-zip-checksum-2.2.1XX] |[![][win-x64-badge-2.1.7XX]][win-x64-version-2.1.7XX]
[Installer][win-x64-installer-2.1.7XX] - [Checksum][win-x64-installer-checksum-2.1.7XX]
[zip][win-x64-zip-2.1.7XX] - [Checksum][win-x64-zip-checksum-2.1.7XX] | [![][win-x64-badge-2.1.6XX]][win-x64-version-2.1.6XX]
[Installer][win-x64-installer-2.1.6XX] - [Checksum][win-x64-installer-checksum-2.1.6XX]
[zip][win-x64-zip-2.1.6XX] - [Checksum][win-x64-zip-checksum-2.1.6XX] | [![][win-x64-badge-2.1.5XX]][win-x64-version-2.1.5XX]
[Installer][win-x64-installer-2.1.5XX] - [Checksum][win-x64-installer-checksum-2.1.5XX]
[zip][win-x64-zip-2.1.5XX] - [Checksum][win-x64-zip-checksum-2.1.5XX] | +| **Windows x86** | [![][win-x86-badge-master]][win-x86-version-master]
[Installer][win-x86-installer-master] - [Checksum][win-x86-installer-checksum-master]
[zip][win-x86-zip-master] - [Checksum][win-x86-zip-checksum-master] | [![][win-x86-badge-3.1.1xx]][win-x86-version-3.1.1xx]
[Installer][win-x86-installer-3.1.1xx] - [Checksum][win-x86-installer-checksum-3.1.1xx]
[zip][win-x86-zip-3.1.1xx] - [Checksum][win-x86-zip-checksum-3.1.1xx] | [![][win-x86-badge-3.0.1xx]][win-x86-version-3.0.1xx]
[Installer][win-x86-installer-3.0.1xx] - [Checksum][win-x86-installer-checksum-3.0.1xx]
[zip][win-x86-zip-3.0.1xx] - [Checksum][win-x86-zip-checksum-3.0.1xx] | [![][win-x86-badge-3.0.100-preview8]][win-x86-version-3.0.100-preview8]
[Installer][win-x86-installer-3.0.100-preview8] - [Checksum][win-x86-installer-checksum-3.0.100-preview8]
[zip][win-x86-zip-3.0.100-preview8] - [Checksum][win-x86-zip-checksum-3.0.100-preview8] | [![][win-x86-badge-2.2.3XX]][win-x86-version-2.2.3XX]
[Installer][win-x86-installer-2.2.3XX] - [Checksum][win-x86-installer-checksum-2.2.3XX]
[zip][win-x86-zip-2.2.3XX] - [Checksum][win-x86-zip-checksum-2.2.3XX] |[![][win-x86-badge-2.2.2XX]][win-x86-version-2.2.2XX]
[Installer][win-x86-installer-2.2.2XX] - [Checksum][win-x86-installer-checksum-2.2.2XX]
[zip][win-x86-zip-2.2.2XX] - [Checksum][win-x86-zip-checksum-2.2.2XX] |[![][win-x86-badge-2.2.1XX]][win-x86-version-2.2.1XX]
[Installer][win-x86-installer-2.2.1XX] - [Checksum][win-x86-installer-checksum-2.2.1XX]
[zip][win-x86-zip-2.2.1XX] - [Checksum][win-x86-zip-checksum-2.2.1XX] |[![][win-x86-badge-2.1.7XX]][win-x86-version-2.1.7XX]
[Installer][win-x86-installer-2.1.7XX] - [Checksum][win-x86-installer-checksum-2.1.7XX]
[zip][win-x86-zip-2.1.7XX] - [Checksum][win-x86-zip-checksum-2.1.7XX] | [![][win-x86-badge-2.1.6XX]][win-x86-version-2.1.6XX]
[Installer][win-x86-installer-2.1.6XX] - [Checksum][win-x86-installer-checksum-2.1.6XX]
[zip][win-x86-zip-2.1.6XX] - [Checksum][win-x86-zip-checksum-2.1.6XX] | [![][win-x86-badge-2.1.5XX]][win-x86-version-2.1.5XX]
[Installer][win-x86-installer-2.1.5XX] - [Checksum][win-x86-installer-checksum-2.1.5XX]
[zip][win-x86-zip-2.1.5XX] - [Checksum][win-x86-zip-checksum-2.1.5XX] | +| **macOS** | [![][osx-badge-master]][osx-version-master]
[Installer][osx-installer-master] - [Checksum][osx-installer-checksum-master]
[tar.gz][osx-targz-master] - [Checksum][osx-targz-checksum-master] | [![][osx-badge-3.1.1xx]][osx-version-3.1.1xx]
[Installer][osx-installer-3.1.1xx] - [Checksum][osx-installer-checksum-3.1.1xx]
[tar.gz][osx-targz-3.1.1xx] - [Checksum][osx-targz-checksum-3.1.1xx] | [![][osx-badge-3.0.1xx]][osx-version-3.0.1xx]
[Installer][osx-installer-3.0.1xx] - [Checksum][osx-installer-checksum-3.0.1xx]
[tar.gz][osx-targz-3.0.1xx] - [Checksum][osx-targz-checksum-3.0.1xx] | [![][osx-badge-3.0.100-preview8]][osx-version-3.0.100-preview8]
[Installer][osx-installer-3.0.100-preview8] - [Checksum][osx-installer-checksum-3.0.100-preview8]
[tar.gz][osx-targz-3.0.100-preview8] - [Checksum][osx-targz-checksum-3.0.100-preview8] | [![][osx-badge-2.2.3XX]][osx-version-2.2.3XX]
[Installer][osx-installer-2.2.3XX] - [Checksum][osx-installer-checksum-2.2.3XX]
[tar.gz][osx-targz-2.2.3XX] - [Checksum][osx-targz-checksum-2.2.3XX] |[![][osx-badge-2.2.2XX]][osx-version-2.2.2XX]
[Installer][osx-installer-2.2.2XX] - [Checksum][osx-installer-checksum-2.2.2XX]
[tar.gz][osx-targz-2.2.2XX] - [Checksum][osx-targz-checksum-2.2.2XX] |[![][osx-badge-2.2.1XX]][osx-version-2.2.1XX]
[Installer][osx-installer-2.2.1XX] - [Checksum][osx-installer-checksum-2.2.1XX]
[tar.gz][osx-targz-2.2.1XX] - [Checksum][osx-targz-checksum-2.2.1XX] |[![][osx-badge-2.1.7XX]][osx-version-2.1.7XX]
[Installer][osx-installer-2.1.7XX] - [Checksum][osx-installer-checksum-2.1.7XX]
[tar.gz][osx-targz-2.1.7XX] - [Checksum][osx-targz-checksum-2.1.7XX] | [![][osx-badge-2.1.6XX]][osx-version-2.1.6XX]
[Installer][osx-installer-2.1.6XX] - [Checksum][osx-installer-checksum-2.1.6XX]
[tar.gz][osx-targz-2.1.6XX] - [Checksum][osx-targz-checksum-2.1.6XX] | [![][osx-badge-2.1.5XX]][osx-version-2.1.5XX]
[Installer][osx-installer-2.1.5XX] - [Checksum][osx-installer-checksum-2.1.5XX]
[tar.gz][osx-targz-2.1.5XX] - [Checksum][osx-targz-checksum-2.1.5XX] | +| **Linux x64** | [![][linux-badge-master]][linux-version-master]
[DEB Installer][linux-DEB-installer-master] - [Checksum][linux-DEB-installer-checksum-master]
[RPM Installer][linux-RPM-installer-master] - [Checksum][linux-RPM-installer-checksum-master]
_see installer note below_1
[tar.gz][linux-targz-master] - [Checksum][linux-targz-checksum-master] | [![][linux-badge-3.1.1xx]][linux-version-3.1.1xx]
[DEB Installer][linux-DEB-installer-3.1.1xx] - [Checksum][linux-DEB-installer-checksum-3.1.1xx]
[RPM Installer][linux-RPM-installer-3.1.1xx] - [Checksum][linux-RPM-installer-checksum-3.1.1xx]
_see installer note below_1
[tar.gz][linux-targz-3.1.1xx] - [Checksum][linux-targz-checksum-3.1.1xx] | [![][linux-badge-3.0.1xx]][linux-version-3.0.1xx]
[DEB Installer][linux-DEB-installer-3.0.1xx] - [Checksum][linux-DEB-installer-checksum-3.0.1xx]
[RPM Installer][linux-RPM-installer-3.0.1xx] - [Checksum][linux-RPM-installer-checksum-3.0.1xx]
_see installer note below_1
[tar.gz][linux-targz-3.0.1xx] - [Checksum][linux-targz-checksum-3.0.1xx] | [![][linux-badge-3.0.100-preview8]][linux-version-3.0.100-preview8]
[DEB Installer][linux-DEB-installer-3.0.100-preview8] - [Checksum][linux-DEB-installer-checksum-3.0.100-preview8]
[RPM Installer][linux-RPM-installer-3.0.100-preview8] - [Checksum][linux-RPM-installer-checksum-3.0.100-preview8]
_see installer note below_1
[tar.gz][linux-targz-3.0.100-preview8] - [Checksum][linux-targz-checksum-3.0.100-preview8] | [![][linux-badge-2.2.3xx]][linux-version-2.2.3xx]
[DEB Installer][linux-DEB-installer-2.2.3XX] - [Checksum][linux-DEB-installer-checksum-2.2.3XX]
[RPM Installer][linux-RPM-installer-2.2.3XX] - [Checksum][linux-RPM-installer-checksum-2.2.3XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.3XX] - [Checksum][linux-targz-checksum-2.2.3XX] |[![][linux-badge-2.2.2xx]][linux-version-2.2.2xx]
[DEB Installer][linux-DEB-installer-2.2.2XX] - [Checksum][linux-DEB-installer-checksum-2.2.2XX]
[RPM Installer][linux-RPM-installer-2.2.2XX] - [Checksum][linux-RPM-installer-checksum-2.2.2XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.2XX] - [Checksum][linux-targz-checksum-2.2.2XX] |[![][linux-badge-2.2.1xx]][linux-version-2.2.1xx]
[DEB Installer][linux-DEB-installer-2.2.1XX] - [Checksum][linux-DEB-installer-checksum-2.2.1XX]
[RPM Installer][linux-RPM-installer-2.2.1XX] - [Checksum][linux-RPM-installer-checksum-2.2.1XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.1XX] - [Checksum][linux-targz-checksum-2.2.1XX] |[![][linux-badge-2.1.7XX]][linux-version-2.1.7XX]
[DEB Installer][linux-DEB-installer-2.1.7XX] - [Checksum][linux-DEB-installer-checksum-2.1.7XX]
[RPM Installer][linux-RPM-installer-2.1.7XX] - [Checksum][linux-RPM-installer-checksum-2.1.7XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.7XX] - [Checksum][linux-targz-checksum-2.1.7XX] | [![][linux-badge-2.1.6XX]][linux-version-2.1.6XX]
[DEB Installer][linux-DEB-installer-2.1.6XX] - [Checksum][linux-DEB-installer-checksum-2.1.6XX]
[RPM Installer][linux-RPM-installer-2.1.6XX] - [Checksum][linux-RPM-installer-checksum-2.1.6XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.6XX] - [Checksum][linux-targz-checksum-2.1.6XX] | [![][linux-badge-2.1.5XX]][linux-version-2.1.5XX]
[DEB Installer][linux-DEB-installer-2.1.5XX] - [Checksum][linux-DEB-installer-checksum-2.1.5XX]
[RPM Installer][linux-RPM-installer-2.1.5XX] - [Checksum][linux-RPM-installer-checksum-2.1.5XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.5XX] - [Checksum][linux-targz-checksum-2.1.5XX] | +| **Linux arm** | [![][linux-arm-badge-master]][linux-arm-version-master]
[tar.gz][linux-arm-targz-master] - [Checksum][linux-arm-targz-checksum-master] | [![][linux-arm-badge-3.1.1xx]][linux-arm-version-3.1.1xx]
[tar.gz][linux-arm-targz-3.1.1xx] - [Checksum][linux-arm-targz-checksum-3.1.1xx] | [![][linux-arm-badge-3.0.1xx]][linux-arm-version-3.0.1xx]
[tar.gz][linux-arm-targz-3.0.1xx] - [Checksum][linux-arm-targz-checksum-3.0.1xx] | [![][linux-arm-badge-3.0.100-preview8]][linux-arm-version-3.0.100-preview8]
[tar.gz][linux-arm-targz-3.0.100-preview8] - [Checksum][linux-arm-targz-checksum-3.0.100-preview8] | [![][linux-arm-badge-2.2.3XX]][linux-arm-version-2.2.3XX]
[tar.gz][linux-arm-targz-2.2.3XX] - [Checksum][linux-arm-targz-checksum-2.2.3XX] |[![][linux-arm-badge-2.2.2XX]][linux-arm-version-2.2.2XX]
[tar.gz][linux-arm-targz-2.2.2XX] - [Checksum][linux-arm-targz-checksum-2.2.2XX] |[![][linux-arm-badge-2.2.1XX]][linux-arm-version-2.2.1XX]
[tar.gz][linux-arm-targz-2.2.1XX] - [Checksum][linux-arm-targz-checksum-2.2.1XX] |[![][linux-arm-badge-2.1.7XX]][linux-arm-version-2.1.7XX]
[tar.gz][linux-arm-targz-2.1.7XX] - [Checksum][linux-arm-targz-checksum-2.1.7XX] | [![][linux-arm-badge-2.1.6XX]][linux-arm-version-2.1.6XX]
[tar.gz][linux-arm-targz-2.1.6XX] - [Checksum][linux-arm-targz-checksum-2.1.6XX] | [![][linux-arm-badge-2.1.5XX]][linux-arm-version-2.1.5XX]
[tar.gz][linux-arm-targz-2.1.5XX] - [Checksum][linux-arm-targz-checksum-2.1.5XX] | +| **Linux arm64** | [![][linux-arm64-badge-master]][linux-arm64-version-master]
[tar.gz][linux-arm64-targz-master] - [Checksum][linux-arm64-targz-checksum-master] | [![][linux-arm64-badge-3.1.1xx]][linux-arm64-version-3.1.1xx]
[tar.gz][linux-arm64-targz-3.1.1xx] - [Checksum][linux-arm64-targz-checksum-3.1.1xx] | [![][linux-arm64-badge-3.0.1xx]][linux-arm64-version-3.0.1xx]
[tar.gz][linux-arm64-targz-3.0.1xx] - [Checksum][linux-arm64-targz-checksum-3.0.1xx] | [![][linux-arm64-badge-3.0.100-preview8]][linux-arm64-version-3.0.100-preview8]
[tar.gz][linux-arm64-targz-3.0.100-preview8] - [Checksum][linux-arm64-targz-checksum-3.0.100-preview8] | [![][linux-arm64-badge-2.2.3XX]][linux-arm64-version-2.2.3XX]
[tar.gz][linux-arm64-targz-2.2.3XX] - [Checksum][linux-arm64-targz-checksum-2.2.3XX] |[![][linux-arm64-badge-2.2.2XX]][linux-arm64-version-2.2.2XX]
[tar.gz][linux-arm64-targz-2.2.2XX] - [Checksum][linux-arm64-targz-checksum-2.2.2XX] |[![][linux-arm64-badge-2.2.1XX]][linux-arm64-version-2.2.1XX]
[tar.gz][linux-arm64-targz-2.2.1XX] - [Checksum][linux-arm64-targz-checksum-2.2.1XX] |[![][linux-arm64-badge-2.1.7XX]][linux-arm64-version-2.1.7XX]
[tar.gz][linux-arm64-targz-2.1.7XX] - [Checksum][linux-arm64-targz-checksum-2.1.7XX] | [![][linux-arm64-badge-2.1.6XX]][linux-arm64-version-2.1.6XX]
[tar.gz][linux-arm64-targz-2.1.6XX] - [Checksum][linux-arm64-targz-checksum-2.1.6XX] | [![][linux-arm64-badge-2.1.5XX]][linux-arm64-version-2.1.5XX]
[tar.gz][linux-arm64-targz-2.1.5XX] - [Checksum][linux-arm64-targz-checksum-2.1.5XX] | +| **RHEL 6** | [![][rhel-6-badge-master]][rhel-6-version-master]
[tar.gz][rhel-6-targz-master] - [Checksum][rhel-6-targz-checksum-master] | [![][rhel-6-badge-3.1.1xx]][rhel-6-version-3.1.1xx]
[tar.gz][rhel-6-targz-3.1.1xx] - [Checksum][rhel-6-targz-checksum-3.1.1xx] | [![][rhel-6-badge-3.0.1xx]][rhel-6-version-3.0.1xx]
[tar.gz][rhel-6-targz-3.0.1xx] - [Checksum][rhel-6-targz-checksum-3.0.1xx] | [![][rhel-6-badge-3.0.100-preview8]][rhel-6-version-3.0.100-preview8]
[tar.gz][rhel-6-targz-3.0.100-preview8] - [Checksum][rhel-6-targz-checksum-3.0.100-preview8] | [![][rhel-6-badge-2.2.3XX]][rhel-6-version-2.2.3XX]
[tar.gz][rhel-6-targz-2.2.3XX] - [Checksum][rhel-6-targz-checksum-2.2.3XX] | [![][rhel-6-badge-2.2.2XX]][rhel-6-version-2.2.2XX]
[tar.gz][rhel-6-targz-2.2.2XX] - [Checksum][rhel-6-targz-checksum-2.2.2XX] | [![][rhel-6-badge-2.2.1XX]][rhel-6-version-2.2.1XX]
[tar.gz][rhel-6-targz-2.2.1XX] - [Checksum][rhel-6-targz-checksum-2.2.1XX] | [![][rhel-6-badge-2.1.7XX]][rhel-6-version-2.1.7XX]
[tar.gz][rhel-6-targz-2.1.7XX] - [Checksum][rhel-6-targz-checksum-2.1.7XX] | [![][rhel-6-badge-2.1.6XX]][rhel-6-version-2.1.6XX]
[tar.gz][rhel-6-targz-2.1.6XX] - [Checksum][rhel-6-targz-checksum-2.1.6XX] | [![][rhel-6-badge-2.1.5XX]][rhel-6-version-2.1.5XX]
[tar.gz][rhel-6-targz-2.1.5XX] - [Checksum][rhel-6-targz-checksum-2.1.5XX] | +| **Linux-musl** | [![][linux-musl-badge-master]][linux-musl-version-master]
[tar.gz][linux-musl-targz-master] - [Checksum][linux-musl-targz-checksum-master] | [![][linux-musl-badge-3.1.1xx]][linux-musl-version-3.1.1xx]
[tar.gz][linux-musl-targz-3.1.1xx] - [Checksum][linux-musl-targz-checksum-3.1.1xx] | [![][linux-musl-badge-3.0.1xx]][linux-musl-version-3.0.1xx]
[tar.gz][linux-musl-targz-3.0.1xx] - [Checksum][linux-musl-targz-checksum-3.0.1xx] | [![][linux-musl-badge-3.0.100-preview8]][linux-musl-version-3.0.100-preview8]
[tar.gz][linux-musl-targz-3.0.100-preview8] - [Checksum][linux-musl-targz-checksum-3.0.100-preview8] | [![][linux-musl-badge-2.2.3XX]][linux-musl-version-2.2.3XX]
[tar.gz][linux-musl-targz-2.2.3XX] - [Checksum][linux-musl-targz-checksum-2.2.3XX] |[![][linux-musl-badge-2.2.2XX]][linux-musl-version-2.2.2XX]
[tar.gz][linux-musl-targz-2.2.2XX] - [Checksum][linux-musl-targz-checksum-2.2.2XX] |[![][linux-musl-badge-2.2.1XX]][linux-musl-version-2.2.1XX]
[tar.gz][linux-musl-targz-2.2.1XX] - [Checksum][linux-musl-targz-checksum-2.2.1XX] |[![][linux-musl-badge-2.1.7XX]][linux-musl-version-2.1.7XX]
[tar.gz][linux-musl-targz-2.1.7XX] - [Checksum][linux-musl-targz-checksum-2.1.7XX] | [![][linux-musl-badge-2.1.6XX]][linux-musl-version-2.1.6XX]
[tar.gz][linux-musl-targz-2.1.6XX] - [Checksum][linux-musl-targz-checksum-2.1.6XX] | [![][linux-musl-badge-2.1.5XX]][linux-musl-version-2.1.5XX]
[tar.gz][linux-musl-targz-2.1.5XX] - [Checksum][linux-musl-targz-checksum-2.1.5XX] | +| **Windows arm** | [![][win-arm-badge-master]][win-arm-version-master]
[zip][win-arm-zip-master] - [Checksum][win-arm-zip-checksum-master] | [![][win-arm-badge-3.1.1xx]][win-arm-version-3.1.1xx]
[zip][win-arm-zip-3.1.1xx] - [Checksum][win-arm-zip-checksum-3.1.1xx] | [![][win-arm-badge-3.0.1xx]][win-arm-version-3.0.1xx]
[zip][win-arm-zip-3.0.1xx] - [Checksum][win-arm-zip-checksum-3.0.1xx] | [![][win-arm-badge-3.0.100-preview8]][win-arm-version-3.0.100-preview8]
[zip][win-arm-zip-3.0.100-preview8] - [Checksum][win-arm-zip-checksum-3.0.100-preview8] | [![][win-arm-badge-2.2.3XX]][win-arm-version-2.2.3XX]
[zip][win-arm-zip-2.2.3XX] - [Checksum][win-arm-zip-checksum-2.2.3XX] | [![][win-arm-badge-2.2.2XX]][win-arm-version-2.2.2XX]
[zip][win-arm-zip-2.2.2XX] - [Checksum][win-arm-zip-checksum-2.2.2XX] | [![][win-arm-badge-2.2.1XX]][win-arm-version-2.2.1XX]
[zip][win-arm-zip-2.2.1XX] - [Checksum][win-arm-zip-checksum-2.2.1XX] | **N/A** | **N/A** | **N/A** | +| **FreeBSD x64** | [![][freebsd-x64-badge-master]][freebsd-x64-version-master]
[tar.gz][freebsd-x64-zip-master] - [Checksum][freebsd-x64-zip-checksum-master] | [![][freebsd-x64-badge-3.1.1xx]][freebsd-x64-version-3.1.1xx]
[tar.gz][freebsd-x64-zip-3.1.1xx] - [Checksum][freebsd-x64-zip-checksum-3.1.1xx] | [![][freebsd-x64-badge-3.0.1xx]][freebsd-x64-version-3.0.1xx]
[tar.gz][freebsd-x64-zip-3.0.1xx] - [Checksum][freebsd-x64-zip-checksum-3.0.1xx] | [![][freebsd-x64-badge-3.0.100-preview8]][freebsd-x64-version-3.0.100-preview8]
[tar.gz][freebsd-x64-zip-3.0.100-preview8] - [Checksum][freebsd-x64-zip-checksum-3.0.100-preview8] | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | +| **Constituent Repo Shas** | **N/A** | **N/A** | [Git SHAs][sdk-shas-2.2.1XX] | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | Reference notes: > **1**: Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing the SDK from the .deb file (via dpkg or similar), then you'll need to install the corresponding dependencies first: @@ -78,6 +78,13 @@ Reference notes: [win-x64-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.zip [win-x64-zip-checksum-master]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.zip.sha +[win-x64-badge-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/win_x64_Release_version_badge.svg +[win-x64-version-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/latest.version +[win-x64-installer-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-win-x64.exe +[win-x64-installer-checksum-3.1.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-win-x64.exe.sha +[win-x64-zip-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-win-x64.zip +[win-x64-zip-checksum-3.1.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-win-x64.zip.sha + [win-x64-badge-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/win_x64_Release_version_badge.svg [win-x64-version-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/latest.version [win-x64-installer-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-win-x64.exe @@ -141,6 +148,13 @@ Reference notes: [win-x86-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x86.zip [win-x86-zip-checksum-master]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x86.zip.sha +[win-x86-badge-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/win_x86_Release_version_badge.svg +[win-x86-version-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/latest.version +[win-x86-installer-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-win-x86.exe +[win-x86-installer-checksum-3.1.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-win-x86.exe.sha +[win-x86-zip-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-win-x86.zip +[win-x86-zip-checksum-3.1.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-win-x86.zip.sha + [win-x86-badge-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/win_x86_Release_version_badge.svg [win-x86-version-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/latest.version [win-x86-installer-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-win-x86.exe @@ -204,6 +218,13 @@ Reference notes: [osx-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-osx-x64.tar.gz [osx-targz-checksum-master]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-osx-x64.tar.gz.sha +[osx-badge-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/osx_x64_Release_version_badge.svg +[osx-version-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/latest.version +[osx-installer-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-osx-x64.pkg +[osx-installer-checksum-3.1.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-osx-x64.pkg.sha +[osx-targz-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-osx-x64.tar.gz +[osx-targz-checksum-3.1.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-osx-x64.tar.gz.sha + [osx-badge-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/osx_x64_Release_version_badge.svg [osx-version-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/latest.version [osx-installer-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-osx-x64.pkg @@ -269,6 +290,15 @@ Reference notes: [linux-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-x64.tar.gz [linux-targz-checksum-master]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-x64.tar.gz.sha +[linux-badge-3.1.1xx]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/linux_x64_Release_version_badge.svg +[linux-version-3.1.1xx]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/latest.version +[linux-DEB-installer-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-x64.deb +[linux-DEB-installer-checksum-3.1.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-x64.deb.sha +[linux-RPM-installer-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-x64.rpm +[linux-RPM-installer-checksum-3.1.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-x64.rpm.sha +[linux-targz-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-linux-x64.tar.gz +[linux-targz-checksum-3.1.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-linux-x64.tar.gz.sha + [linux-badge-3.0.1xx]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/linux_x64_Release_version_badge.svg [linux-version-3.0.1xx]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/latest.version [linux-DEB-installer-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-x64.deb @@ -346,6 +376,11 @@ Reference notes: [linux-arm-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm.tar.gz [linux-arm-targz-checksum-master]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm.tar.gz.sha +[linux-arm-badge-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/linux_arm_Release_version_badge.svg +[linux-arm-version-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/latest.version +[linux-arm-targz-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-linux-arm.tar.gz +[linux-arm-targz-checksum-3.1.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-linux-arm.tar.gz.sha + [linux-arm-badge-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/linux_arm_Release_version_badge.svg [linux-arm-version-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/latest.version [linux-arm-targz-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-linux-arm.tar.gz @@ -391,6 +426,11 @@ Reference notes: [linux-arm64-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm64.tar.gz [linux-arm64-targz-checksum-master]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm64.tar.gz.sha +[linux-arm64-badge-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/linux_arm64_Release_version_badge.svg +[linux-arm64-version-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/latest.version +[linux-arm64-targz-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-linux-arm64.tar.gz +[linux-arm64-targz-checksum-3.1.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-linux-arm64.tar.gz.sha + [linux-arm64-badge-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/linux_arm64_Release_version_badge.svg [linux-arm64-version-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/latest.version [linux-arm64-targz-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-linux-arm64.tar.gz @@ -436,6 +476,11 @@ Reference notes: [rhel-6-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-rhel.6-x64.tar.gz [rhel-6-targz-checksum-master]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha +[rhel-6-badge-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/rhel.6_x64_Release_version_badge.svg +[rhel-6-version-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/latest.version +[rhel-6-targz-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-rhel.6-x64.tar.gz +[rhel-6-targz-checksum-3.1.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha + [rhel-6-badge-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/rhel.6_x64_Release_version_badge.svg [rhel-6-version-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/latest.version [rhel-6-targz-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-rhel.6-x64.tar.gz @@ -481,6 +526,11 @@ Reference notes: [linux-musl-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-musl-x64.tar.gz [linux-musl-targz-checksum-master]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-musl-x64.tar.gz.sha +[linux-musl-badge-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/linux_musl_x64_Release_version_badge.svg +[linux-musl-version-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/latest.version +[linux-musl-targz-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-linux-musl-x64.tar.gz +[linux-musl-targz-checksum-3.1.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-linux-musl-x64.tar.gz.sha + [linux-musl-badge-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/linux_musl_x64_Release_version_badge.svg [linux-musl-version-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/latest.version [linux-musl-targz-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-linux-musl-x64.tar.gz @@ -526,6 +576,11 @@ Reference notes: [win-arm-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-arm.zip [win-arm-zip-checksum-master]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-arm.zip.sha +[win-arm-badge-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/win_arm_Release_version_badge.svg +[win-arm-version-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/latest.version +[win-arm-zip-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-win-arm.zip +[win-arm-zip-checksum-3.1.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-win-arm.zip.sha + [win-arm-badge-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/win_arm_Release_version_badge.svg [win-arm-version-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/latest.version [win-arm-zip-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-win-arm.zip @@ -556,6 +611,11 @@ Reference notes: [freebsd-x64-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-freebsd-x64.tar.gz [freebsd-x64-zip-checksum-master]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-freebsd-x64.tar.gz.sha +[freebsd-x64-badge-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/freebsd_x64_Release_version_badge.svg +[freebsd-x64-version-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/latest.version +[freebsd-x64-zip-3.1.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-freebsd-x64.tar.gz +[freebsd-x64-zip-checksum-3.1.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.1xx/dotnet-sdk-latest-freebsd-x64.tar.gz.sha + [freebsd-x64-badge-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/freebsd_x64_Release_version_badge.svg [freebsd-x64-version-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/latest.version [freebsd-x64-zip-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-freebsd-x64.tar.gz From 9a474a4131fa66c195b76a183bf32cad8d2e5969 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 8 Sep 2019 18:35:30 +0000 Subject: [PATCH 020/170] Update dependencies from https://github.com/dotnet/core-setup build 20190908.7 - Microsoft.NETCore.App - 3.1.0-preview1.19458.7 - NETStandard.Library.Ref - 2.1.0-preview1.19458.7 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19458.7 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19455.20 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc1.19455.14 (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 918a5b3d2..394bb5c26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 3f71391d25658ef00495eb76526e6cbac9e48a0b + 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 - + https://github.com/dotnet/core-setup - 3f71391d25658ef00495eb76526e6cbac9e48a0b + 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 - + https://github.com/dotnet/core-setup - 3f71391d25658ef00495eb76526e6cbac9e48a0b + 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index db3157eb5..77455e750 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19458.3 + 3.1.0-preview1.19458.7 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19458.3 + 2.1.0-preview1.19458.7 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19458.3 + 3.1.0-preview1.19458.7 $(MicrosoftWindowsDesktopAppPackageVersion) From 26adf27477f2d25b636db56d719ae9452a4f2f75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2019 13:39:45 +0000 Subject: [PATCH 021/170] Update dependencies from https://github.com/dotnet/arcade build 20190908.2 (#4695) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19458.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 3947a4290..8b764f40a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - c27945fc559ee636139d9f460db71242b16483e6 + 29ee79a10c58dd6863a46157e374521cac610ad8 diff --git a/global.json b/global.json index e6fff8422..9b2de486b 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.19457.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19458.2" } } From 01566ce1546272f7505ff5aca3fa1ca83f45be07 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Mon, 9 Sep 2019 12:38:32 -0700 Subject: [PATCH 022/170] Download the ASP.NET SharedFramework MSI and the Module V2 MSI --- src/redist/targets/GenerateLayout.targets | 30 +++++++++++++++++------ src/redist/targets/GenerateMSIs.targets | 2 +- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index d2a0b6fd1..68d467140 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -46,8 +46,9 @@ $(CoreSetupRid) $(ProductMonikerRid) linux-$(Architecture) - dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) - + dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + windowsdesktop-runtime-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + $(SharedFrameworkRid) linux-x64 $(AspNetCoreSharedFxInstallerRid) @@ -55,16 +56,15 @@ aspnetcore-runtime-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib + aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)$(InstallerExtension) aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcoremodule_$(Architecture)_en_v2$(InstallerExtension) aspnetcore-targeting-pack-$(AspNetCoreVersion)$(ArchiveExtension) aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) - windowsdesktop-runtime-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) - aspnetcore_base_runtime.version - + $(CoreSetupBlobRootUrl)Runtime/ @@ -82,7 +82,7 @@ $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) - $(CombinedFrameworkHostCompressedFileName) + $(CombinedFrameworkHostArchiveFileName) $(CoreSetupBlobAccessTokenParam) @@ -212,12 +212,26 @@ + Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion) $(DownloadedAspNetCoreSharedFxInstallerFileName) $(CoreSetupBlobAccessTokenParam) + + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion) + $(DownloadedAspNetCoreSharedFxWixLibFileName) + $(CoreSetupBlobAccessTokenParam) + + + + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion) + $(DownloadedAspNetCoreV2ModuleInstallerFileName) + $(CoreSetupBlobAccessTokenParam) + + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 2fd3ea9d3..82d619de0 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -231,7 +231,7 @@ $(RedistLayoutPath)sdk\$(SdkVersion)\ https://dotnetcli.azureedge.net/dotnet/ https://dotnetcli.blob.core.windows.net/dotnet/ https://dotnetfeed.blob.core.windows.net/dotnet-toolset/ - + $(HostRid) $(HostMonikerRid) @@ -48,7 +48,7 @@ linux-$(Architecture) dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) - + $(SharedFrameworkRid) linux-x64 $(AspNetCoreSharedFxInstallerRid) @@ -62,6 +62,7 @@ aspnetcoremodule_$(Architecture)_en_v2$(InstallerExtension) aspnetcore-targeting-pack-$(AspNetCoreVersion)$(ArchiveExtension) aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) + aspnetcore_base_runtime.version @@ -100,7 +101,7 @@ $(NetStandardTargetingPackTargetFramework) packs/%(PackageName)/%(PackageVersion) - + Microsoft.AspNetCore.App.Ref $(AspNetTargetingPackVersion) @@ -128,28 +129,28 @@ $(DownloadedRuntimeDepsInstallerFileName) $(CoreSetupBlobAccessTokenParam) - + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) $(DownloadedSharedFrameworkInstallerFileName) $(CoreSetupBlobAccessTokenParam) - + $(CoreSetupRootUrl)$(SharedHostVersion) $(DownloadedSharedHostInstallerFileName) $(CoreSetupBlobAccessTokenParam) - + $(CoreSetupRootUrl)$(HostFxrVersion) $(DownloadedHostFxrInstallerFileName) $(CoreSetupBlobAccessTokenParam) - + $(CoreSetupRootUrl)$(NetCoreAppTargetingPackVersion) @@ -170,7 +171,7 @@ $(DownloadedNetCoreAppHostPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) - + $(CoreSetupRootUrl)$(WindowsDesktopTargetingPackVersion) @@ -203,7 +204,7 @@ $(CoreSetupBlobAccessTokenParam) - + $(AspNetCoreSharedFxRootUrl)$(AspNetTargetingPackVersion) @@ -219,14 +220,14 @@ + Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' == '.msi' And !$(Architecture.StartsWith('arm'))"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion) $(DownloadedAspNetCoreSharedFxWixLibFileName) $(CoreSetupBlobAccessTokenParam) + Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' == '.msi' And !$(Architecture.StartsWith('arm'))"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion) $(DownloadedAspNetCoreV2ModuleInstallerFileName) $(CoreSetupBlobAccessTokenParam) @@ -239,13 +240,13 @@ $(CoreSetupBlobAccessTokenParam) - + false true false - + Microsoft.WindowsDesktop.App.Ref @@ -282,7 +283,7 @@ true - + @@ -348,7 +349,7 @@ DestinationFiles="@(BundledLayoutPackageDownloadFilesWithDestination->'%(DestinationPath)')" SkipUnchangedFiles="true" /> - + @@ -365,13 +366,13 @@ ReplacementPatterns="$(ReplacementPattern)" ReplacementStrings="$(ReplacementString)" /> - + - + @@ -379,10 +380,10 @@ $(IntermediateOutputPath)AppHostRestore\ $(SdkOutputDirectory)AppHostTemplate - + - + @@ -420,9 +421,9 @@ - + - + - + - + From 81d199b4d614fcb90c300c7e174e6fe201c27b54 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2019 13:40:10 +0000 Subject: [PATCH 025/170] Update dependencies from https://github.com/dotnet/arcade build 20190909.10 (#4716) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19459.10 --- eng/Version.Details.xml | 4 ++-- .../post-build/channels/netcore-dev-30.yml | 14 +++----------- .../post-build/channels/netcore-dev-31.yml | 14 +++----------- .../post-build/channels/netcore-dev-5.yml | 14 +++----------- .../post-build/channels/netcore-internal-30.yml | 15 ++------------- .../post-build/channels/netcore-release-30.yml | 13 +------------ .../post-build/channels/netcore-release-31.yml | 13 +------------ .../post-build/channels/netcore-tools-latest.yml | 16 ++++------------ .../channels/public-validation-release.yml | 16 ++++------------ eng/common/templates/steps/promote-build.yml | 13 +++++++++++++ global.json | 2 +- 11 files changed, 37 insertions(+), 97 deletions(-) create mode 100644 eng/common/templates/steps/promote-build.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b764f40a..4663ced2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 29ee79a10c58dd6863a46157e374521cac610ad8 + f5ccfdcbd828383d39cf583086ef42d72ca5b320 diff --git a/eng/common/templates/post-build/channels/netcore-dev-30.yml b/eng/common/templates/post-build/channels/netcore-dev-30.yml index 7984f06d1..3c5eb8398 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-30.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-30.yml @@ -120,14 +120,6 @@ stages: /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) ${{ parameters.artifactsPublishingAdditionalParameters }} - -- stage: NetCore_Dev30_Publish_Validation - displayName: .NET Core 3.0 Dev Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml index bcedd0f07..965309d15 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-31.yml @@ -120,14 +120,6 @@ stages: /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) ${{ parameters.artifactsPublishingAdditionalParameters }} - -- stage: NetCore_Dev31_Publish_Validation - displayName: .NET Core 3.1 Dev Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml index 18432cc60..9975dda4e 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-5.yml @@ -126,14 +126,6 @@ stages: /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - -- stage: NetCore_Dev5_Publish_Validation - displayName: .NET Core 5 Dev Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/netcore-internal-30.yml index 36e1d1188..20eef377b 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/netcore-internal-30.yml @@ -113,17 +113,6 @@ stages: /p:Configuration=Release ${{ parameters.artifactsPublishingAdditionalParameters }} - - template: ../trigger-subscription.yml + - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} - -- stage: NetCore_30_Internal_Servicing_Publish_Validation - displayName: .NET Core 3.0 Internal Servicing Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - 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/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml index abae985ab..5a5c28e1b 100644 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ b/eng/common/templates/post-build/channels/netcore-release-30.yml @@ -113,17 +113,6 @@ stages: /p:Configuration=Release ${{ parameters.artifactsPublishingAdditionalParameters }} - - template: ../trigger-subscription.yml + - template: ../../steps/promote-build.yml parameters: ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} - -- stage: NetCore_Release30_Publish_Validation - displayName: .NET Core 3.0 Release Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/netcore-release-31.yml index b2a6c7659..294521588 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/netcore-release-31.yml @@ -119,17 +119,6 @@ stages: /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) ${{ parameters.artifactsPublishingAdditionalParameters }} - - template: ../trigger-subscription.yml + - template: ../../steps/promote-build.yml parameters: ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} - -- stage: NetCore_Release31_Publish_Validation - displayName: .NET Core 3.1 Release Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml index 36f6dea62..09445aee0 100644 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ b/eng/common/templates/post-build/channels/netcore-tools-latest.yml @@ -125,15 +125,7 @@ stages: /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw) ${{ parameters.artifactsPublishingAdditionalParameters }} - - -- stage: NetCore_Tools_Latest_PublishValidation - displayName: .NET Tools - Latest Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} + + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} \ No newline at end of file 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 a5fcdc581..4feed3297 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -85,15 +85,7 @@ stages: /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - - -- stage: PVR_PublishValidation - displayName: .NET Tools - Validation Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} + + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} diff --git a/eng/common/templates/steps/promote-build.yml b/eng/common/templates/steps/promote-build.yml new file mode 100644 index 000000000..b90404435 --- /dev/null +++ b/eng/common/templates/steps/promote-build.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Add Build to Channel + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/promote-build.ps1 + arguments: -BuildId $(BARBuildId) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroApiAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/global.json b/global.json index 9b2de486b..91019b412 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.19458.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19459.10" } } From 724015cc60c6aa3ea2dc974103adc320d992b676 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 10 Sep 2019 13:53:43 -0700 Subject: [PATCH 026/170] Update latest patch versions --- src/redist/targets/GenerateBundledVersions.targets | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 48bb975f7..b92727fc0 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -107,11 +107,11 @@ + LatestVersion="2.1.13" /> + LatestVersion="2.2.7" /> + LatestVersion="2.1.13"/> + LatestVersion="2.1.13"/> + LatestVersion="2.2.7"/> + LatestVersion="2.2.7"/> From 827464d908606a3a5a0081e799b96ea4e171bce7 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 10 Sep 2019 13:58:14 -0700 Subject: [PATCH 027/170] Add support for targeting .NET Core 3.1 --- .../targets/GenerateBundledVersions.targets | 79 +++++++++++++++++-- test/EndToEnd/ProjectBuildTests.cs | 2 +- 2 files changed, 75 insertions(+), 6 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index b92727fc0..a77fc9160 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -30,6 +30,11 @@ <_NETStandardLibraryPackageVersion>@(_NETStandardLibraryPackageVersions->Distinct()) <_NETCorePlatformsPackageVersion>@(_NETCorePlatformsPackageVersions->Distinct()) + <_NETCoreApp30PackageVersion>3.0.0-rc1-19456-20 + <_NETCoreApp30TargetingPackVersion>$(_NETCoreApp30PackageVersion) + <_MicrosoftWindowsDesktop30PackageVersion>$(_NETCoreApp30PackageVersion) + <_MicrosoftWindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion) + <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1]) @@ -79,6 +84,10 @@ linux-x64; linux-arm; linux-arm64" /> + + + + + + + + + + + + + + + + Date: Tue, 10 Sep 2019 14:32:07 -0700 Subject: [PATCH 028/170] Exclude ASP.NET targeting pack and shared framework from RPM/debs until we have 3.1 versions --- src/redist/targets/GenerateDebs.targets | 14 ++++---------- src/redist/targets/GenerateRPMs.targets | 5 ----- .../packaging/deb/dotnet-debian_config.json | 4 +--- .../targets/packaging/rpm/dotnet-config.json | 8 -------- 4 files changed, 5 insertions(+), 26 deletions(-) diff --git a/src/redist/targets/GenerateDebs.targets b/src/redist/targets/GenerateDebs.targets index 421b6e70a..5336d80b5 100644 --- a/src/redist/targets/GenerateDebs.targets +++ b/src/redist/targets/GenerateDebs.targets @@ -235,12 +235,10 @@ - - - - + - - + @@ -353,11 +351,9 @@ - - @@ -374,11 +370,9 @@ - - diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index 3f5a07e08..5755bd5df 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -286,12 +286,9 @@ - - - @@ -304,11 +301,9 @@ - - diff --git a/src/redist/targets/packaging/deb/dotnet-debian_config.json b/src/redist/targets/packaging/deb/dotnet-debian_config.json index 35a0f433f..836d41375 100644 --- a/src/redist/targets/packaging/deb/dotnet-debian_config.json +++ b/src/redist/targets/packaging/deb/dotnet-debian_config.json @@ -32,8 +32,6 @@ "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%, "%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }, "%NETCORE_APPHOST_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }, - "%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NET_STANDARD_DEBIAN_PACKAGE_VERSION%" }, - "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" }, - "%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" } + "%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NET_STANDARD_DEBIAN_PACKAGE_VERSION%" } } } diff --git a/src/redist/targets/packaging/rpm/dotnet-config.json b/src/redist/targets/packaging/rpm/dotnet-config.json index fd090e2d8..d06c428f1 100644 --- a/src/redist/targets/packaging/rpm/dotnet-config.json +++ b/src/redist/targets/packaging/rpm/dotnet-config.json @@ -37,14 +37,6 @@ { "package_name": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_NAME%", "package_version": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_VERSION%" - }, - { - "package_name": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%", - "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" - }, - { - "package_name": "%ASPNET_TARGETING_PACK_RPM_PACKAGE_NAME%", - "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" } ], "directories": [ From 614179846c976dee34edea72357569443af28e0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 13:07:10 +0000 Subject: [PATCH 029/170] Update dependencies from https://github.com/dotnet/arcade build 20190910.3 (#4728) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19460.3 --- 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 482db7451..b78cd04ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - f5ccfdcbd828383d39cf583086ef42d72ca5b320 + 0f5cfb20a355c27bc84cedd049c946b44a7fc1da diff --git a/global.json b/global.json index 91019b412..8c6b8ec55 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.19459.10" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19460.3" } } From 2f1e0565db3ac81320fcbffec12b714cff577a28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 13:50:14 +0000 Subject: [PATCH 030/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#4211) * Update dependencies from https://github.com/dotnet/toolset build 20190823.16 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19423.16 * Update dependencies from https://github.com/dotnet/toolset build 20190828.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19428.12 * Update dependencies from https://github.com/dotnet/toolset build 20190829.22 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19429.22 * Update dependencies from https://github.com/dotnet/toolset build 20190905.27 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19455.27 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19455.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.30 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19455.30 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19455.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.31 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19455.31 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19455.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.37 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19455.37 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19455.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.38 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19455.38 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19455.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.46 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19455.46 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19455.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190906.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19456.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19455.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190906.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19456.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19455.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190906.16 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19456.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19456.6 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190906.28 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19456.28 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19456.6 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190906.29 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19456.29 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19456.13 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19457.4 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19456.13 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.10 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19457.10 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19456.13 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.16 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19457.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19457.7 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.20 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19457.20 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19457.7 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190908.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19458.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19457.7 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190908.11 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19458.11 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19458.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190908.13 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19458.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19458.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190908.16 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19458.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19458.8 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190908.19 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19458.19 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19458.8 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190908.21 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19458.21 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19458.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190908.22 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19458.22 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19458.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190908.24 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19458.24 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19458.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190908.29 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19458.29 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19458.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190908.30 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19458.30 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19458.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.7 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19459.7 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19458.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.11 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19459.11 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19458.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.13 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19459.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19459.6 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.17 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19459.17 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19459.6 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.19 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19459.19 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19459.6 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.20 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19459.20 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19459.6 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.21 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19459.21 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19459.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.23 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19459.23 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19459.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.25 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19459.25 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19459.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.26 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19459.26 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19459.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.27 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19459.27 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19459.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.30 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19459.30 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19459.12 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.31 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19459.31 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19459.12 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19460.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19459.12 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19460.4 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19460.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19460.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19460.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.15 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19460.15 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19460.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.22 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19460.22 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19460.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.24 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19460.24 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19460.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.26 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19460.26 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19460.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190911.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19461.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19460.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b78cd04ac..243c75c71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 828045ec3ee15784b34fd27d10b88b5d9adf560e + 980523f2cfca0df57dcc4fc95530d9c5d55d5a1f https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 71744d3163293fc31cd1c1917929cf172d22bcaa + 3080b5b0bcc473af814fafcae65c985d81fc14b4 diff --git a/eng/Versions.props b/eng/Versions.props index 77455e750..e2f00c97a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19422.19 + 3.1.100-preview1.19461.8 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19422.4 + 3.1.100-preview1.19460.1 0.2.0 From 5a3ec67ac682e928236c0551f49d9270a6ad3633 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 13:51:50 +0000 Subject: [PATCH 031/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.1 (#4729) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19461.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19461.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19461.1 - dotnet-user-secrets - 3.0.0-rc2.19461.1 - dotnet-dev-certs - 3.0.0-rc2.19461.1 - dotnet-watch - 3.0.0-rc2.19461.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 243c75c71..e0dea40f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 - + https://github.com/aspnet/AspNetCore - 4e142516c6872682a3472acd3860308c05800709 + 2cae0cd451556483a176845f46887631a35da9c2 - + https://github.com/aspnet/AspNetCore - 4e142516c6872682a3472acd3860308c05800709 + 2cae0cd451556483a176845f46887631a35da9c2 - + https://github.com/aspnet/AspNetCore - 4e142516c6872682a3472acd3860308c05800709 + 2cae0cd451556483a176845f46887631a35da9c2 - + https://github.com/aspnet/AspNetCore - 4e142516c6872682a3472acd3860308c05800709 + 2cae0cd451556483a176845f46887631a35da9c2 - + https://github.com/aspnet/AspNetCore - 4e142516c6872682a3472acd3860308c05800709 + 2cae0cd451556483a176845f46887631a35da9c2 - + https://github.com/aspnet/AspNetCore - 4e142516c6872682a3472acd3860308c05800709 + 2cae0cd451556483a176845f46887631a35da9c2 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index e2f00c97a..1ec69295e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19422.2 - 3.0.0-rc1.19422.2 - 3.0.0-rc1.19422.2 - 3.0.0-rc1.19422.2 - 3.0.0-rc1.19422.2 - 3.0.0-rc1.19422.2 + 3.0.0-rc2.19461.1 + 3.0.0-rc2.19461.1 + 3.0.0-rc2.19461.1 + 3.0.0-rc2.19461.1 + 3.0.0-rc2.19461.1 + 3.0.0-rc2.19461.1 From 0c9a8ad45afdd8197e36393304db309ea1dd651b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 14:55:49 +0000 Subject: [PATCH 032/170] Update dependencies from https://github.com/dotnet/toolset build 20190911.11 (#4731) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19461.11 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19461.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e0dea40f4..70cccd5ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 980523f2cfca0df57dcc4fc95530d9c5d55d5a1f + cd509d264c2245c4b60c8d6d69740511546a8ac7 https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 3080b5b0bcc473af814fafcae65c985d81fc14b4 + 47db5f4423381088e7283fc570c1b439b9044aea diff --git a/eng/Versions.props b/eng/Versions.props index 1ec69295e..a802fee32 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19461.8 + 3.1.100-preview1.19461.11 @@ -33,7 +33,7 @@ - 3.1.100-preview1.19460.1 + 3.1.100-preview1.19461.6 0.2.0 From 07723bf6a0fcab79979251dcad06eb98b9aa8199 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 15:30:53 +0000 Subject: [PATCH 033/170] Update dependencies from https://github.com/dotnet/toolset build 20190911.12 (#4733) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19461.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19461.7 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70cccd5ee..99157b7f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - cd509d264c2245c4b60c8d6d69740511546a8ac7 + 5ee52504c8c42f23c0d467cd335b2b5c71491561 https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 47db5f4423381088e7283fc570c1b439b9044aea + a6e4f7bfd93943b9336fd4741343a3bdbc5f550b diff --git a/eng/Versions.props b/eng/Versions.props index a802fee32..2617550db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19461.11 + 3.1.100-preview1.19461.12 @@ -33,7 +33,7 @@ - 3.1.100-preview1.19461.6 + 3.1.100-preview1.19461.7 0.2.0 From 0891540d938637aac2f1b4e61de96df0025ec1f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 21:04:12 +0000 Subject: [PATCH 034/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.7 (#4736) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19461.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19461.7 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19461.7 - dotnet-user-secrets - 3.0.0-rc2.19461.7 - dotnet-dev-certs - 3.0.0-rc2.19461.7 - dotnet-watch - 3.0.0-rc2.19461.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 99157b7f0..bc9a572f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 - + https://github.com/aspnet/AspNetCore - 2cae0cd451556483a176845f46887631a35da9c2 + 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 - + https://github.com/aspnet/AspNetCore - 2cae0cd451556483a176845f46887631a35da9c2 + 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 - + https://github.com/aspnet/AspNetCore - 2cae0cd451556483a176845f46887631a35da9c2 + 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 - + https://github.com/aspnet/AspNetCore - 2cae0cd451556483a176845f46887631a35da9c2 + 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 - + https://github.com/aspnet/AspNetCore - 2cae0cd451556483a176845f46887631a35da9c2 + 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 - + https://github.com/aspnet/AspNetCore - 2cae0cd451556483a176845f46887631a35da9c2 + 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 2617550db..088486502 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc2.19461.1 - 3.0.0-rc2.19461.1 - 3.0.0-rc2.19461.1 - 3.0.0-rc2.19461.1 - 3.0.0-rc2.19461.1 - 3.0.0-rc2.19461.1 + 3.0.0-rc2.19461.7 + 3.0.0-rc2.19461.7 + 3.0.0-rc2.19461.7 + 3.0.0-rc2.19461.7 + 3.0.0-rc2.19461.7 + 3.0.0-rc2.19461.7 From 5689e044b417ba2ff047cc2d5d429b3ccbfbfbfb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 22:20:37 +0000 Subject: [PATCH 035/170] Update dependencies from https://github.com/dotnet/toolset build 20190911.18 (#4741) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19461.18 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc2.19455.7 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc9a572f6..97219a35d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,13 +42,13 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 5ee52504c8c42f23c0d467cd335b2b5c71491561 + 8ea43e0e2251c770e1255ed788a574db08a5df7b - + https://github.com/dotnet/sdk - 83dffb6faab234c0c878e92c1679fa47c0cab3dd + b88161ed99ded0dd598779ad1afe044818422a6f https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 088486502..6a74ae23f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19461.12 + 3.1.100-preview1.19461.18 @@ -40,7 +40,7 @@ - 3.0.100-rc1.19422.1 + 3.0.100-rc2.19455.7 $(MicrosoftNETSdkPackageVersion) From 4ad8bb3cb69bffaf3b7b6444949226f5bf077e63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 22:50:23 +0000 Subject: [PATCH 036/170] Update dependencies from https://github.com/dotnet/toolset build 20190911.19 (#4745) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19461.19 --- 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 97219a35d..fe2ec7479 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 8ea43e0e2251c770e1255ed788a574db08a5df7b + e104f8ed5f70661ee0700a2a42c2a810d378139c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6a74ae23f..8247ee21e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19461.18 + 3.1.100-preview1.19461.19 From a77fab9b7f0c1060be2941edc91dbce0f774917a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 23:16:03 +0000 Subject: [PATCH 037/170] Update dependencies from https://github.com/dotnet/toolset build 20190911.20 (#4748) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19461.20 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19461.12 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe2ec7479..75c0de759 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - e104f8ed5f70661ee0700a2a42c2a810d378139c + afd7f170e1ed82653a17af718603e52e15aaf523 https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - a6e4f7bfd93943b9336fd4741343a3bdbc5f550b + 524a5e9a0394e449323f47be47526eec480d7791 diff --git a/eng/Versions.props b/eng/Versions.props index 8247ee21e..7c3dd77d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19461.19 + 3.1.100-preview1.19461.20 @@ -33,7 +33,7 @@ - 3.1.100-preview1.19461.7 + 3.1.100-preview1.19461.12 0.2.0 From 0e0ab3e6f355f8ea1922b7a8e76d2dc52624c8ba Mon Sep 17 00:00:00 2001 From: jbeisner Date: Wed, 11 Sep 2019 17:14:57 -0700 Subject: [PATCH 038/170] Add an icon to the SDKPlaceHolder MSI --- .../targets/packaging/windows/clisdk/msi.ico | Bin 0 -> 2238 bytes .../packaging/windows/clisdk/sdkplaceholder.wxs | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 src/redist/targets/packaging/windows/clisdk/msi.ico diff --git a/src/redist/targets/packaging/windows/clisdk/msi.ico b/src/redist/targets/packaging/windows/clisdk/msi.ico new file mode 100644 index 0000000000000000000000000000000000000000..c2e2717c2067edbc06ff048d7cd5c3076335e9b9 GIT binary patch literal 2238 zcmaKuKTIn}5QoQlmd-lS&`?njs!(r5l?c~Juc0Q@*69#Zq?m>}BofjVkz6EEQlv4J zB^M?|im;-Df}kgb;z{R=Y-r9>o|t?)XN*mFSu=OH^P4~4&7A>}2A_=$VYTGvmdF}c zpJE%>=U4;3t!90)V}oNdTOAR8q|>QS9J!R?a45q+hcfx&CuugD(rUG2Wo1QHS65|i zZB5qK*JX2aQ?|CYWN&Xzc6WDWXJ<#Yx3{J9mCD<(5 zbo6%=awIuXvGyDs3=RedgM-14U~n)v7#s`^2E&BG!QfzUFgO?t9R>%3gTcYzU~q~L z4hM%z9I7?}Je<=fU=hQgZW$I&b5A2rQ4foa0nu~eVezooSm5w*csM*99u6B793BP_ zgNGrF&coqh@GwMrDMuS2ed-T;8*iEpRP+u+*{JCqUFem^@|41<+Y@a#PtYPD00mrvwJ+27xn zgM$M(K0cPy(^I*)xR742C)d~4a(jC#cXxME6ouU1-^+A5mB~LUKXki%k2_2^eFxHs zdbUe-(^e&4UX*CJ+snS^T~UP4{jJ|yiYNy

U(Dtk#dt7fO`KgS^c1Vw@4s?e~t( z&ldvf{Hn}HV*)}q$qx_D1!nnGF=o-=2$eMtc*-vZ7LezNTs`Y`|Ed@ah)AGiSuX0v zUzNqTX(fF!A>zOJ4-e<({eGU0E1fLnGe*tHe?UDuIXN6xnNB7P`AIJcNb>jH!*L3j z%XvA=uZsTJ*-5v1NP#MAGpj5!+FGxws<3qQab@Y*n5jPHqvxX$<XWGLUYoqG?=Aj^?4tXrV- zXJ)>h^;tmDA8&4W?R%G(m(2yeuAKD0-aQ2@=`}~L&3E&FW!-Me@}B};*U6s+ysqEO z13se913so(0Jr(NKA%qWRee6&bTOar{F#kjtUTApOo!8k4!;x~Zpha|G5d@&_QlN7 gwb>ia4NP8Ir~YrEG3ERLd&Kw^)6nVv*avy@FS@;$H2?qr literal 0 HcmV?d00001 diff --git a/src/redist/targets/packaging/windows/clisdk/sdkplaceholder.wxs b/src/redist/targets/packaging/windows/clisdk/sdkplaceholder.wxs index a3d5b9e98..1576a03bd 100644 --- a/src/redist/targets/packaging/windows/clisdk/sdkplaceholder.wxs +++ b/src/redist/targets/packaging/windows/clisdk/sdkplaceholder.wxs @@ -18,6 +18,8 @@ + + From d550e2a9ec52de99d7471043228483da48f22f12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 02:35:40 +0000 Subject: [PATCH 039/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.12 (#4756) - dotnet-user-secrets - 3.0.0-rc2.19461.12 - dotnet-watch - 3.0.0-rc2.19461.12 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19461.12 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19461.12 - dotnet-dev-certs - 3.0.0-rc2.19461.12 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19461.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 75c0de759..666998fda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 - + https://github.com/aspnet/AspNetCore - 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 + 04f37e59d54af63cdd1d2d196f0f4970e7b8818a - + https://github.com/aspnet/AspNetCore - 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 + 04f37e59d54af63cdd1d2d196f0f4970e7b8818a - + https://github.com/aspnet/AspNetCore - 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 + 04f37e59d54af63cdd1d2d196f0f4970e7b8818a - + https://github.com/aspnet/AspNetCore - 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 + 04f37e59d54af63cdd1d2d196f0f4970e7b8818a - + https://github.com/aspnet/AspNetCore - 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 + 04f37e59d54af63cdd1d2d196f0f4970e7b8818a - + https://github.com/aspnet/AspNetCore - 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 + 04f37e59d54af63cdd1d2d196f0f4970e7b8818a https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 7c3dd77d1..37c39d911 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc2.19461.7 - 3.0.0-rc2.19461.7 - 3.0.0-rc2.19461.7 - 3.0.0-rc2.19461.7 - 3.0.0-rc2.19461.7 - 3.0.0-rc2.19461.7 + 3.0.0-rc2.19461.12 + 3.0.0-rc2.19461.12 + 3.0.0-rc2.19461.12 + 3.0.0-rc2.19461.12 + 3.0.0-rc2.19461.12 + 3.0.0-rc2.19461.12 From d1dc94589a699f28f82a391e40df5442aac200ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 04:15:42 +0000 Subject: [PATCH 040/170] Update dependencies from https://github.com/dotnet/toolset build 20190911.27 (#4758) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19461.27 --- 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 666998fda..161e1f45a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - afd7f170e1ed82653a17af718603e52e15aaf523 + e7e7fd3a69a9265e64df4eed15b62d726cdedb9a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 37c39d911..1c02e3647 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19461.20 + 3.1.100-preview1.19461.27 From b90ef8b77df13c7884514936f3e6493f4e73c115 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 12:05:43 +0000 Subject: [PATCH 041/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190912.2 (#4765) - dotnet-user-secrets - 3.0.0-rc2.19462.2 - dotnet-watch - 3.0.0-rc2.19462.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19462.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19462.2 - dotnet-dev-certs - 3.0.0-rc2.19462.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19462.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 161e1f45a..fd126ddc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 - + https://github.com/aspnet/AspNetCore - 04f37e59d54af63cdd1d2d196f0f4970e7b8818a + db1aca12a532e4b37a91d8037b50a22d1ef21239 - + https://github.com/aspnet/AspNetCore - 04f37e59d54af63cdd1d2d196f0f4970e7b8818a + db1aca12a532e4b37a91d8037b50a22d1ef21239 - + https://github.com/aspnet/AspNetCore - 04f37e59d54af63cdd1d2d196f0f4970e7b8818a + db1aca12a532e4b37a91d8037b50a22d1ef21239 - + https://github.com/aspnet/AspNetCore - 04f37e59d54af63cdd1d2d196f0f4970e7b8818a + db1aca12a532e4b37a91d8037b50a22d1ef21239 - + https://github.com/aspnet/AspNetCore - 04f37e59d54af63cdd1d2d196f0f4970e7b8818a + db1aca12a532e4b37a91d8037b50a22d1ef21239 - + https://github.com/aspnet/AspNetCore - 04f37e59d54af63cdd1d2d196f0f4970e7b8818a + db1aca12a532e4b37a91d8037b50a22d1ef21239 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 1c02e3647..a9ef9a4cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc2.19461.12 - 3.0.0-rc2.19461.12 - 3.0.0-rc2.19461.12 - 3.0.0-rc2.19461.12 - 3.0.0-rc2.19461.12 - 3.0.0-rc2.19461.12 + 3.0.0-rc2.19462.2 + 3.0.0-rc2.19462.2 + 3.0.0-rc2.19462.2 + 3.0.0-rc2.19462.2 + 3.0.0-rc2.19462.2 + 3.0.0-rc2.19462.2 From 5fdd6263b6fcbd627812f48c157bdfa26ee722ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 13:16:19 +0000 Subject: [PATCH 042/170] Update dependencies from https://github.com/dotnet/arcade build 20190911.7 (#4769) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19461.7 --- eng/Version.Details.xml | 4 +- .../post-build/channels/netcore-dev-30.yml | 13 ++++--- .../post-build/channels/netcore-dev-31.yml | 15 ++++---- .../post-build/channels/netcore-dev-5.yml | 29 ++++++-------- .../channels/netcore-internal-30.yml | 38 +++++++++++-------- .../channels/netcore-release-30.yml | 38 +++++++++++-------- .../channels/netcore-release-31.yml | 14 ++++--- .../channels/netcore-tools-latest.yml | 33 +++++++--------- .../channels/public-validation-release.yml | 26 ++++++------- .../templates/post-build/common-variables.yml | 4 -- .../templates/post-build/post-build.yml | 6 +-- global.json | 2 +- 12 files changed, 112 insertions(+), 110 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd126ddc1..bc5baf333 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 0f5cfb20a355c27bc84cedd049c946b44a7fc1da + 8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba diff --git a/eng/common/templates/post-build/channels/netcore-dev-30.yml b/eng/common/templates/post-build/channels/netcore-dev-30.yml index 3c5eb8398..69f1a9013 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-30.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-30.yml @@ -97,14 +97,8 @@ stages: /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' @@ -118,6 +112,13 @@ stages: /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml index 965309d15..720a0ab08 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-31.yml @@ -46,7 +46,7 @@ stages: /p:Configuration=Release ${{ parameters.symbolPublishingAdditionalParameters }} - - job: + - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars variables: @@ -97,14 +97,8 @@ stages: /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' @@ -118,6 +112,13 @@ stages: /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml index 9975dda4e..9c81e39e9 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-5.yml @@ -2,7 +2,6 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false - publishToAzureDevOpsFeeds: true stages: - stage: NetCore_Dev5_Publish @@ -92,38 +91,34 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} + /p:PublishToAzureDevOpsNuGetFeeds=true /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/netcore-internal-30.yml index 20eef377b..594a1a9a7 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/netcore-internal-30.yml @@ -90,27 +90,33 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:PublishInstallersAndChecksums=true + /p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:ChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml index 5a5c28e1b..8ba9237ff 100644 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ b/eng/common/templates/post-build/channels/netcore-release-30.yml @@ -1,6 +1,7 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false stages: - stage: NetCore_Release30_Publish @@ -90,27 +91,34 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/netcore-release-31.yml index 294521588..d8270eada 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/netcore-release-31.yml @@ -1,6 +1,7 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false stages: - stage: NetCore_Release31_Publish @@ -96,14 +97,8 @@ stages: /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' @@ -117,6 +112,13 @@ stages: /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml index 09445aee0..c75d18673 100644 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ b/eng/common/templates/post-build/channels/netcore-tools-latest.yml @@ -2,7 +2,6 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false - publishToAzureDevOpsFeeds: true stages: - stage: NetCore_Tools_Latest_Publish @@ -92,40 +91,36 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} + /p:PublishToAzureDevOpsNuGetFeeds=true /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw) + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - + - template: ../../steps/promote-build.yml parameters: ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} \ No newline at end of file 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 4feed3297..fb2c23d0f 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -1,7 +1,6 @@ parameters: artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false - publishToAzureDevOpsFeeds: true stages: - stage: PVR_Publish @@ -57,35 +56,36 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} + /p:PublishToAzureDevOpsNuGetFeeds=true /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - + - template: ../../steps/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 c13476449..adb2a854f 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -55,10 +55,6 @@ variables: # Feed Configurations # These should include the suffix "/index.json" - # Configuration for the feed where packages from internal non-stable builds will be published to - - name: StaticInternalFeed - value: 'https://dnceng.pkgs.visualstudio.com/_packaging/dotnet-core-internal/nuget/v3/index.json' - # Default locations for Installers and checksums # Public Locations - name: ChecksumsBlobFeedUrl diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index e473cadbc..5b9d0a5d9 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -4,7 +4,6 @@ parameters: enableSymbolValidation: false enableNugetValidation: true publishInstallersAndChecksums: false - enableAzDONuGetFeeds: true SDLValidationParameters: enable: false continueOnError: false @@ -101,7 +100,6 @@ stages: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }} - template: \eng\common\templates\post-build\channels\netcore-dev-30.yml parameters: @@ -120,23 +118,23 @@ stages: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }} - template: \eng\common\templates\post-build\channels\public-validation-release.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }} - template: \eng\common\templates\post-build\channels\netcore-release-30.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - template: \eng\common\templates\post-build\channels\netcore-release-31.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - template: \eng\common\templates\post-build\channels\netcore-internal-30.yml parameters: diff --git a/global.json b/global.json index 8c6b8ec55..3275aa5ff 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.19460.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19461.7" } } From eb0d76be0882ab82e6d9247370ec9be33dbec918 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 14:11:35 +0000 Subject: [PATCH 043/170] Update dependencies from https://github.com/dotnet/toolset build 20190912.9 (#4775) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19462.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 bc5baf333..fb325dba6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - e7e7fd3a69a9265e64df4eed15b62d726cdedb9a + 36d01962827407f3082e3a543a0e798d1f4bab16 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a9ef9a4cc..910554dd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19461.27 + 3.1.100-preview1.19462.9 From 9f0e3d619b5d938e5845cb693b7355b9b9922830 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 15:15:52 +0000 Subject: [PATCH 044/170] Update dependencies from https://github.com/dotnet/toolset build 20190912.13 (#4780) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19462.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19462.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb325dba6..d1d371b46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 36d01962827407f3082e3a543a0e798d1f4bab16 + 2f526bcec0a913c9beb950845466104e673bda6b https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - 524a5e9a0394e449323f47be47526eec480d7791 + 22df9f6178df2c65b40f6b46b5e26553c3119165 diff --git a/eng/Versions.props b/eng/Versions.props index 910554dd8..6359ef780 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19462.9 + 3.1.100-preview1.19462.13 @@ -33,7 +33,7 @@ - 3.1.100-preview1.19461.12 + 3.1.100-preview1.19462.3 0.2.0 From 7359e01d749f09915eeba172a22cd75666b97d99 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2019 04:05:45 +0000 Subject: [PATCH 045/170] Update dependencies from https://github.com/dotnet/toolset build 20190912.25 (#4793) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19462.25 --- 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 d1d371b46..3a99704c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 2f526bcec0a913c9beb950845466104e673bda6b + fbbfab3eb995b5ecdd92b809b38619ad3071f8e8 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6359ef780..c5efbf473 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19462.13 + 3.1.100-preview1.19462.25 From ff7b25b53374ad7e51ab7eb9f6eee199f8f35373 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2019 05:25:49 +0000 Subject: [PATCH 046/170] Update dependencies from https://github.com/dotnet/toolset build 20190912.27 (#4795) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19462.27 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19462.8 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a99704c8..abc250f5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - fbbfab3eb995b5ecdd92b809b38619ad3071f8e8 + a8d3527fb2816d377ffabda05fb43b34bb1635db https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - 22df9f6178df2c65b40f6b46b5e26553c3119165 + 25e58e48c0f49360bb5a9c804ca3b2ebeae01246 diff --git a/eng/Versions.props b/eng/Versions.props index c5efbf473..3e63ed8e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19462.25 + 3.1.100-preview1.19462.27 @@ -33,7 +33,7 @@ - 3.1.100-preview1.19462.3 + 3.1.100-preview1.19462.8 0.2.0 From dca04e7030b25f3213085b6f624c12c3e67e2b40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2019 17:24:23 +0000 Subject: [PATCH 047/170] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#4792) * Update dependencies from https://github.com/dotnet/core-setup build 20190912.24 - Microsoft.NETCore.App - 3.1.0-preview1.19462.24 - NETStandard.Library.Ref - 2.1.0-preview1.19462.24 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19462.24 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19462.8 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19462.15 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190913.3 - Microsoft.NETCore.App - 3.1.0-preview1.19463.3 - NETStandard.Library.Ref - 2.1.0-preview1.19463.3 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19463.3 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19462.8 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19462.15 (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 abc250f5d..66b40b6b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 + 1e35b022cbc45bd8185cfa3f3151451298bf6de4 - + https://github.com/dotnet/core-setup - 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 + 1e35b022cbc45bd8185cfa3f3151451298bf6de4 - + https://github.com/dotnet/core-setup - 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 + 1e35b022cbc45bd8185cfa3f3151451298bf6de4 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 25e58e48c0f49360bb5a9c804ca3b2ebeae01246 - + https://github.com/dotnet/winforms - 9104c48ca015b5a4c8e029c330af6d68bc11b0b8 + 93ae5ab5d366dc65495de6abb938f6d647eaf291 - + https://github.com/dotnet/wpf - 1c3dd24d7188899a5f12d1caa31630f66bd4c2fd + acd0da083a426b222a54201c9f37860da50a906a diff --git a/eng/Versions.props b/eng/Versions.props index 3e63ed8e5..b4adc8cb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-rc1.19455.20 + 4.8.1-preview1.19462.8 - 3.0.0-rc1.19455.14 + 3.1.0-preview1.19462.15 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19458.7 + 3.1.0-preview1.19463.3 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19458.7 + 2.1.0-preview1.19463.3 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19458.7 + 3.1.0-preview1.19463.3 $(MicrosoftWindowsDesktopAppPackageVersion) From d323b63a304c09742b93278fe20b2a402dd15224 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2019 03:30:44 +0000 Subject: [PATCH 048/170] Update dependencies from https://github.com/dotnet/core-setup build 20190917.7 (#4883) - Microsoft.NETCore.App - 3.1.0-preview1.19467.7 - NETStandard.Library.Ref - 2.1.0-preview1.19467.7 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19467.7 --- 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 66b40b6b6..d1c59455a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 1e35b022cbc45bd8185cfa3f3151451298bf6de4 + 1e19b8c0d63fe23da7bdd9625ca51c6bd2d1bab2 - + https://github.com/dotnet/core-setup - 1e35b022cbc45bd8185cfa3f3151451298bf6de4 + 1e19b8c0d63fe23da7bdd9625ca51c6bd2d1bab2 - + https://github.com/dotnet/core-setup - 1e35b022cbc45bd8185cfa3f3151451298bf6de4 + 1e19b8c0d63fe23da7bdd9625ca51c6bd2d1bab2 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index b4adc8cb5..3a2abe765 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19463.3 + 3.1.0-preview1.19467.7 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19463.3 + 2.1.0-preview1.19467.7 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19463.3 + 3.1.0-preview1.19467.7 $(MicrosoftWindowsDesktopAppPackageVersion) From ba461bc51b85fd4a68ea7d0b87883bc3195b15b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2019 21:55:44 +0000 Subject: [PATCH 049/170] Update dependencies from https://github.com/dotnet/core-setup build 20190920.5 (#4911) - Microsoft.NETCore.App - 3.1.0-preview1.19470.5 - NETStandard.Library.Ref - 2.1.0-preview1.19470.5 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19470.5 --- 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 d1c59455a..0216c135f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 1e19b8c0d63fe23da7bdd9625ca51c6bd2d1bab2 + b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/dotnet/core-setup - 1e19b8c0d63fe23da7bdd9625ca51c6bd2d1bab2 + b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/dotnet/core-setup - 1e19b8c0d63fe23da7bdd9625ca51c6bd2d1bab2 + b0ea03ec3af2a9c388f718fbb4978984ab339953 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 3a2abe765..462ede6a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19467.7 + 3.1.0-preview1.19470.5 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19467.7 + 2.1.0-preview1.19470.5 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19467.7 + 3.1.0-preview1.19470.5 $(MicrosoftWindowsDesktopAppPackageVersion) From 04113007941632374b0a7288092db55815612c89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Sep 2019 07:30:21 +0000 Subject: [PATCH 050/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190920.3 - dotnet-user-secrets - 3.1.0-preview1.19470.3 - dotnet-watch - 3.1.0-preview1.19470.3 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19470.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19470.3 - dotnet-dev-certs - 3.1.0-preview1.19470.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19470.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 0216c135f..51f4c9ed5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - db1aca12a532e4b37a91d8037b50a22d1ef21239 + 2e9484b44ef24d53e1bec7ea473c12b6eef44501 - + https://github.com/aspnet/AspNetCore - db1aca12a532e4b37a91d8037b50a22d1ef21239 + 2e9484b44ef24d53e1bec7ea473c12b6eef44501 - + https://github.com/aspnet/AspNetCore - db1aca12a532e4b37a91d8037b50a22d1ef21239 + 2e9484b44ef24d53e1bec7ea473c12b6eef44501 - + https://github.com/aspnet/AspNetCore - db1aca12a532e4b37a91d8037b50a22d1ef21239 + 2e9484b44ef24d53e1bec7ea473c12b6eef44501 - + https://github.com/aspnet/AspNetCore - db1aca12a532e4b37a91d8037b50a22d1ef21239 + 2e9484b44ef24d53e1bec7ea473c12b6eef44501 - + https://github.com/aspnet/AspNetCore - db1aca12a532e4b37a91d8037b50a22d1ef21239 + 2e9484b44ef24d53e1bec7ea473c12b6eef44501 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 462ede6a2..ffae7b6e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc2.19462.2 - 3.0.0-rc2.19462.2 - 3.0.0-rc2.19462.2 - 3.0.0-rc2.19462.2 - 3.0.0-rc2.19462.2 - 3.0.0-rc2.19462.2 + 3.1.0-preview1.19470.3 + 3.1.0-preview1.19470.3 + 3.1.0-preview1.19470.3 + 3.1.0-preview1.19470.3 + 3.1.0-preview1.19470.3 + 3.1.0-preview1.19470.3 From 0386ae221dd0d35924e84c6797529365d5e7fc85 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 20 Sep 2019 15:23:59 -0700 Subject: [PATCH 051/170] React to msi rename --- 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 4c64d613c..e9d68c9c2 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -59,7 +59,7 @@ aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)$(InstallerExtension) aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcoremodule_$(Architecture)_en_v2$(InstallerExtension) + aspnetcoremodule_$(Architecture)_en_v2_$(AspNetCoreVersion)$(InstallerExtension) aspnetcore-targeting-pack-$(AspNetCoreVersion)$(ArchiveExtension) aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) From a3bb2201852519621f4fde16e90ab80bdafc216c Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 20 Sep 2019 15:20:01 -0700 Subject: [PATCH 052/170] Add 3.1 templates --- eng/Versions.props | 17 ++++++-- src/redist/targets/BundledTemplates.targets | 45 ++++++++++++++++++--- src/redist/targets/GenerateLayout.targets | 1 + 3 files changed, 55 insertions(+), 8 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index ffae7b6e8..eb6fa3f4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,20 +60,31 @@ $(MicrosoftWindowsDesktopAppPackageVersion) + + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) + 1.6.3 + 2.0.0-preview8.19373.1 + $(MicrosoftDotNetCommonItemTemplates31PackageVersion) + 1.0.2-beta4.19354.2 + $(AspNetCoreVersion) + - $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) + 4.8.0-rc2.19462.10 + 3.0.0-rc2.19459.11 1.6.3 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.19354.2 - $(AspNetCoreVersion) + 3.0.0-rc2.19461.12 + 1.6.0 1.0.2-beta4 $(MicrosoftDotNetCommonItemTemplates22PackageVersion) 1.0.2-beta4.19155.2 2.2.6 + 1.5.3 1.0.2-beta3 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 5c3b0a824..495d1d453 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -2,6 +2,16 @@ + $(AspNetCorePackageVersionFor31Templates.IndexOf('-')) + $(AspNetCorePackageVersionFor31Templates) + $(AspNetCorePackageVersionFor31Templates.Substring(0, $(AspNetCore31VersionPreReleaseSeparator))) + $(AspNetCore31VersionMajorMinorPatchVersion).$(GitCommitCount) + $(AspNetCore31VersionMajorMinorPatchVersion) + $(BundledTemplates31InstallPath)-$(VersionSuffix) + $([MSBuild]::Add($(AspNetCore31VersionMajorMinorPatchVersion.IndexOf('.')), 1)) + $(AspNetCore31VersionMajorMinorPatchVersion.IndexOf('.', $(Templates31VersionPatchSeparatorIndex))) + $(AspNetCore31VersionMajorMinorPatchVersion.Substring(0, $(Templates31VersionPatchSeparatorIndex))) + $(AspNetCorePackageVersionFor30Templates.IndexOf('-')) $(AspNetCorePackageVersionFor30Templates) $(AspNetCorePackageVersionFor30Templates.Substring(0, $(AspNetCore30VersionPreReleaseSeparator))) @@ -34,6 +44,17 @@ + + + + + + + + + + + @@ -64,6 +85,13 @@ + + + %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) + [%(PackageVersion)] + + %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg @@ -87,16 +115,16 @@ - + - + + DependsOnTargets="LayoutTemplatesForSDK;LayoutTemplatesFor31MSI;LayoutTemplatesFor30MSI;LayoutTemplatesFor22MSI;LayoutTemplatesFor21MSI" /> @@ -104,8 +132,15 @@ - + + + + + $(BaseOutputPath)$(Configuration)\dotnet\ $(BaseOutputPath)$(Configuration)\dotnet-internal\ + $(BaseOutputPath)$(Configuration)\templates-3.1\ $(BaseOutputPath)$(Configuration)\templates-3.0\ $(BaseOutputPath)$(Configuration)\templates-2.2\ $(BaseOutputPath)$(Configuration)\templates-2.1\ From 5c361b66bbf6a7684b048dcc07c61f8f82ad70af Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 20 Sep 2019 16:19:37 -0700 Subject: [PATCH 053/170] Fix 3.1 tests --- .../targets/GenerateBundledVersions.targets | 20 ++++++++++++++++--- test/EndToEnd/GivenFrameworkDependentApps.cs | 4 ++-- .../GivenSelfContainedAppsRollForward.cs | 4 ++-- test/EndToEnd/SupportedNetCoreAppVersions.cs | 3 ++- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index a77fc9160..278a1250c 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -35,6 +35,9 @@ <_MicrosoftWindowsDesktop30PackageVersion>$(_NETCoreApp30PackageVersion) <_MicrosoftWindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion) + <_MicrosoftAspNetCoreApp30PackageVersion>3.0.0-rc2.19461.12 + <_AspNet30TargetingPackVersion>$(_MicrosoftAspNetCoreApp30PackageVersion) + <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1]) @@ -238,6 +241,17 @@ Copyright (c) .NET Foundation. All rights reserved. Profile="WindowsForms" /> + + diff --git a/test/EndToEnd/GivenFrameworkDependentApps.cs b/test/EndToEnd/GivenFrameworkDependentApps.cs index 8b809382a..bfc399813 100644 --- a/test/EndToEnd/GivenFrameworkDependentApps.cs +++ b/test/EndToEnd/GivenFrameworkDependentApps.cs @@ -19,7 +19,7 @@ namespace EndToEnd [ClassData(typeof(SupportedNetCoreAppVersions))] public void ItDoesNotRollForwardToTheLatestVersionOfNetCore(string minorVersion) { - if (minorVersion == "3.0") + if (minorVersion == "3.0" || minorVersion == "3.1") { // https://github.com/dotnet/core-sdk/issues/621 return; @@ -31,7 +31,7 @@ namespace EndToEnd [ClassData(typeof(SupportedAspNetCoreVersions))] public void ItDoesNotRollForwardToTheLatestVersionOfAspNetCoreApp(string minorVersion) { - if (minorVersion == "3.0") + if (minorVersion == "3.0" || minorVersion == "3.1") { // https://github.com/dotnet/core-sdk/issues/621 return; diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs index 7cf1512bd..9dda617fa 100644 --- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs +++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs @@ -23,7 +23,7 @@ namespace EndToEnd [ClassData(typeof(SupportedNetCoreAppVersions))] public void ItRollsForwardToTheLatestNetCoreVersion(string minorVersion) { - if (minorVersion == "3.0") + if (minorVersion == "3.0" || minorVersion == "3.1") { // https://github.com/dotnet/core-sdk/issues/621 return; @@ -35,7 +35,7 @@ namespace EndToEnd [ClassData(typeof(SupportedAspNetCoreVersions))] public void ItRollsForwardToTheLatestAspNetCoreAppVersion(string minorVersion) { - if (minorVersion == "3.0") + if (minorVersion == "3.0" || minorVersion == "3.1") { // https://github.com/dotnet/core-sdk/issues/621 return; diff --git a/test/EndToEnd/SupportedNetCoreAppVersions.cs b/test/EndToEnd/SupportedNetCoreAppVersions.cs index 6c9adff95..ee70c9548 100644 --- a/test/EndToEnd/SupportedNetCoreAppVersions.cs +++ b/test/EndToEnd/SupportedNetCoreAppVersions.cs @@ -21,7 +21,8 @@ namespace EndToEnd "2.0", "2.1", "2.2", - "3.0" + "3.0", + "3.1", }; } } From abd1e70d5fb3f8ef82f41d308f089c68e072ff4d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 21 Sep 2019 00:10:44 +0000 Subject: [PATCH 054/170] Update dependencies from https://github.com/dotnet/core-setup build 20190920.9 (#4915) - Microsoft.NETCore.App - 3.1.0-preview1.19470.9 - NETStandard.Library.Ref - 2.1.0-preview1.19470.9 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19470.9 --- 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 0216c135f..35091467c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - b0ea03ec3af2a9c388f718fbb4978984ab339953 + 72b39b0473993b932a08c8fc24a8988d45b416a5 - + https://github.com/dotnet/core-setup - b0ea03ec3af2a9c388f718fbb4978984ab339953 + 72b39b0473993b932a08c8fc24a8988d45b416a5 - + https://github.com/dotnet/core-setup - b0ea03ec3af2a9c388f718fbb4978984ab339953 + 72b39b0473993b932a08c8fc24a8988d45b416a5 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 462ede6a2..5c272f58b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19470.5 + 3.1.0-preview1.19470.9 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19470.5 + 2.1.0-preview1.19470.9 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19470.5 + 3.1.0-preview1.19470.9 $(MicrosoftWindowsDesktopAppPackageVersion) From 7b3d6dd8bfc02041c7c3ce22db4cf7c322b0667c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Sep 2019 01:00:26 +0000 Subject: [PATCH 055/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190920.14 - dotnet-user-secrets - 3.1.0-preview1.19470.14 - dotnet-watch - 3.1.0-preview1.19470.14 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19470.14 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19470.14 - dotnet-dev-certs - 3.1.0-preview1.19470.14 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19470.14 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 15 ++++++--------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51f4c9ed5..5dd228b35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - 2e9484b44ef24d53e1bec7ea473c12b6eef44501 + f21b00aa458b843619cfc7c47a42803ffd33ea73 - + https://github.com/aspnet/AspNetCore - 2e9484b44ef24d53e1bec7ea473c12b6eef44501 + f21b00aa458b843619cfc7c47a42803ffd33ea73 - + https://github.com/aspnet/AspNetCore - 2e9484b44ef24d53e1bec7ea473c12b6eef44501 + f21b00aa458b843619cfc7c47a42803ffd33ea73 - + https://github.com/aspnet/AspNetCore - 2e9484b44ef24d53e1bec7ea473c12b6eef44501 + f21b00aa458b843619cfc7c47a42803ffd33ea73 - + https://github.com/aspnet/AspNetCore - 2e9484b44ef24d53e1bec7ea473c12b6eef44501 + f21b00aa458b843619cfc7c47a42803ffd33ea73 - + https://github.com/aspnet/AspNetCore - 2e9484b44ef24d53e1bec7ea473c12b6eef44501 + f21b00aa458b843619cfc7c47a42803ffd33ea73 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index eb6fa3f4d..34f3bc060 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19470.3 - 3.1.0-preview1.19470.3 - 3.1.0-preview1.19470.3 - 3.1.0-preview1.19470.3 - 3.1.0-preview1.19470.3 - 3.1.0-preview1.19470.3 + 3.1.0-preview1.19470.14 + 3.1.0-preview1.19470.14 + 3.1.0-preview1.19470.14 + 3.1.0-preview1.19470.14 + 3.1.0-preview1.19470.14 + 3.1.0-preview1.19470.14 @@ -68,7 +68,6 @@ $(MicrosoftDotNetCommonItemTemplates31PackageVersion) 1.0.2-beta4.19354.2 $(AspNetCoreVersion) - 4.8.0-rc2.19462.10 3.0.0-rc2.19459.11 @@ -77,14 +76,12 @@ $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.19354.2 3.0.0-rc2.19461.12 - 1.6.0 1.0.2-beta4 $(MicrosoftDotNetCommonItemTemplates22PackageVersion) 1.0.2-beta4.19155.2 2.2.6 - 1.5.3 1.0.2-beta3 From 8974206ca7c8910034f917f96a7d4f0de8d283a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Sep 2019 11:30:24 +0000 Subject: [PATCH 056/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.1 - dotnet-user-secrets - 3.1.0-preview1.19471.1 - dotnet-watch - 3.1.0-preview1.19471.1 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.1 - dotnet-dev-certs - 3.1.0-preview1.19471.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.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 5dd228b35..a622aae5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - f21b00aa458b843619cfc7c47a42803ffd33ea73 + ace9e7c4fe6cf866212125dd465ab8d7051e757c - + https://github.com/aspnet/AspNetCore - f21b00aa458b843619cfc7c47a42803ffd33ea73 + ace9e7c4fe6cf866212125dd465ab8d7051e757c - + https://github.com/aspnet/AspNetCore - f21b00aa458b843619cfc7c47a42803ffd33ea73 + ace9e7c4fe6cf866212125dd465ab8d7051e757c - + https://github.com/aspnet/AspNetCore - f21b00aa458b843619cfc7c47a42803ffd33ea73 + ace9e7c4fe6cf866212125dd465ab8d7051e757c - + https://github.com/aspnet/AspNetCore - f21b00aa458b843619cfc7c47a42803ffd33ea73 + ace9e7c4fe6cf866212125dd465ab8d7051e757c - + https://github.com/aspnet/AspNetCore - f21b00aa458b843619cfc7c47a42803ffd33ea73 + ace9e7c4fe6cf866212125dd465ab8d7051e757c https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 34f3bc060..1978215e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19470.14 - 3.1.0-preview1.19470.14 - 3.1.0-preview1.19470.14 - 3.1.0-preview1.19470.14 - 3.1.0-preview1.19470.14 - 3.1.0-preview1.19470.14 + 3.1.0-preview1.19471.1 + 3.1.0-preview1.19471.1 + 3.1.0-preview1.19471.1 + 3.1.0-preview1.19471.1 + 3.1.0-preview1.19471.1 + 3.1.0-preview1.19471.1 From 1ecb4f37d958e4569ee4ee9b5d17ea3681049431 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Sep 2019 20:20:23 +0000 Subject: [PATCH 057/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.2 - dotnet-user-secrets - 3.1.0-preview1.19471.2 - dotnet-watch - 3.1.0-preview1.19471.2 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.2 - dotnet-dev-certs - 3.1.0-preview1.19471.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.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 a622aae5d..b9c755bb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - ace9e7c4fe6cf866212125dd465ab8d7051e757c + 57002759fd6c700487e863806fb82042d9f278b4 - + https://github.com/aspnet/AspNetCore - ace9e7c4fe6cf866212125dd465ab8d7051e757c + 57002759fd6c700487e863806fb82042d9f278b4 - + https://github.com/aspnet/AspNetCore - ace9e7c4fe6cf866212125dd465ab8d7051e757c + 57002759fd6c700487e863806fb82042d9f278b4 - + https://github.com/aspnet/AspNetCore - ace9e7c4fe6cf866212125dd465ab8d7051e757c + 57002759fd6c700487e863806fb82042d9f278b4 - + https://github.com/aspnet/AspNetCore - ace9e7c4fe6cf866212125dd465ab8d7051e757c + 57002759fd6c700487e863806fb82042d9f278b4 - + https://github.com/aspnet/AspNetCore - ace9e7c4fe6cf866212125dd465ab8d7051e757c + 57002759fd6c700487e863806fb82042d9f278b4 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 1978215e8..b3b0c920c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19471.1 - 3.1.0-preview1.19471.1 - 3.1.0-preview1.19471.1 - 3.1.0-preview1.19471.1 - 3.1.0-preview1.19471.1 - 3.1.0-preview1.19471.1 + 3.1.0-preview1.19471.2 + 3.1.0-preview1.19471.2 + 3.1.0-preview1.19471.2 + 3.1.0-preview1.19471.2 + 3.1.0-preview1.19471.2 + 3.1.0-preview1.19471.2 From 27da986c91990d5407cdd882075615d84b44a08b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Sep 2019 00:40:23 +0000 Subject: [PATCH 058/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.3 - dotnet-user-secrets - 3.1.0-preview1.19471.3 - dotnet-watch - 3.1.0-preview1.19471.3 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.3 - dotnet-dev-certs - 3.1.0-preview1.19471.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.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 b9c755bb3..ec5ca5e06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - 57002759fd6c700487e863806fb82042d9f278b4 + e1e8068f6813bf12220e29a30dab8c393d5bc746 - + https://github.com/aspnet/AspNetCore - 57002759fd6c700487e863806fb82042d9f278b4 + e1e8068f6813bf12220e29a30dab8c393d5bc746 - + https://github.com/aspnet/AspNetCore - 57002759fd6c700487e863806fb82042d9f278b4 + e1e8068f6813bf12220e29a30dab8c393d5bc746 - + https://github.com/aspnet/AspNetCore - 57002759fd6c700487e863806fb82042d9f278b4 + e1e8068f6813bf12220e29a30dab8c393d5bc746 - + https://github.com/aspnet/AspNetCore - 57002759fd6c700487e863806fb82042d9f278b4 + e1e8068f6813bf12220e29a30dab8c393d5bc746 - + https://github.com/aspnet/AspNetCore - 57002759fd6c700487e863806fb82042d9f278b4 + e1e8068f6813bf12220e29a30dab8c393d5bc746 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index b3b0c920c..a2e61778b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19471.2 - 3.1.0-preview1.19471.2 - 3.1.0-preview1.19471.2 - 3.1.0-preview1.19471.2 - 3.1.0-preview1.19471.2 - 3.1.0-preview1.19471.2 + 3.1.0-preview1.19471.3 + 3.1.0-preview1.19471.3 + 3.1.0-preview1.19471.3 + 3.1.0-preview1.19471.3 + 3.1.0-preview1.19471.3 + 3.1.0-preview1.19471.3 From c1a7dd13aaecafc4e667540ef67e06847c25a413 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Sep 2019 03:20:24 +0000 Subject: [PATCH 059/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.4 - dotnet-user-secrets - 3.1.0-preview1.19471.4 - dotnet-watch - 3.1.0-preview1.19471.4 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.4 - dotnet-dev-certs - 3.1.0-preview1.19471.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.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 ec5ca5e06..6143623fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - e1e8068f6813bf12220e29a30dab8c393d5bc746 + 309adfa57e03cf28344526acfcb6f8135ac9bc81 - + https://github.com/aspnet/AspNetCore - e1e8068f6813bf12220e29a30dab8c393d5bc746 + 309adfa57e03cf28344526acfcb6f8135ac9bc81 - + https://github.com/aspnet/AspNetCore - e1e8068f6813bf12220e29a30dab8c393d5bc746 + 309adfa57e03cf28344526acfcb6f8135ac9bc81 - + https://github.com/aspnet/AspNetCore - e1e8068f6813bf12220e29a30dab8c393d5bc746 + 309adfa57e03cf28344526acfcb6f8135ac9bc81 - + https://github.com/aspnet/AspNetCore - e1e8068f6813bf12220e29a30dab8c393d5bc746 + 309adfa57e03cf28344526acfcb6f8135ac9bc81 - + https://github.com/aspnet/AspNetCore - e1e8068f6813bf12220e29a30dab8c393d5bc746 + 309adfa57e03cf28344526acfcb6f8135ac9bc81 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index a2e61778b..7573e47d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19471.3 - 3.1.0-preview1.19471.3 - 3.1.0-preview1.19471.3 - 3.1.0-preview1.19471.3 - 3.1.0-preview1.19471.3 - 3.1.0-preview1.19471.3 + 3.1.0-preview1.19471.4 + 3.1.0-preview1.19471.4 + 3.1.0-preview1.19471.4 + 3.1.0-preview1.19471.4 + 3.1.0-preview1.19471.4 + 3.1.0-preview1.19471.4 From ac84ff0bdc08c789a966b04dd04d140bd5b93276 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Sep 2019 06:15:23 +0000 Subject: [PATCH 060/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.5 - dotnet-user-secrets - 3.1.0-preview1.19471.5 - dotnet-watch - 3.1.0-preview1.19471.5 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.5 - dotnet-dev-certs - 3.1.0-preview1.19471.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.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 6143623fc..bcdf73227 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - 309adfa57e03cf28344526acfcb6f8135ac9bc81 + 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 - + https://github.com/aspnet/AspNetCore - 309adfa57e03cf28344526acfcb6f8135ac9bc81 + 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 - + https://github.com/aspnet/AspNetCore - 309adfa57e03cf28344526acfcb6f8135ac9bc81 + 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 - + https://github.com/aspnet/AspNetCore - 309adfa57e03cf28344526acfcb6f8135ac9bc81 + 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 - + https://github.com/aspnet/AspNetCore - 309adfa57e03cf28344526acfcb6f8135ac9bc81 + 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 - + https://github.com/aspnet/AspNetCore - 309adfa57e03cf28344526acfcb6f8135ac9bc81 + 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 7573e47d5..28c13dea9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19471.4 - 3.1.0-preview1.19471.4 - 3.1.0-preview1.19471.4 - 3.1.0-preview1.19471.4 - 3.1.0-preview1.19471.4 - 3.1.0-preview1.19471.4 + 3.1.0-preview1.19471.5 + 3.1.0-preview1.19471.5 + 3.1.0-preview1.19471.5 + 3.1.0-preview1.19471.5 + 3.1.0-preview1.19471.5 + 3.1.0-preview1.19471.5 From 39f74f36db4b9f4be69f77d69af7b76fd014af49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Sep 2019 08:25:23 +0000 Subject: [PATCH 061/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.7 - dotnet-user-secrets - 3.1.0-preview1.19471.7 - dotnet-watch - 3.1.0-preview1.19471.7 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.7 - dotnet-dev-certs - 3.1.0-preview1.19471.7 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.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 bcdf73227..c775fcb3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 + 2980e8a283e53caa211b29783201f8c4d489e5d3 - + https://github.com/aspnet/AspNetCore - 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 + 2980e8a283e53caa211b29783201f8c4d489e5d3 - + https://github.com/aspnet/AspNetCore - 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 + 2980e8a283e53caa211b29783201f8c4d489e5d3 - + https://github.com/aspnet/AspNetCore - 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 + 2980e8a283e53caa211b29783201f8c4d489e5d3 - + https://github.com/aspnet/AspNetCore - 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 + 2980e8a283e53caa211b29783201f8c4d489e5d3 - + https://github.com/aspnet/AspNetCore - 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 + 2980e8a283e53caa211b29783201f8c4d489e5d3 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 28c13dea9..d4e462f02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19471.5 - 3.1.0-preview1.19471.5 - 3.1.0-preview1.19471.5 - 3.1.0-preview1.19471.5 - 3.1.0-preview1.19471.5 - 3.1.0-preview1.19471.5 + 3.1.0-preview1.19471.7 + 3.1.0-preview1.19471.7 + 3.1.0-preview1.19471.7 + 3.1.0-preview1.19471.7 + 3.1.0-preview1.19471.7 + 3.1.0-preview1.19471.7 From 93fea43d47dd56cfa3a9cc834273e6b40a77f00b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Sep 2019 01:15:23 +0000 Subject: [PATCH 062/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190922.1 - dotnet-user-secrets - 3.1.0-preview1.19472.1 - dotnet-watch - 3.1.0-preview1.19472.1 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19472.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19472.1 - dotnet-dev-certs - 3.1.0-preview1.19472.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19472.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 c775fcb3f..6048e7621 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - 2980e8a283e53caa211b29783201f8c4d489e5d3 + dfc7dcd8d812ae0b68d41786065858389bb9b9fe - + https://github.com/aspnet/AspNetCore - 2980e8a283e53caa211b29783201f8c4d489e5d3 + dfc7dcd8d812ae0b68d41786065858389bb9b9fe - + https://github.com/aspnet/AspNetCore - 2980e8a283e53caa211b29783201f8c4d489e5d3 + dfc7dcd8d812ae0b68d41786065858389bb9b9fe - + https://github.com/aspnet/AspNetCore - 2980e8a283e53caa211b29783201f8c4d489e5d3 + dfc7dcd8d812ae0b68d41786065858389bb9b9fe - + https://github.com/aspnet/AspNetCore - 2980e8a283e53caa211b29783201f8c4d489e5d3 + dfc7dcd8d812ae0b68d41786065858389bb9b9fe - + https://github.com/aspnet/AspNetCore - 2980e8a283e53caa211b29783201f8c4d489e5d3 + dfc7dcd8d812ae0b68d41786065858389bb9b9fe https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index d4e462f02..14539a0f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19471.7 - 3.1.0-preview1.19471.7 - 3.1.0-preview1.19471.7 - 3.1.0-preview1.19471.7 - 3.1.0-preview1.19471.7 - 3.1.0-preview1.19471.7 + 3.1.0-preview1.19472.1 + 3.1.0-preview1.19472.1 + 3.1.0-preview1.19472.1 + 3.1.0-preview1.19472.1 + 3.1.0-preview1.19472.1 + 3.1.0-preview1.19472.1 From c16fbce6a86a94a0e0155a7f3d5d702328560905 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Sep 2019 04:35:23 +0000 Subject: [PATCH 063/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190922.3 - dotnet-user-secrets - 3.1.0-preview1.19472.3 - dotnet-watch - 3.1.0-preview1.19472.3 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19472.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19472.3 - dotnet-dev-certs - 3.1.0-preview1.19472.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19472.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 6048e7621..cbde52a2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - dfc7dcd8d812ae0b68d41786065858389bb9b9fe + bd6e863383863fb06a4a097e809bb4b79fb62253 - + https://github.com/aspnet/AspNetCore - dfc7dcd8d812ae0b68d41786065858389bb9b9fe + bd6e863383863fb06a4a097e809bb4b79fb62253 - + https://github.com/aspnet/AspNetCore - dfc7dcd8d812ae0b68d41786065858389bb9b9fe + bd6e863383863fb06a4a097e809bb4b79fb62253 - + https://github.com/aspnet/AspNetCore - dfc7dcd8d812ae0b68d41786065858389bb9b9fe + bd6e863383863fb06a4a097e809bb4b79fb62253 - + https://github.com/aspnet/AspNetCore - dfc7dcd8d812ae0b68d41786065858389bb9b9fe + bd6e863383863fb06a4a097e809bb4b79fb62253 - + https://github.com/aspnet/AspNetCore - dfc7dcd8d812ae0b68d41786065858389bb9b9fe + bd6e863383863fb06a4a097e809bb4b79fb62253 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 14539a0f7..37c9344a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19472.1 - 3.1.0-preview1.19472.1 - 3.1.0-preview1.19472.1 - 3.1.0-preview1.19472.1 - 3.1.0-preview1.19472.1 - 3.1.0-preview1.19472.1 + 3.1.0-preview1.19472.3 + 3.1.0-preview1.19472.3 + 3.1.0-preview1.19472.3 + 3.1.0-preview1.19472.3 + 3.1.0-preview1.19472.3 + 3.1.0-preview1.19472.3 From 48861bc8bd72a8df7e4606d6c6b4aef02ed10432 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Sep 2019 10:05:26 +0000 Subject: [PATCH 064/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190923.1 - dotnet-user-secrets - 3.1.0-preview1.19473.1 - dotnet-watch - 3.1.0-preview1.19473.1 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19473.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19473.1 - dotnet-dev-certs - 3.1.0-preview1.19473.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19473.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 cbde52a2b..b1222ee74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - bd6e863383863fb06a4a097e809bb4b79fb62253 + ad97f8ab85a596f3deed551964058fd2536165a6 - + https://github.com/aspnet/AspNetCore - bd6e863383863fb06a4a097e809bb4b79fb62253 + ad97f8ab85a596f3deed551964058fd2536165a6 - + https://github.com/aspnet/AspNetCore - bd6e863383863fb06a4a097e809bb4b79fb62253 + ad97f8ab85a596f3deed551964058fd2536165a6 - + https://github.com/aspnet/AspNetCore - bd6e863383863fb06a4a097e809bb4b79fb62253 + ad97f8ab85a596f3deed551964058fd2536165a6 - + https://github.com/aspnet/AspNetCore - bd6e863383863fb06a4a097e809bb4b79fb62253 + ad97f8ab85a596f3deed551964058fd2536165a6 - + https://github.com/aspnet/AspNetCore - bd6e863383863fb06a4a097e809bb4b79fb62253 + ad97f8ab85a596f3deed551964058fd2536165a6 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 37c9344a4..b4e57fced 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19472.3 - 3.1.0-preview1.19472.3 - 3.1.0-preview1.19472.3 - 3.1.0-preview1.19472.3 - 3.1.0-preview1.19472.3 - 3.1.0-preview1.19472.3 + 3.1.0-preview1.19473.1 + 3.1.0-preview1.19473.1 + 3.1.0-preview1.19473.1 + 3.1.0-preview1.19473.1 + 3.1.0-preview1.19473.1 + 3.1.0-preview1.19473.1 From 4ed5158c76da7218d2d90080ac8ec78a3b91af12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Sep 2019 20:55:24 +0000 Subject: [PATCH 065/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190923.3 - dotnet-user-secrets - 3.1.0-preview1.19473.3 - dotnet-watch - 3.1.0-preview1.19473.3 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19473.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19473.3 - dotnet-dev-certs - 3.1.0-preview1.19473.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19473.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 b1222ee74..b99fbfba9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - ad97f8ab85a596f3deed551964058fd2536165a6 + 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 - + https://github.com/aspnet/AspNetCore - ad97f8ab85a596f3deed551964058fd2536165a6 + 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 - + https://github.com/aspnet/AspNetCore - ad97f8ab85a596f3deed551964058fd2536165a6 + 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 - + https://github.com/aspnet/AspNetCore - ad97f8ab85a596f3deed551964058fd2536165a6 + 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 - + https://github.com/aspnet/AspNetCore - ad97f8ab85a596f3deed551964058fd2536165a6 + 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 - + https://github.com/aspnet/AspNetCore - ad97f8ab85a596f3deed551964058fd2536165a6 + 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index b4e57fced..e10b93c27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19473.1 - 3.1.0-preview1.19473.1 - 3.1.0-preview1.19473.1 - 3.1.0-preview1.19473.1 - 3.1.0-preview1.19473.1 - 3.1.0-preview1.19473.1 + 3.1.0-preview1.19473.3 + 3.1.0-preview1.19473.3 + 3.1.0-preview1.19473.3 + 3.1.0-preview1.19473.3 + 3.1.0-preview1.19473.3 + 3.1.0-preview1.19473.3 From 8683689d7bcf5d05adb3cedadff1f57fa22ca81d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Sep 2019 23:55:22 +0000 Subject: [PATCH 066/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190923.5 - dotnet-user-secrets - 3.1.0-preview1.19473.5 - dotnet-watch - 3.1.0-preview1.19473.5 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19473.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19473.5 - dotnet-dev-certs - 3.1.0-preview1.19473.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19473.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 b99fbfba9..771773837 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 + 26f160d1649350083fad67f45741ceb1c798b110 - + https://github.com/aspnet/AspNetCore - 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 + 26f160d1649350083fad67f45741ceb1c798b110 - + https://github.com/aspnet/AspNetCore - 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 + 26f160d1649350083fad67f45741ceb1c798b110 - + https://github.com/aspnet/AspNetCore - 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 + 26f160d1649350083fad67f45741ceb1c798b110 - + https://github.com/aspnet/AspNetCore - 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 + 26f160d1649350083fad67f45741ceb1c798b110 - + https://github.com/aspnet/AspNetCore - 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 + 26f160d1649350083fad67f45741ceb1c798b110 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index e10b93c27..00af10e1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19473.3 - 3.1.0-preview1.19473.3 - 3.1.0-preview1.19473.3 - 3.1.0-preview1.19473.3 - 3.1.0-preview1.19473.3 - 3.1.0-preview1.19473.3 + 3.1.0-preview1.19473.5 + 3.1.0-preview1.19473.5 + 3.1.0-preview1.19473.5 + 3.1.0-preview1.19473.5 + 3.1.0-preview1.19473.5 + 3.1.0-preview1.19473.5 From 76a361bbf84e62d746f1d0a5a27e7c7d4d6f1209 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 24 Sep 2019 10:36:04 -0700 Subject: [PATCH 067/170] Add CrossPlatform AppHost Packs; release/3.1.1xx (#4916) * Add CrossPlatform AppHost Packs for arm & arm64. --- src/redist/targets/GenerateLayout.targets | 47 +++++++++++++++++-- src/redist/targets/GenerateMSIs.targets | 3 ++ .../packaging/windows/clisdk/bundle.wxs | 9 ++++ .../windows/clisdk/generatebundle.ps1 | 8 +++- 4 files changed, 63 insertions(+), 4 deletions(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 766a42b6d..b1cc71780 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -32,6 +32,8 @@ $(CoreSetupRid) x64 + x64 + x86 dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) @@ -39,6 +41,9 @@ windowsdesktop-runtime-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-targeting-pack-$(NetCoreAppTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)_$(AlternateArchitecture)$(InstallerExtension) + dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)_arm$(InstallerExtension) + dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)_arm64$(InstallerExtension) windowsdesktop-targeting-pack-$(WindowsDesktopTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) netstandard$(NETStandardLibraryRefPackageVersion.Split('.')[0])$(NETStandardLibraryRefPackageVersion.Split('.')[1]) @@ -76,9 +81,10 @@ $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) - - win-x64 - win-x86 + + win-$(AlternateArchitecture) + win-arm + win-arm64 @@ -124,6 +130,20 @@ packs/%(PackageName)/%(PackageVersion) + + Microsoft.NETCore.App.Host.$(ArmAppHostRid) + $(NetCoreAppHostPackVersion) + $(TargetFramework) + packs/%(PackageName)/%(PackageVersion) + + + + Microsoft.NETCore.App.Host.$(Arm64AppHostRid) + $(NetCoreAppHostPackVersion) + $(TargetFramework) + packs/%(PackageName)/%(PackageVersion) + + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) @@ -173,6 +193,27 @@ $(CoreSetupBlobAccessTokenParam) + + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(DownloadedAlternateNetCoreAppHostPackInstallerFileName) + $(CoreSetupBlobAccessTokenParam) + + + + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(DownloadedArmNetCoreAppHostPackInstallerFileName) + $(CoreSetupBlobAccessTokenParam) + + + + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(DownloadedArm64NetCoreAppHostPackInstallerFileName) + $(CoreSetupBlobAccessTokenParam) + + $(CoreSetupRootUrl)$(WindowsDesktopTargetingPackVersion) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 82d619de0..b523ad822 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -239,6 +239,9 @@ '$(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)' ^ + '$(DownloadsFolder)$(DownloadedAlternateNetCoreAppHostPackInstallerFileName)' ^ + '$(DownloadsFolder)$(DownloadedArmNetCoreAppHostPackInstallerFileName)' ^ + '$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^ '$(Templates30MSIInstallerFile)' ^ diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index 27d2f03ba..2d3c31dd9 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -133,6 +133,15 @@ + + + + + + + + + diff --git a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 index 649fbdd5d..d4eb57dfa 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 @@ -9,8 +9,11 @@ param( [Parameter(Mandatory=$true)][string]$SharedHostMSIFile, [Parameter(Mandatory=$true)][string]$WinFormsAndWpfMSIFile, [Parameter(Mandatory=$true)][string]$NetCoreAppTargetingPackMSIFile, - [Parameter(Mandatory=$true)][string]$NetCoreAppHostPackMSIFile, [Parameter(Mandatory=$true)][string]$NetStandardTargetingPackMSIFile, + [Parameter(Mandatory=$true)][string]$NetCoreAppHostPackMSIFile, + [Parameter(Mandatory=$true)][string]$AlternateNetCoreAppHostPackMSIFile, + [Parameter(Mandatory=$true)][string]$ArmNetCoreAppHostPackMSIFile, + [Parameter(Mandatory=$true)][string]$Arm64NetCoreAppHostPackMSIFile, [Parameter(Mandatory=$true)][string]$AspNetTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$WindowsDesktopTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$TemplatesMSIFile, @@ -53,6 +56,9 @@ function RunCandleForBundle -dWinFormsAndWpfMsiSourcePath="$WinFormsAndWpfMSIFile" ` -dNetCoreAppTargetingPackMsiSourcePath="$NetCoreAppTargetingPackMSIFile" ` -dNetCoreAppHostPackMsiSourcePath="$NetCoreAppHostPackMSIFile" ` + -dAlternateNetCoreAppHostPackMsiSourcePath="$AlternateNetCoreAppHostPackMSIFile" ` + -dArmNetCoreAppHostPackMsiSourcePath="$ArmNetCoreAppHostPackMSIFile" ` + -dArm64NetCoreAppHostPackMsiSourcePath="$Arm64NetCoreAppHostPackMSIFile" ` -dNetStandardTargetingPackMsiSourcePath="$NetStandardTargetingPackMSIFile" ` -dAspNetTargetingPackMsiSourcePath="$AspNetTargetingPackMSIFile" ` -dWindowsDesktopTargetingPackMsiSourcePath="$WindowsDesktopTargetingPackMSIFile" ` From ee070dc387de1bef03ff2f1d51803ebc5765fc92 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 24 Sep 2019 12:35:59 -0700 Subject: [PATCH 068/170] Fix typos in merge conflict resolution --- eng/Versions.props | 2 +- src/redist/targets/GenerateLayout.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2ca8c8819..e6e912add 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,7 +59,7 @@ $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) 3.1.0-preview1.19470.9 - 3.1.0-preview1.19470.9/MicrosoftWindowsDesktopAppPackageVersion> + 3.1.0-preview1.19470.9 $(MicrosoftWindowsDesktopAppPackageVersion) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index af581bf2f..92b0f5a73 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -54,7 +54,7 @@ $(CoreSetupRid) $(ProductMonikerRid) linux-$(Architecture) - otnet-runtime-$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + dotnet-runtime-$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(SharedFrameworkRid) From 2ca44ceace662b0ec9746fd7356d7da606d7506f Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 24 Sep 2019 12:48:28 -0700 Subject: [PATCH 069/170] Use stable 3.0.0/2.1.0 versions where appropriate --- eng/Version.Details.xml | 3 ++- eng/Versions.props | 4 ++-- src/redist/targets/GenerateBundledVersions.targets | 10 ++++++---- src/redist/targets/GenerateLayout.targets | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5cc1eaa1a..d9cd559f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,7 +30,8 @@ https://github.com/dotnet/core-setup 72b39b0473993b932a08c8fc24a8988d45b416a5 - + + https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 diff --git a/eng/Versions.props b/eng/Versions.props index e6e912add..de992e493 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -73,12 +73,12 @@ $(AspNetCoreVersion) 4.8.0-rc2.19462.10 - 3.0.0-rc2.19459.11 + 3.0.0 1.6.3 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.19354.2 - 3.0.0-rc2.19461.12 + 3.0.0 1.6.0 1.0.2-beta4 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 115e59186..e6966995c 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -30,12 +30,12 @@ <_NETStandardLibraryPackageVersion>@(_NETStandardLibraryPackageVersions->Distinct()) <_NETCorePlatformsPackageVersion>@(_NETCorePlatformsPackageVersions->Distinct()) - <_NETCoreApp30PackageVersion>3.0.0-rc1-19456-20 + <_NETCoreApp30PackageVersion>3.0.0 <_NETCoreApp30TargetingPackVersion>$(_NETCoreApp30PackageVersion) <_MicrosoftWindowsDesktop30PackageVersion>$(_NETCoreApp30PackageVersion) <_MicrosoftWindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion) - <_MicrosoftAspNetCoreApp30PackageVersion>3.0.0-rc2.19461.12 + <_MicrosoftAspNetCoreApp30PackageVersion>3.0.0 <_AspNet30TargetingPackVersion>$(_MicrosoftAspNetCoreApp30PackageVersion) @@ -77,7 +77,7 @@ - + + @@ -319,7 +321,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackName="Microsoft.AspNetCore.App.Ref" TargetingPackVersion="$(_AspNet30TargetingPackVersion)" RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" - RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')" + RuntimePackRuntimeIdentifiers="@(AspNetCore30RuntimePackRids, '%3B')" /> - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + + $(CoreSetupRootUrl)3.0.0 $(DownloadedNetStandardTargetingPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) From 5158bd0d7f89a872acfd9ee6e3b080c19f767fe1 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 24 Sep 2019 13:03:32 -0700 Subject: [PATCH 070/170] Fix errors in README.md merege --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 83af31f6c..e2ef7b5a5 100644 --- a/README.md +++ b/README.md @@ -51,10 +51,10 @@ With development builds, internal NuGet feeds are necessary for some scenarios ( ``` -| Platform | Master
(5.0.x Runtime) | Release/3.1.1XX
(3.1.x Runtime) | Release/2.2.3XX
(2.2.x Runtime) | Release/2.2.2XX
(2.2.x Runtime) | Release/2.2.1XX
(2.2.x Runtime) | Release/2.1.7XX
(2.1.7 Runtime) | Release/2.1.6XX
(2.1.6 Runtime) | Release/2.1.5XX
(2.1.5 Runtime) | -|---------|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:| +| Platform | Master
(5.0.x Runtime) | Release/3.1.1XX
(3.1.x Runtime) | Release/3.0.1xx
(3.0.x Runtime) | Release/2.2.3XX
(2.2.x Runtime) | Release/2.2.2XX
(2.2.x Runtime) | Release/2.2.1XX
(2.2.x Runtime) | Release/2.1.7XX
(2.1.7 Runtime) | Release/2.1.6XX
(2.1.6 Runtime) | Release/2.1.5XX
(2.1.5 Runtime) | +|:---------|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:| | **Windows x64** | [![][win-x64-badge-master]][win-x64-version-master]
[Installer][win-x64-installer-master] - [Checksum][win-x64-installer-checksum-master]
[zip][win-x64-zip-master] - [Checksum][win-x64-zip-checksum-master] | [![][win-x64-badge-3.1.1xx]][win-x64-version-3.1.1xx]
[Installer][win-x64-installer-3.1.1xx] - [Checksum][win-x64-installer-checksum-3.1.1xx]
[zip][win-x64-zip-3.1.1xx] - [Checksum][win-x64-zip-checksum-3.1.1xx] | [![][win-x64-badge-3.0.1xx]][win-x64-version-3.0.1xx]
[Installer][win-x64-installer-3.0.1xx] - [Checksum][win-x64-installer-checksum-3.0.1xx]
[zip][win-x64-zip-3.0.1xx] - [Checksum][win-x64-zip-checksum-3.0.1xx] | [![][win-x64-badge-2.2.3XX]][win-x64-version-2.2.3XX]
[Installer][win-x64-installer-2.2.3XX] - [Checksum][win-x64-installer-checksum-2.2.3XX]
[zip][win-x64-zip-2.2.3XX] - [Checksum][win-x64-zip-checksum-2.2.3XX] |[![][win-x64-badge-2.2.2XX]][win-x64-version-2.2.2XX]
[Installer][win-x64-installer-2.2.2XX] - [Checksum][win-x64-installer-checksum-2.2.2XX]
[zip][win-x64-zip-2.2.2XX] - [Checksum][win-x64-zip-checksum-2.2.2XX] |[![][win-x64-badge-2.2.1XX]][win-x64-version-2.2.1XX]
[Installer][win-x64-installer-2.2.1XX] - [Checksum][win-x64-installer-checksum-2.2.1XX]
[zip][win-x64-zip-2.2.1XX] - [Checksum][win-x64-zip-checksum-2.2.1XX] |[![][win-x64-badge-2.1.7XX]][win-x64-version-2.1.7XX]
[Installer][win-x64-installer-2.1.7XX] - [Checksum][win-x64-installer-checksum-2.1.7XX]
[zip][win-x64-zip-2.1.7XX] - [Checksum][win-x64-zip-checksum-2.1.7XX] | [![][win-x64-badge-2.1.6XX]][win-x64-version-2.1.6XX]
[Installer][win-x64-installer-2.1.6XX] - [Checksum][win-x64-installer-checksum-2.1.6XX]
[zip][win-x64-zip-2.1.6XX] - [Checksum][win-x64-zip-checksum-2.1.6XX] | [![][win-x64-badge-2.1.5XX]][win-x64-version-2.1.5XX]
[Installer][win-x64-installer-2.1.5XX] - [Checksum][win-x64-installer-checksum-2.1.5XX]
[zip][win-x64-zip-2.1.5XX] - [Checksum][win-x64-zip-checksum-2.1.5XX] | -| **Windows x86** | [![][win-x86-badge-master]][win-x86-version-master]
[Installer][win-x86-installer-master] - [Checksum][win-x86-installer-checksum-master]
[zip][win-x86-zip-master] - [Checksum][win-x86-zip-checksum-master] | [![][win-x86-badge-3.1.1xx]][win-x86-version-3.1.1xx]
[Installer][win-x86-installer-3.1.1xx] - [Checksum][win-x86-installer-checksum-3.1.1xx]
[zip][win-x86-zip-3.1.1xx] - [Checksum][win-x86-zip-checksum-3.1.1xx] | [![][win-x86-badge-2.2.3XX]][win-x86-version-2.2.3XX]
[Installer][win-x86-installer-2.2.3XX] - [Checksum][win-x86-installer-checksum-2.2.3XX]
[zip][win-x86-zip-2.2.3XX] - [Checksum][win-x86-zip-checksum-2.2.3XX] |[![][win-x86-badge-2.2.2XX]][win-x86-version-2.2.2XX]
[Installer][win-x86-installer-2.2.2XX] - [Checksum][win-x86-installer-checksum-2.2.2XX]
[zip][win-x86-zip-2.2.2XX] - [Checksum][win-x86-zip-checksum-2.2.2XX] |[![][win-x86-badge-2.2.1XX]][win-x86-version-2.2.1XX]
[Installer][win-x86-installer-2.2.1XX] - [Checksum][win-x86-installer-checksum-2.2.1XX]
[zip][win-x86-zip-2.2.1XX] - [Checksum][win-x86-zip-checksum-2.2.1XX] |[![][win-x86-badge-2.1.7XX]][win-x86-version-2.1.7XX]
[Installer][win-x86-installer-2.1.7XX] - [Checksum][win-x86-installer-checksum-2.1.7XX]
[zip][win-x86-zip-2.1.7XX] - [Checksum][win-x86-zip-checksum-2.1.7XX] | [![][win-x86-badge-2.1.6XX]][win-x86-version-2.1.6XX]
[Installer][win-x86-installer-2.1.6XX] - [Checksum][win-x86-installer-checksum-2.1.6XX]
[zip][win-x86-zip-2.1.6XX] - [Checksum][win-x86-zip-checksum-2.1.6XX] | [![][win-x86-badge-2.1.5XX]][win-x86-version-2.1.5XX]
[Installer][win-x86-installer-2.1.5XX] - [Checksum][win-x86-installer-checksum-2.1.5XX]
[zip][win-x86-zip-2.1.5XX] - [Checksum][win-x86-zip-checksum-2.1.5XX] | +| **Windows x86** | [![][win-x86-badge-master]][win-x86-version-master]
[Installer][win-x86-installer-master] - [Checksum][win-x86-installer-checksum-master]
[zip][win-x86-zip-master] - [Checksum][win-x86-zip-checksum-master] | [![][win-x86-badge-3.1.1xx]][win-x86-version-3.1.1xx]
[Installer][win-x86-installer-3.1.1xx] - [Checksum][win-x86-installer-checksum-3.1.1xx]
[zip][win-x86-zip-3.1.1xx] - [Checksum][win-x86-zip-checksum-3.1.1xx] | [![][win-x86-badge-3.0.1xx]][win-x86-version-3.0.1xx]
[Installer][win-x86-installer-3.0.1xx] - [Checksum][win-x86-installer-checksum-3.0.1xx]
[zip][win-x86-zip-3.0.1xx] - [Checksum][win-x86-zip-checksum-3.0.1xx] | [![][win-x86-badge-2.2.3XX]][win-x86-version-2.2.3XX]
[Installer][win-x86-installer-2.2.3XX] - [Checksum][win-x86-installer-checksum-2.2.3XX]
[zip][win-x86-zip-2.2.3XX] - [Checksum][win-x86-zip-checksum-2.2.3XX] |[![][win-x86-badge-2.2.2XX]][win-x86-version-2.2.2XX]
[Installer][win-x86-installer-2.2.2XX] - [Checksum][win-x86-installer-checksum-2.2.2XX]
[zip][win-x86-zip-2.2.2XX] - [Checksum][win-x86-zip-checksum-2.2.2XX] |[![][win-x86-badge-2.2.1XX]][win-x86-version-2.2.1XX]
[Installer][win-x86-installer-2.2.1XX] - [Checksum][win-x86-installer-checksum-2.2.1XX]
[zip][win-x86-zip-2.2.1XX] - [Checksum][win-x86-zip-checksum-2.2.1XX] |[![][win-x86-badge-2.1.7XX]][win-x86-version-2.1.7XX]
[Installer][win-x86-installer-2.1.7XX] - [Checksum][win-x86-installer-checksum-2.1.7XX]
[zip][win-x86-zip-2.1.7XX] - [Checksum][win-x86-zip-checksum-2.1.7XX] | [![][win-x86-badge-2.1.6XX]][win-x86-version-2.1.6XX]
[Installer][win-x86-installer-2.1.6XX] - [Checksum][win-x86-installer-checksum-2.1.6XX]
[zip][win-x86-zip-2.1.6XX] - [Checksum][win-x86-zip-checksum-2.1.6XX] | [![][win-x86-badge-2.1.5XX]][win-x86-version-2.1.5XX]
[Installer][win-x86-installer-2.1.5XX] - [Checksum][win-x86-installer-checksum-2.1.5XX]
[zip][win-x86-zip-2.1.5XX] - [Checksum][win-x86-zip-checksum-2.1.5XX] | | **macOS** | [![][osx-badge-master]][osx-version-master]
[Installer][osx-installer-master] - [Checksum][osx-installer-checksum-master]
[tar.gz][osx-targz-master] - [Checksum][osx-targz-checksum-master] | [![][osx-badge-3.1.1xx]][osx-version-3.1.1xx]
[Installer][osx-installer-3.1.1xx] - [Checksum][osx-installer-checksum-3.1.1xx]
[tar.gz][osx-targz-3.1.1xx] - [Checksum][osx-targz-checksum-3.1.1xx] | [![][osx-badge-3.0.1xx]][osx-version-3.0.1xx]
[Installer][osx-installer-3.0.1xx] - [Checksum][osx-installer-checksum-3.0.1xx]
[tar.gz][osx-targz-3.0.1xx] - [Checksum][osx-targz-checksum-3.0.1xx] | [![][osx-badge-2.2.3XX]][osx-version-2.2.3XX]
[Installer][osx-installer-2.2.3XX] - [Checksum][osx-installer-checksum-2.2.3XX]
[tar.gz][osx-targz-2.2.3XX] - [Checksum][osx-targz-checksum-2.2.3XX] |[![][osx-badge-2.2.2XX]][osx-version-2.2.2XX]
[Installer][osx-installer-2.2.2XX] - [Checksum][osx-installer-checksum-2.2.2XX]
[tar.gz][osx-targz-2.2.2XX] - [Checksum][osx-targz-checksum-2.2.2XX] |[![][osx-badge-2.2.1XX]][osx-version-2.2.1XX]
[Installer][osx-installer-2.2.1XX] - [Checksum][osx-installer-checksum-2.2.1XX]
[tar.gz][osx-targz-2.2.1XX] - [Checksum][osx-targz-checksum-2.2.1XX] |[![][osx-badge-2.1.7XX]][osx-version-2.1.7XX]
[Installer][osx-installer-2.1.7XX] - [Checksum][osx-installer-checksum-2.1.7XX]
[tar.gz][osx-targz-2.1.7XX] - [Checksum][osx-targz-checksum-2.1.7XX] | [![][osx-badge-2.1.6XX]][osx-version-2.1.6XX]
[Installer][osx-installer-2.1.6XX] - [Checksum][osx-installer-checksum-2.1.6XX]
[tar.gz][osx-targz-2.1.6XX] - [Checksum][osx-targz-checksum-2.1.6XX] | [![][osx-badge-2.1.5XX]][osx-version-2.1.5XX]
[Installer][osx-installer-2.1.5XX] - [Checksum][osx-installer-checksum-2.1.5XX]
[tar.gz][osx-targz-2.1.5XX] - [Checksum][osx-targz-checksum-2.1.5XX] | | **Linux x64** | [![][linux-badge-master]][linux-version-master]
[DEB Installer][linux-DEB-installer-master] - [Checksum][linux-DEB-installer-checksum-master]
[RPM Installer][linux-RPM-installer-master] - [Checksum][linux-RPM-installer-checksum-master]
_see installer note below_1
[tar.gz][linux-targz-master] - [Checksum][linux-targz-checksum-master] | [![][linux-badge-3.1.1xx]][linux-version-3.1.1xx]
[DEB Installer][linux-DEB-installer-3.1.1xx] - [Checksum][linux-DEB-installer-checksum-3.1.1xx]
[RPM Installer][linux-RPM-installer-3.1.1xx] - [Checksum][linux-RPM-installer-checksum-3.1.1xx]
_see installer note below_1
[tar.gz][linux-targz-3.1.1xx] - [Checksum][linux-targz-checksum-3.1.1xx] | [![][linux-badge-3.0.1xx]][linux-version-3.0.1xx]
[DEB Installer][linux-DEB-installer-3.0.1xx] - [Checksum][linux-DEB-installer-checksum-3.0.1xx]
[RPM Installer][linux-RPM-installer-3.0.1xx] - [Checksum][linux-RPM-installer-checksum-3.0.1xx]
_see installer note below_1
[tar.gz][linux-targz-3.0.1xx] - [Checksum][linux-targz-checksum-3.0.1xx] | [![][linux-badge-2.2.3xx]][linux-version-2.2.3xx]
[DEB Installer][linux-DEB-installer-2.2.3XX] - [Checksum][linux-DEB-installer-checksum-2.2.3XX]
[RPM Installer][linux-RPM-installer-2.2.3XX] - [Checksum][linux-RPM-installer-checksum-2.2.3XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.3XX] - [Checksum][linux-targz-checksum-2.2.3XX] |[![][linux-badge-2.2.2xx]][linux-version-2.2.2xx]
[DEB Installer][linux-DEB-installer-2.2.2XX] - [Checksum][linux-DEB-installer-checksum-2.2.2XX]
[RPM Installer][linux-RPM-installer-2.2.2XX] - [Checksum][linux-RPM-installer-checksum-2.2.2XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.2XX] - [Checksum][linux-targz-checksum-2.2.2XX] |[![][linux-badge-2.2.1xx]][linux-version-2.2.1xx]
[DEB Installer][linux-DEB-installer-2.2.1XX] - [Checksum][linux-DEB-installer-checksum-2.2.1XX]
[RPM Installer][linux-RPM-installer-2.2.1XX] - [Checksum][linux-RPM-installer-checksum-2.2.1XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.1XX] - [Checksum][linux-targz-checksum-2.2.1XX] |[![][linux-badge-2.1.7XX]][linux-version-2.1.7XX]
[DEB Installer][linux-DEB-installer-2.1.7XX] - [Checksum][linux-DEB-installer-checksum-2.1.7XX]
[RPM Installer][linux-RPM-installer-2.1.7XX] - [Checksum][linux-RPM-installer-checksum-2.1.7XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.7XX] - [Checksum][linux-targz-checksum-2.1.7XX] | [![][linux-badge-2.1.6XX]][linux-version-2.1.6XX]
[DEB Installer][linux-DEB-installer-2.1.6XX] - [Checksum][linux-DEB-installer-checksum-2.1.6XX]
[RPM Installer][linux-RPM-installer-2.1.6XX] - [Checksum][linux-RPM-installer-checksum-2.1.6XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.6XX] - [Checksum][linux-targz-checksum-2.1.6XX] | [![][linux-badge-2.1.5XX]][linux-version-2.1.5XX]
[DEB Installer][linux-DEB-installer-2.1.5XX] - [Checksum][linux-DEB-installer-checksum-2.1.5XX]
[RPM Installer][linux-RPM-installer-2.1.5XX] - [Checksum][linux-RPM-installer-checksum-2.1.5XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.5XX] - [Checksum][linux-targz-checksum-2.1.5XX] | | **Linux arm** | [![][linux-arm-badge-master]][linux-arm-version-master]
[tar.gz][linux-arm-targz-master] - [Checksum][linux-arm-targz-checksum-master] | [![][linux-arm-badge-3.1.1xx]][linux-arm-version-3.1.1xx]
[tar.gz][linux-arm-targz-3.1.1xx] - [Checksum][linux-arm-targz-checksum-3.1.1xx] | [![][linux-arm-badge-3.0.1xx]][linux-arm-version-3.0.1xx]
[tar.gz][linux-arm-targz-3.0.1xx] - [Checksum][linux-arm-targz-checksum-3.0.1xx] | [![][linux-arm-badge-2.2.3XX]][linux-arm-version-2.2.3XX]
[tar.gz][linux-arm-targz-2.2.3XX] - [Checksum][linux-arm-targz-checksum-2.2.3XX] | [![][linux-arm-badge-2.2.2XX]][linux-arm-version-2.2.2XX]
[tar.gz][linux-arm-targz-2.2.2XX] - [Checksum][linux-arm-targz-checksum-2.2.2XX] | [![][linux-arm-badge-2.2.1XX]][linux-arm-version-2.2.1XX]
[tar.gz][linux-arm-targz-2.2.1XX] - [Checksum][linux-arm-targz-checksum-2.2.1XX] | [![][linux-arm-badge-2.1.7XX]][linux-arm-version-2.1.7XX]
[tar.gz][linux-arm-targz-2.1.7XX] - [Checksum][linux-arm-targz-checksum-2.1.7XX] | [![][linux-arm-badge-2.1.6XX]][linux-arm-version-2.1.6XX]
[tar.gz][linux-arm-targz-2.1.6XX] - [Checksum][linux-arm-targz-checksum-2.1.6XX] | [![][linux-arm-badge-2.1.5XX]][linux-arm-version-2.1.5XX]
[tar.gz][linux-arm-targz-2.1.5XX] - [Checksum][linux-arm-targz-checksum-2.1.5XX] | From 0cc95ac36cbaa1d7cf5b18a5d0fa4879e2d14bca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2019 13:59:39 -0700 Subject: [PATCH 071/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#4797) * Update dependencies from https://github.com/dotnet/toolset build 20190924.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19474.3 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19463.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19474.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Override PATH to let razor find stage2 dotnet --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- test/EndToEnd/ProjectBuildTests.cs | 8 +++++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37ef3fe87..cd395021b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - a8d3527fb2816d377ffabda05fb43b34bb1635db + ab601116c06e74e7183920e69bc5251fe2b18d10 - + https://github.com/dotnet/sdk - b88161ed99ded0dd598779ad1afe044818422a6f + a19b734139ab62de631c31897b0ffc35f8462f3f - + https://github.com/dotnet/cli - 25e58e48c0f49360bb5a9c804ca3b2ebeae01246 + 4a9e195d7123e1c3d774cf8e6881d3ff93f47c44 diff --git a/eng/Versions.props b/eng/Versions.props index 89cfeca07..2fc6ae042 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19462.27 + 3.1.100-preview1.19474.3 @@ -33,14 +33,14 @@ - 3.1.100-preview1.19462.8 + 3.1.100-preview1.19474.2 0.2.0 - 3.0.100-rc2.19455.7 + 3.1.100-preview1.19463.2 $(MicrosoftNETSdkPackageVersion) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 5770d6f3a..be7f7132d 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -143,10 +143,12 @@ namespace EndToEnd.Tests .Execute(restoreArgs) .Should().Pass(); + var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); new BuildCommand() - .WithWorkingDirectory(projectDirectory) - .Execute() - .Should().Pass(); + .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet + .WithWorkingDirectory(projectDirectory) + .Execute() + .Should().Pass(); } } } From 067a78fb703621c8aa1e42c7c774895a1dfe1b10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2019 21:18:14 +0000 Subject: [PATCH 072/170] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#4925) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190924.2 - dotnet-user-secrets - 3.1.0-preview1.19474.2 - dotnet-watch - 3.1.0-preview1.19474.2 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19474.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19474.2 - dotnet-dev-certs - 3.1.0-preview1.19474.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19474.2 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190924.4 - dotnet-user-secrets - 3.1.0-preview1.19474.4 - dotnet-watch - 3.1.0-preview1.19474.4 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19474.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19474.4 - dotnet-dev-certs - 3.1.0-preview1.19474.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19474.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 cd395021b..f1dd11981 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 72b39b0473993b932a08c8fc24a8988d45b416a5 - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 2fc6ae042..d2f070f5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19473.5 - 3.1.0-preview1.19473.5 - 3.1.0-preview1.19473.5 - 3.1.0-preview1.19473.5 - 3.1.0-preview1.19473.5 - 3.1.0-preview1.19473.5 + 3.1.0-preview1.19474.4 + 3.1.0-preview1.19474.4 + 3.1.0-preview1.19474.4 + 3.1.0-preview1.19474.4 + 3.1.0-preview1.19474.4 + 3.1.0-preview1.19474.4 From de5d189275a1695c5d4a8a53727315a76a13f6da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2019 23:30:36 +0000 Subject: [PATCH 073/170] Update dependencies from https://github.com/dotnet/toolset build 20190924.5 (#4929) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19474.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19469.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1dd11981..a2fe28519 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,13 +42,13 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - ab601116c06e74e7183920e69bc5251fe2b18d10 + 1cb9d48ea26f274afc89c185b640386fe4dc1d38 - + https://github.com/dotnet/sdk - a19b734139ab62de631c31897b0ffc35f8462f3f + 902380600200731914d936fca50b60e3e06dcb16 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index d2f070f5b..a55d6bfc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19474.3 + 3.1.100-preview1.19474.5 @@ -40,7 +40,7 @@ - 3.1.100-preview1.19463.2 + 3.1.100-preview1.19469.1 $(MicrosoftNETSdkPackageVersion) From 91519346e4bdcbde9c779f4a0881627706262442 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2019 00:05:42 +0000 Subject: [PATCH 074/170] Update dependencies from https://github.com/dotnet/toolset build 20190924.6 (#4930) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19474.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 a2fe28519..89d76c890 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 1cb9d48ea26f274afc89c185b640386fe4dc1d38 + 256b3e07a94d90a0585b1f8da8d3b99526272637 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a55d6bfc2..c3f960438 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19474.5 + 3.1.100-preview1.19474.6 From 156f17d8825fe7585392d8f0df7a1eadbd80ea2d Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 25 Sep 2019 11:28:12 -0700 Subject: [PATCH 075/170] Add 3.1 Templates MSIs (#4931) * Adding 3.1 Templates MSI --- eng/Versions.props | 6 +++--- src/redist/targets/Branding.targets | 1 + src/redist/targets/BundledTemplates.targets | 4 ++-- src/redist/targets/GenerateMSIs.targets | 23 +++++++++++++++++++-- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index c3f960438..a92042274 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,9 +64,9 @@ $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) 1.6.3 - 2.0.0-preview8.19373.1 + 3.1.0-preview1.19475.1 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) - 1.0.2-beta4.19354.2 + 1.0.2-beta4.19465.1 $(AspNetCoreVersion) 4.8.0-rc2.19462.10 @@ -75,7 +75,7 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.19354.2 - 3.0.0-rc2.19461.12 + 3.0.0 1.6.0 1.0.2-beta4 diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets index 4a6c57f77..a9acebcfd 100644 --- a/src/redist/targets/Branding.targets +++ b/src/redist/targets/Branding.targets @@ -13,6 +13,7 @@ Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreAppPackageVersion) Microsoft.NETCore.App $(SharedFrameworkName) + Microsoft .NET Core 3.1 Templates $(CliBrandingVersion) Microsoft .NET Core 3.0 Templates $(CliBrandingVersion) Microsoft .NET Core 2.2 Templates $(CliBrandingVersion) Microsoft .NET Core 2.1 Templates $(CliBrandingVersion) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 495d1d453..5c5c545ca 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -46,8 +46,8 @@ - - + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index b523ad822..e7ba57667 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -39,6 +39,7 @@ $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension) Dotnet_CLI + $(ArtifactsShippingPackagesDir)dotnet-31templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-30templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-22templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-21templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) @@ -59,7 +60,7 @@ DependsOnTargets="GenerateLayout;SetupWixProperties;GetCoreSdkGitCommitInfo"> - + + + + + @@ -192,6 +198,14 @@ + + $(Templates31LayoutPath.TrimEnd('\')) + $(Templates31MSIInstallerFile) + $(BundledTemplates31BrandName) + $(BundledTemplates31MsiVersion) + $(Templates31InstallerUpgradeCode) + NetCore_Templates_3.1 + $(Templates30LayoutPath.TrimEnd('\')) $(Templates30MSIInstallerFile) @@ -244,7 +258,7 @@ '$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^ - '$(Templates30MSIInstallerFile)' ^ + '$(Templates31MSIInstallerFile)' ^ '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^ '$(WixRoot)' ^ '$(SdkBrandName)' ^ @@ -321,6 +335,11 @@ + + $(Templates31MSIInstallerFile) + $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates31MajorMinorVersion).$(FullNugetVersion).nupkg + $(BundledTemplates31MajorMinorVersion) + $(Templates30MSIInstallerFile) $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates30MajorMinorVersion).$(FullNugetVersion).nupkg From 59212cdc431c7c644446dc3c88d3a304cf58cfb4 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 26 Sep 2019 14:15:25 -0700 Subject: [PATCH 076/170] Remove opensuse (#4960) --- .vsts-ci.yml | 7 ------- eng/dockerrun.sh | 6 ------ netci.groovy | 3 +-- src/redist/targets/GetRuntimeInformation.targets | 6 ++---- src/redist/targets/SetBuildDefaults.targets | 2 -- 5 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 31dff1c60..c80b375e9 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -120,13 +120,6 @@ jobs: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _DropSuffix: '' - Build_OpenSUSE_42_3_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker opensuse.42.3' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' Build_CentOS_7_1_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker centos' diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh index 15ecbffe3..1d5cb4618 100755 --- a/eng/dockerrun.sh +++ b/eng/dockerrun.sh @@ -79,12 +79,6 @@ if [ -z "$DOCKERFILE" ]; then echo "using 'fedora.23' image" export DOCKERFILE=eng/docker/fedora.23 fi - elif [ "$(cat /etc/*-release | grep -cim1 opensuse)" -eq 1 ]; then - echo "Detected current OS as openSUSE, determining openSUSE version to use..." - if [ "$(cat /etc/*-release | grep -cim1 13.2)" -eq 1 ]; then - echo "using 'openSUSE.13.2' image" - export DOCKERFILE=eng/docker/opensuse.13.2 - fi else echo "Unknown Linux Distro. Using 'ubuntu' image" export DOCKERFILE=eng/docker/ubuntu diff --git a/netci.groovy b/netci.groovy index 31d73f078..e964e99bb 100644 --- a/netci.groovy +++ b/netci.groovy @@ -21,7 +21,6 @@ def platformList = [ 'Linux:x64:Release', 'Linux_NoSuffix:arm:Release', 'Linux_NoSuffix:x64:Release', - 'opensuse.42.3:x64:Debug', 'OSX10.12:x64:Release', 'RHEL6:x64:Debug', 'RHEL7.2:x64:Release', @@ -95,7 +94,7 @@ ${buildCommand} osUsedForMachineAffinity = 'Ubuntu16.04'; buildCommand = "${baseShellBuildCommand} --runtime-id rhel.6-x64 --docker rhel.6" } - else if (os == 'ubuntu.18.04' || os == 'fedora.27' || os == 'opensuse.42.3') { + else if (os == 'ubuntu.18.04' || os == 'fedora.27') { osUsedForMachineAffinity = 'Ubuntu16.04' osVersionUsedForMachineAffinity = 'latest-docker' buildCommand = "${baseShellBuildCommand} --docker ${os} --linux-portable" diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index ff9ee1781..9248c46c8 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -28,15 +28,13 @@ $(Rid) + '$(Rid)' == 'linux-musl-x64' ">$(Rid) $(OSName)-$(Architecture) $(HostRid) + '$(HostRid)' == 'linux-musl-x64' ">$(HostRid) $(HostOSName)-$(Architecture) $(HostMonikerRid) $(Architecture) diff --git a/src/redist/targets/SetBuildDefaults.targets b/src/redist/targets/SetBuildDefaults.targets index 8d035b09f..b31e5350d 100644 --- a/src/redist/targets/SetBuildDefaults.targets +++ b/src/redist/targets/SetBuildDefaults.targets @@ -10,7 +10,6 @@ OR $(Rid.StartsWith('freebsd')) OR $(Rid.StartsWith('linux-musl')) OR $(Rid.StartsWith('fedora.27')) - OR $(Rid.StartsWith('opensuse.42.3')) OR $(Rid.StartsWith('ubuntu.18.04')))">true false @@ -20,7 +19,6 @@ AND '$(Rid)' != 'rhel.6-x64' AND '$(Rid)' != 'linux-musl-x64' AND '$(Rid)' != 'fedora.27-x64' - AND '$(Rid)' != 'opensuse.42.3-x64' AND '$(Rid)' != 'ubuntu.18.04-x64'">true--> true From f5b03134526b9bd7b1c7536e49507f748ddeada8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2019 21:46:06 +0000 Subject: [PATCH 077/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20190925.24 (#4942) - dotnet-user-secrets - 3.1.0-preview1.19475.24 - dotnet-watch - 3.1.0-preview1.19475.24 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19475.24 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19475.24 - dotnet-dev-certs - 3.1.0-preview1.19475.24 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19475.24 --- 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 89d76c890..424c47a58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 72b39b0473993b932a08c8fc24a8988d45b416a5 - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index a92042274..aaa077b37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19474.4 - 3.1.0-preview1.19474.4 - 3.1.0-preview1.19474.4 - 3.1.0-preview1.19474.4 - 3.1.0-preview1.19474.4 - 3.1.0-preview1.19474.4 + 3.1.0-preview1.19475.24 + 3.1.0-preview1.19475.24 + 3.1.0-preview1.19475.24 + 3.1.0-preview1.19475.24 + 3.1.0-preview1.19475.24 + 3.1.0-preview1.19475.24 From 67e623e6d24e8d9068836936ab40c876ee0a2e76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2019 21:51:12 +0000 Subject: [PATCH 078/170] Update dependencies from https://github.com/dotnet/core-setup build 20190925.6 (#4943) - Microsoft.NETCore.App - 3.1.0-preview1.19475.6 - NETStandard.Library.Ref - 2.1.0-preview1.19475.6 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19475.6 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19474.4 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19475.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 424c47a58..0f49bbee6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 72b39b0473993b932a08c8fc24a8988d45b416a5 + 5fa4772596a1c18d62a179f39704160c7f6dc223 - + https://github.com/dotnet/core-setup - 72b39b0473993b932a08c8fc24a8988d45b416a5 + 5fa4772596a1c18d62a179f39704160c7f6dc223 - + https://github.com/dotnet/core-setup - 72b39b0473993b932a08c8fc24a8988d45b416a5 + 5fa4772596a1c18d62a179f39704160c7f6dc223 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 4a9e195d7123e1c3d774cf8e6881d3ff93f47c44 - + https://github.com/dotnet/winforms - 93ae5ab5d366dc65495de6abb938f6d647eaf291 + 066b5db8f092c09d8e2d46c27d355e29d1d28d69 - + https://github.com/dotnet/wpf - acd0da083a426b222a54201c9f37860da50a906a + 4d424cad44e237f1607c2a61485aa6ee2df5ce43 diff --git a/eng/Versions.props b/eng/Versions.props index aaa077b37..daede0299 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19462.8 + 4.8.1-preview1.19474.4 - 3.1.0-preview1.19462.15 + 3.1.0-preview1.19475.5 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19470.9 + 3.1.0-preview1.19475.6 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19470.9 + 2.1.0-preview1.19475.6 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19470.9 + 3.1.0-preview1.19475.6 $(MicrosoftWindowsDesktopAppPackageVersion) From 6d6273bc944b57a252dbb0ea75be3533cac10559 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 26 Sep 2019 15:30:56 -0700 Subject: [PATCH 079/170] Sign the 3.1 Templates MSI (#4956) --- src/redist/targets/Signing.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets index 38b397e21..c6f771010 100644 --- a/src/redist/targets/Signing.targets +++ b/src/redist/targets/Signing.targets @@ -175,6 +175,7 @@ DependsOnTargets="SetSignProps"> + From 82996658ea12a40de2c36fbbc3bf46c95fe44830 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2019 08:01:09 +0000 Subject: [PATCH 080/170] Update dependencies from https://github.com/dotnet/core-setup build 20190926.43 (#4968) - Microsoft.NETCore.App - 3.1.0-preview1.19476.43 - NETStandard.Library.Ref - 2.1.0-preview1.19476.43 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19476.43 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19476.2 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19476.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 0f49bbee6..f4c684a76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 5fa4772596a1c18d62a179f39704160c7f6dc223 + 008e3cc5cd407d769e71a56a657ec0271bb0ffc5 - + https://github.com/dotnet/core-setup - 5fa4772596a1c18d62a179f39704160c7f6dc223 + 008e3cc5cd407d769e71a56a657ec0271bb0ffc5 - + https://github.com/dotnet/core-setup - 5fa4772596a1c18d62a179f39704160c7f6dc223 + 008e3cc5cd407d769e71a56a657ec0271bb0ffc5 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 4a9e195d7123e1c3d774cf8e6881d3ff93f47c44 - + https://github.com/dotnet/winforms - 066b5db8f092c09d8e2d46c27d355e29d1d28d69 + 3e3e5cde020a9084e8eab4c4f1a278b9d7e63566 - + https://github.com/dotnet/wpf - 4d424cad44e237f1607c2a61485aa6ee2df5ce43 + a0912c73f4a4069f28aa0483ad7b0ed30d745018 diff --git a/eng/Versions.props b/eng/Versions.props index daede0299..9a3494767 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19474.4 + 4.8.1-preview1.19476.2 - 3.1.0-preview1.19475.5 + 3.1.0-preview1.19476.4 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19475.6 + 3.1.0-preview1.19476.43 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19475.6 + 2.1.0-preview1.19476.43 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19475.6 + 3.1.0-preview1.19476.43 $(MicrosoftWindowsDesktopAppPackageVersion) From 0352f6caeb51d54880eff73ccbb060f64b9d2d9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2019 20:07:48 +0000 Subject: [PATCH 081/170] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#4975) * Update dependencies from https://github.com/dotnet/core-setup build 20190927.2 - Microsoft.NETCore.App - 3.1.0-preview1.19477.2 - NETStandard.Library.Ref - 2.1.0-preview1.19477.2 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19477.2 * Update dependencies from https://github.com/dotnet/core-setup build 20190927.8 - Microsoft.NETCore.App - 3.1.0-preview1.19477.8 - NETStandard.Library.Ref - 2.1.0-preview1.19477.8 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19477.8 --- 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 f4c684a76..60d03eb10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 008e3cc5cd407d769e71a56a657ec0271bb0ffc5 + 8447759ffbfe2c8700d78cf53edc828380a460ef - + https://github.com/dotnet/core-setup - 008e3cc5cd407d769e71a56a657ec0271bb0ffc5 + 8447759ffbfe2c8700d78cf53edc828380a460ef - + https://github.com/dotnet/core-setup - 008e3cc5cd407d769e71a56a657ec0271bb0ffc5 + 8447759ffbfe2c8700d78cf53edc828380a460ef https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 9a3494767..437d27f1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19476.43 + 3.1.0-preview1.19477.8 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19476.43 + 2.1.0-preview1.19477.8 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19476.43 + 3.1.0-preview1.19477.8 $(MicrosoftWindowsDesktopAppPackageVersion) From 9d3f5570ffdd352f20ccd56a1e916618381d5cb5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2019 04:24:40 +0000 Subject: [PATCH 082/170] Update dependencies from https://github.com/dotnet/core-setup build 20190927.22 (#4989) - Microsoft.NETCore.App - 3.1.0-preview1.19477.22 - NETStandard.Library.Ref - 2.1.0-preview1.19477.22 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19477.22 --- 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 60d03eb10..99ba16030 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 8447759ffbfe2c8700d78cf53edc828380a460ef + e5ea848cf4173815a04921132e163e9e8ee17587 - + https://github.com/dotnet/core-setup - 8447759ffbfe2c8700d78cf53edc828380a460ef + e5ea848cf4173815a04921132e163e9e8ee17587 - + https://github.com/dotnet/core-setup - 8447759ffbfe2c8700d78cf53edc828380a460ef + e5ea848cf4173815a04921132e163e9e8ee17587 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 437d27f1e..6391286a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19477.8 + 3.1.0-preview1.19477.22 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19477.8 + 2.1.0-preview1.19477.22 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19477.8 + 3.1.0-preview1.19477.22 $(MicrosoftWindowsDesktopAppPackageVersion) From fb5c5d992cb94ecc0e34a55f99678e63ae630a60 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 30 Sep 2019 09:14:24 -0700 Subject: [PATCH 083/170] Add dotnet3.1 feeds --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index 175941859..c5efe56ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,8 @@ + + From 8e3b73b83b537e3fc764ca6ca104cd215ba69c7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2019 18:21:18 +0000 Subject: [PATCH 084/170] Update dependencies from https://github.com/dotnet/toolset build 20190930.2 (#5015) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19480.2 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0-preview1.19476.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.1.100-preview1.19477.6 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19479.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99ba16030..982a554f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,21 +38,21 @@ https://github.com/aspnet/AspNetCore 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/dotnet/templating - e8d6da33000a416b2b36b4f04b1756dcc99f671d + fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 256b3e07a94d90a0585b1f8da8d3b99526272637 + caaf8a50f875e9857d3c56a6e8a020c60f6830d5 - + https://github.com/dotnet/sdk - 902380600200731914d936fca50b60e3e06dcb16 + 8cfc10488c50eea7b0562f5de36dcdc64bf2fb37 - + https://github.com/dotnet/cli - 4a9e195d7123e1c3d774cf8e6881d3ff93f47c44 + 448a99fcc1eac067880ba4263bd6a3945d0f76de diff --git a/eng/Versions.props b/eng/Versions.props index 6391286a9..bd6c5c4f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19474.6 + 3.1.100-preview1.19480.2 @@ -33,14 +33,14 @@ - 3.1.100-preview1.19474.2 + 3.1.100-preview1.19479.3 0.2.0 - 3.1.100-preview1.19469.1 + 3.1.100-preview1.19477.6 $(MicrosoftNETSdkPackageVersion) From b06c620cf2a38afd2db1c99d60c8e557d4a690dc Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Mon, 30 Sep 2019 12:28:38 -0700 Subject: [PATCH 085/170] Fix merge errors --- eng/Version.Details.xml | 2 ++ eng/Versions.props | 2 +- src/redist/targets/BundledTemplates.targets | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff9bdcc16..ed784c106 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,7 +14,9 @@ https://github.com/dotnet/core-setup e5ea848cf4173815a04921132e163e9e8ee17587 + https://github.com/dotnet/core-setup + e5ea848cf4173815a04921132e163e9e8ee17587 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 7805c8e9d..f11fedb26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,7 +45,7 @@ 3.1.0-preview1.19477.22 - 3.1.0-preview1.19477.22/MicrosoftNETCoreAppPackageVersion> + 3.1.0-preview1.19477.22 $(MicrosoftNETCoreAppPackageVersion) 3.1.0-preview1.19477.22 3.1.0-preview1.19477.22 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 84d1df417..e3184942b 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -129,7 +129,6 @@ Date: Mon, 30 Sep 2019 12:35:03 -0700 Subject: [PATCH 086/170] Update dependencies --- 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 ed784c106..c1536e0cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - d0f0bfa5b123b4c1183c889cf4017bb529675502 + 719c1be452ab63d28a2d4b7cb53d7b38e228a41a https://github.com/aspnet/AspNetCore From 3e5d82d54f3f8c47953c3ae9bb1900e155e221e5 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Mon, 30 Sep 2019 12:58:24 -0700 Subject: [PATCH 087/170] Don't use global CLI as it's incompatible with running SdkTests --- eng/configure-toolset.ps1 | 4 ++++ eng/configure-toolset.sh | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 eng/configure-toolset.ps1 create mode 100644 eng/configure-toolset.sh diff --git a/eng/configure-toolset.ps1 b/eng/configure-toolset.ps1 new file mode 100644 index 000000000..87375243e --- /dev/null +++ b/eng/configure-toolset.ps1 @@ -0,0 +1,4 @@ +# SdkTests do not currently work with globally installed CLI as they use dotnet-install.ps1 to install more runtimes + +$script:useInstalledDotNetCli = $false + diff --git a/eng/configure-toolset.sh b/eng/configure-toolset.sh new file mode 100644 index 000000000..d890b1b02 --- /dev/null +++ b/eng/configure-toolset.sh @@ -0,0 +1,3 @@ +# SdkTests do not currently work with globally installed CLI as they use dotnet-install.ps1 to install more runtimes + +useInstalledDotNetCli="false" \ No newline at end of file From 0ef7c20be68536c8a92aa62c62b09e183f8558c9 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Mon, 30 Sep 2019 13:11:18 -0700 Subject: [PATCH 088/170] Fix missing download for Microsoft.DotNet.Web.ItemTemplates 3.0 --- src/redist/targets/BundledTemplates.targets | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index e3184942b..5a122dd61 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -126,11 +126,17 @@ [$(MicrosoftDotNetCommonItemTemplates30PackageVersion)]; " /> - + + - - - - From df5aef5b6106949da2d7c29087a46dd86caaa55e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2019 00:20:44 +0000 Subject: [PATCH 090/170] Update dependencies from https://github.com/dotnet/core-setup build 20190930.12 (#5025) - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19480.12 - Microsoft.NETCore.App - 3.1.0-preview1.19480.12 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19480.12 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19480.12 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19480.12 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19480.12 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19480.12 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19480.7 (parent: Microsoft.NetCore.App) --- NuGet.config | 3 +++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index c5efe56ae..84e92e811 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c1536e0cf..b15e8fb6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - e5ea848cf4173815a04921132e163e9e8ee17587 + c032701d3d607d0c54a215b431a225120d3a7c06 - + https://github.com/dotnet/core-setup - e5ea848cf4173815a04921132e163e9e8ee17587 + c032701d3d607d0c54a215b431a225120d3a7c06 - + https://github.com/dotnet/core-setup - e5ea848cf4173815a04921132e163e9e8ee17587 + c032701d3d607d0c54a215b431a225120d3a7c06 - + https://github.com/dotnet/core-setup - e5ea848cf4173815a04921132e163e9e8ee17587 + c032701d3d607d0c54a215b431a225120d3a7c06 - + https://github.com/dotnet/core-setup - e5ea848cf4173815a04921132e163e9e8ee17587 + c032701d3d607d0c54a215b431a225120d3a7c06 - + https://github.com/dotnet/core-setup - e5ea848cf4173815a04921132e163e9e8ee17587 + c032701d3d607d0c54a215b431a225120d3a7c06 - + https://github.com/dotnet/core-setup - e5ea848cf4173815a04921132e163e9e8ee17587 + c032701d3d607d0c54a215b431a225120d3a7c06 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 719c1be452ab63d28a2d4b7cb53d7b38e228a41a + 44de005400b7681b2f2f3e3f40e97f15da05d39f https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index f11fedb26..2bf72917b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,22 +44,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19477.22 - 3.1.0-preview1.19477.22 + 3.1.0-preview1.19480.12 + 3.1.0-preview1.19480.12 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19477.22 - 3.1.0-preview1.19477.22 + 3.1.0-preview1.19480.12 + 3.1.0-preview1.19480.12 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19477.22 + 3.1.0-preview1.19480.12 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19477.22 - 3.1.0-preview1.19477.22 + 3.1.0-preview1.19480.12 + 3.1.0-preview1.19480.12 $(MicrosoftWindowsDesktopAppPackageVersion) From af31cf657dcb2d33c07113dc476ec8beefcd122c Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Mon, 30 Sep 2019 21:04:19 -0700 Subject: [PATCH 091/170] React to 3.0 dev channel removal (#5022) --- .vsts-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index ed0b46fd8..2c754dfa2 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -301,7 +301,6 @@ stages: # This will run only after all the publishing stages have run. # These stages are introduced in the eng/common/templates/post-build/channels YAML templates - NetCore_Dev31_Publish - - NetCore_Dev30_Publish - NetCore_Dev5_Publish - NetCore_Release30_Publish - NetCore_Release31_Publish From 3ca3abc0dd3c0636a7ee4c533e66367a4a1cfb2e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2019 05:32:34 +0000 Subject: [PATCH 092/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5026) * Update dependencies from https://github.com/dotnet/toolset build 20190930.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19480.5 * Update dependencies from https://github.com/dotnet/toolset build 20190930.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19480.8 * Update dependencies from https://github.com/dotnet/toolset build 20190930.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19480.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 b15e8fb6e..8b329cd30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,9 +68,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - caaf8a50f875e9857d3c56a6e8a020c60f6830d5 + 7a1807b943aef899ce4b27a73cc96fc074f3a2ec https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2bf72917b..a026030f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19480.2 + 3.1.100-preview1.19480.9 From b40c1e69b549cec4fe9ec40cf14b1ccb85cd7a10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2019 10:08:00 +0000 Subject: [PATCH 093/170] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5030) * Update dependencies from https://github.com/dotnet/core-setup build 20190930.22 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19480.22 - Microsoft.NETCore.App - 3.1.0-preview1.19480.22 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19480.22 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19480.22 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19480.22 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19480.22 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19480.22 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19480.10 (parent: Microsoft.NetCore.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190930.25 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19480.25 - Microsoft.NETCore.App - 3.1.0-preview1.19480.25 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19480.25 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19480.25 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19480.25 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19480.25 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19480.25 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19480.10 (parent: Microsoft.NetCore.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190930.27 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19480.27 - Microsoft.NETCore.App - 3.1.0-preview1.19480.27 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19480.27 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19480.27 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19480.27 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19480.27 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19480.27 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19480.14 (parent: Microsoft.NetCore.App) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b329cd30..5eef609ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - c032701d3d607d0c54a215b431a225120d3a7c06 + dfb28413477684834589b8b23492b48c43726e10 - + https://github.com/dotnet/core-setup - c032701d3d607d0c54a215b431a225120d3a7c06 + dfb28413477684834589b8b23492b48c43726e10 - + https://github.com/dotnet/core-setup - c032701d3d607d0c54a215b431a225120d3a7c06 + dfb28413477684834589b8b23492b48c43726e10 - + https://github.com/dotnet/core-setup - c032701d3d607d0c54a215b431a225120d3a7c06 + dfb28413477684834589b8b23492b48c43726e10 - + https://github.com/dotnet/core-setup - c032701d3d607d0c54a215b431a225120d3a7c06 + dfb28413477684834589b8b23492b48c43726e10 - + https://github.com/dotnet/core-setup - c032701d3d607d0c54a215b431a225120d3a7c06 + dfb28413477684834589b8b23492b48c43726e10 - + https://github.com/dotnet/core-setup - c032701d3d607d0c54a215b431a225120d3a7c06 + dfb28413477684834589b8b23492b48c43726e10 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 44de005400b7681b2f2f3e3f40e97f15da05d39f + 66917d1fd792d43a26009b5b231d5cb94361650e https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index a026030f2..c013cc4de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,22 +44,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19480.12 - 3.1.0-preview1.19480.12 + 3.1.0-preview1.19480.27 + 3.1.0-preview1.19480.27 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19480.12 - 3.1.0-preview1.19480.12 + 3.1.0-preview1.19480.27 + 3.1.0-preview1.19480.27 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19480.12 + 3.1.0-preview1.19480.27 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19480.12 - 3.1.0-preview1.19480.12 + 3.1.0-preview1.19480.27 + 3.1.0-preview1.19480.27 $(MicrosoftWindowsDesktopAppPackageVersion) From 82b52ad4d00c7ed60075d07785b30ad52fc5f2dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2019 13:03:16 +0000 Subject: [PATCH 094/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5033) * Update dependencies from https://github.com/dotnet/toolset build 20190930.10 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19480.10 * Update dependencies from https://github.com/dotnet/toolset build 20191001.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.1 * Update dependencies from https://github.com/dotnet/toolset build 20191001.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.2 * Update dependencies from https://github.com/dotnet/toolset build 20191001.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.4 * Update dependencies from https://github.com/dotnet/toolset build 20191001.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19501.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5eef609ec..187f82203 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,13 +68,13 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 7a1807b943aef899ce4b27a73cc96fc074f3a2ec + 0520dfe19b406b0cc146b7b9bb6dec674ce50372 - + https://github.com/dotnet/sdk - 8cfc10488c50eea7b0562f5de36dcdc64bf2fb37 + fcf6cead4e21bcd242ddf0687111ca8794020851 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index c013cc4de..56f86b1b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19480.9 + 3.1.100-preview1.19501.5 @@ -40,7 +40,7 @@ - 3.1.100-preview1.19477.6 + 3.1.100-preview1.19501.1 $(MicrosoftNETSdkPackageVersion) From 941401b85efa2acb9051c2bdcac154f62c94cce0 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 1 Oct 2019 14:04:26 -0700 Subject: [PATCH 095/170] Template versioning needs to flow into core-sdk (#5042) * Updating templates version; fixing the versions flow. * Using: 'NUnit3DotNetNewTemplatePackageVersion' * Remove 'CoherentParentDependency' --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 187f82203..178287523 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,6 +64,10 @@ https://github.com/aspnet/AspNetCore 1937c804fa83ee3adddc7e648c610f880c24188e + + https://github.com/dotnet/test-templates + 6ae8a6e7dd862c9447771c108d43fb9028f22c22 + https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c diff --git a/eng/Versions.props b/eng/Versions.props index 56f86b1b4..23e689d49 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,6 +22,18 @@ 3.1.0-preview1.19476.4 + + + 3.1.0-preview1.19476.7 + + + + 1.0.2-beta4.19465.1 + + + + 1.6.3 + 3.1.0-preview1.19475.24 @@ -66,10 +78,9 @@ $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) - 1.6.3 - 3.1.0-preview1.19475.1 + $(NUnit3DotNetNewTemplatePackageVersion) + $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftDotNetCommonItemTemplates31PackageVersion) - 1.0.2-beta4.19465.1 $(AspNetCoreVersion) 4.8.0-rc2.19462.10 From f90da6f9d6d97968bc0387dd6f81e08ea273ea27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2019 21:47:31 -0700 Subject: [PATCH 096/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5049) * Update dependencies from https://github.com/dotnet/toolset build 20191001.11 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.11 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191001.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191001.13 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191001.16 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191001.15 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.15 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191001.17 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.17 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191001.19 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.19 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.11 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 178287523..5c9a573c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 0520dfe19b406b0cc146b7b9bb6dec674ce50372 + 27bf0b699bd289a2636947dd6a3ef0a6952a8a5c https://github.com/dotnet/sdk fcf6cead4e21bcd242ddf0687111ca8794020851 - + https://github.com/dotnet/cli - 448a99fcc1eac067880ba4263bd6a3945d0f76de + 8feda7443ceea1af2ba6759a975e9f1b17937204 diff --git a/eng/Versions.props b/eng/Versions.props index 23e689d49..5b9ed6cd3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19501.5 + 3.1.100-preview1.19501.19 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19479.3 + 3.1.100-preview1.19501.11 0.2.0 From 0b90d76f39f96a99383578b07609d4b82c90c9c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2019 21:47:42 -0700 Subject: [PATCH 097/170] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5047) * Update dependencies from https://github.com/dotnet/core-setup build 20191001.9 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19501.9 - Microsoft.NETCore.App - 3.1.0-preview1.19501.9 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19501.9 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19501.9 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19501.9 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19501.9 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19501.9 * Update dependencies from https://github.com/dotnet/core-setup build 20191001.13 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19501.13 - Microsoft.NETCore.App - 3.1.0-preview1.19501.13 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19501.13 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19501.13 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19501.13 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19501.13 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19501.13 * Update dependencies from https://github.com/dotnet/core-setup build 20191001.15 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19501.15 - Microsoft.NETCore.App - 3.1.0-preview1.19501.15 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19501.15 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19501.15 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19501.15 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19501.15 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19501.15 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19501.5 (parent: Microsoft.NetCore.App) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c9a573c9..9dd7fc315 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - dfb28413477684834589b8b23492b48c43726e10 + dc615e8b193c5cc25ed7122432562f8399672181 - + https://github.com/dotnet/core-setup - dfb28413477684834589b8b23492b48c43726e10 + dc615e8b193c5cc25ed7122432562f8399672181 - + https://github.com/dotnet/core-setup - dfb28413477684834589b8b23492b48c43726e10 + dc615e8b193c5cc25ed7122432562f8399672181 - + https://github.com/dotnet/core-setup - dfb28413477684834589b8b23492b48c43726e10 + dc615e8b193c5cc25ed7122432562f8399672181 - + https://github.com/dotnet/core-setup - dfb28413477684834589b8b23492b48c43726e10 + dc615e8b193c5cc25ed7122432562f8399672181 - + https://github.com/dotnet/core-setup - dfb28413477684834589b8b23492b48c43726e10 + dc615e8b193c5cc25ed7122432562f8399672181 - + https://github.com/dotnet/core-setup - dfb28413477684834589b8b23492b48c43726e10 + dc615e8b193c5cc25ed7122432562f8399672181 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 66917d1fd792d43a26009b5b231d5cb94361650e + 09e0353381e2b9da8dd90d64869de076740cc800 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 5b9ed6cd3..ef5250409 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19480.27 - 3.1.0-preview1.19480.27 + 3.1.0-preview1.19501.15 + 3.1.0-preview1.19501.15 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19480.27 - 3.1.0-preview1.19480.27 + 3.1.0-preview1.19501.15 + 3.1.0-preview1.19501.15 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19480.27 + 3.1.0-preview1.19501.15 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19480.27 - 3.1.0-preview1.19480.27 + 3.1.0-preview1.19501.15 + 3.1.0-preview1.19501.15 $(MicrosoftWindowsDesktopAppPackageVersion) From 3e9c4d7b87b8d0b076c6e4728da72c2110db54e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 08:16:25 +0000 Subject: [PATCH 098/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5055) * Update dependencies from https://github.com/dotnet/toolset build 20191001.21 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.21 * Update dependencies from https://github.com/dotnet/toolset build 20191002.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19502.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.15 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9dd7fc315..3d8a8478d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 27bf0b699bd289a2636947dd6a3ef0a6952a8a5c + bca3d53bb6033747e301a5bcd92d3eb5bf3aee48 https://github.com/dotnet/sdk fcf6cead4e21bcd242ddf0687111ca8794020851 - + https://github.com/dotnet/cli - 8feda7443ceea1af2ba6759a975e9f1b17937204 + 4751d423a94d34393f90b3fcaa8eceb6b665af44 diff --git a/eng/Versions.props b/eng/Versions.props index ef5250409..324014336 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19501.19 + 3.1.100-preview1.19502.1 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19501.11 + 3.1.100-preview1.19501.15 0.2.0 From 383b1ae5fd5c761e67a5503c540245d6bb9a2dfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 15:50:20 +0000 Subject: [PATCH 099/170] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5054) * Update dependencies from https://github.com/dotnet/core-setup build 20191001.22 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19501.22 - Microsoft.NETCore.App - 3.1.0-preview1.19501.22 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19501.22 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19501.22 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19501.22 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19501.22 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19501.22 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19501.8 (parent: Microsoft.NetCore.App) - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19477.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19501.3 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20191001.24 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19501.24 - Microsoft.NETCore.App - 3.1.0-preview1.19501.24 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19501.24 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19501.24 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19501.24 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19501.24 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19501.24 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19501.8 (parent: Microsoft.NetCore.App) - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19501.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19501.6 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d8a8478d..65547e343 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - dc615e8b193c5cc25ed7122432562f8399672181 + 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec - + https://github.com/dotnet/core-setup - dc615e8b193c5cc25ed7122432562f8399672181 + 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec - + https://github.com/dotnet/core-setup - dc615e8b193c5cc25ed7122432562f8399672181 + 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec - + https://github.com/dotnet/core-setup - dc615e8b193c5cc25ed7122432562f8399672181 + 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec - + https://github.com/dotnet/core-setup - dc615e8b193c5cc25ed7122432562f8399672181 + 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec - + https://github.com/dotnet/core-setup - dc615e8b193c5cc25ed7122432562f8399672181 + 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec - + https://github.com/dotnet/core-setup - dc615e8b193c5cc25ed7122432562f8399672181 + 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 09e0353381e2b9da8dd90d64869de076740cc800 + e61772dfb9cfc9b08d95950814ebe51f22cd2de6 https://github.com/aspnet/AspNetCore @@ -85,13 +85,13 @@ 4751d423a94d34393f90b3fcaa8eceb6b665af44 - + https://github.com/dotnet/winforms - 3e3e5cde020a9084e8eab4c4f1a278b9d7e63566 + be3d33927476deb6e299c69cc68f0c54ed1b828c - + https://github.com/dotnet/wpf - a0912c73f4a4069f28aa0483ad7b0ed30d745018 + 9a67316ef068c3f4a78a11916777b505b0bbacca diff --git a/eng/Versions.props b/eng/Versions.props index 324014336..857cfd8b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19476.2 + 4.8.1-preview1.19501.1 - 3.1.0-preview1.19476.4 + 3.1.0-preview1.19501.6 @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19501.15 - 3.1.0-preview1.19501.15 + 3.1.0-preview1.19501.24 + 3.1.0-preview1.19501.24 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19501.15 - 3.1.0-preview1.19501.15 + 3.1.0-preview1.19501.24 + 3.1.0-preview1.19501.24 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19501.15 + 3.1.0-preview1.19501.24 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19501.15 - 3.1.0-preview1.19501.15 + 3.1.0-preview1.19501.24 + 3.1.0-preview1.19501.24 $(MicrosoftWindowsDesktopAppPackageVersion) From ff183e5bdcd23d5b62d2d2a60914a5ab5cbf2796 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 15:53:49 +0000 Subject: [PATCH 100/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5060) * Update dependencies from https://github.com/dotnet/toolset build 20191002.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19502.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19502.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191002.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19502.4 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19502.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191002.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19502.6 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19502.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65547e343..d80750968 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - bca3d53bb6033747e301a5bcd92d3eb5bf3aee48 + 0eb7ab18f77c18a07ce0c6785ee930dc7abdfff2 https://github.com/dotnet/sdk fcf6cead4e21bcd242ddf0687111ca8794020851 - + https://github.com/dotnet/cli - 4751d423a94d34393f90b3fcaa8eceb6b665af44 + 40b41b92358e6bab9295f67532c403426fe4b605 diff --git a/eng/Versions.props b/eng/Versions.props index 857cfd8b6..ec030b7b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19502.1 + 3.1.100-preview1.19502.6 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19501.15 + 3.1.100-preview1.19502.2 0.2.0 From 6174295324814a0920e8e36ab84eecf327120258 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 09:23:28 -0700 Subject: [PATCH 101/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20191001.11 (#5058) - dotnet-user-secrets - 3.1.0-preview1.19501.11 - dotnet-watch - 3.1.0-preview1.19501.11 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19501.11 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19501.11 - dotnet-dev-certs - 3.1.0-preview1.19501.11 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19501.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 d80750968..b3980e840 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx e61772dfb9cfc9b08d95950814ebe51f22cd2de6 - + https://github.com/aspnet/AspNetCore - 1937c804fa83ee3adddc7e648c610f880c24188e + ff095ddf559203abd4ccf906d40b31a444344050 - + https://github.com/aspnet/AspNetCore - 1937c804fa83ee3adddc7e648c610f880c24188e + ff095ddf559203abd4ccf906d40b31a444344050 - + https://github.com/aspnet/AspNetCore - 1937c804fa83ee3adddc7e648c610f880c24188e + ff095ddf559203abd4ccf906d40b31a444344050 - + https://github.com/aspnet/AspNetCore - 1937c804fa83ee3adddc7e648c610f880c24188e + ff095ddf559203abd4ccf906d40b31a444344050 - + https://github.com/aspnet/AspNetCore - 1937c804fa83ee3adddc7e648c610f880c24188e + ff095ddf559203abd4ccf906d40b31a444344050 - + https://github.com/aspnet/AspNetCore - 1937c804fa83ee3adddc7e648c610f880c24188e + ff095ddf559203abd4ccf906d40b31a444344050 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ec030b7b2..6b6a79d1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19475.24 - 3.1.0-preview1.19475.24 - 3.1.0-preview1.19475.24 - 3.1.0-preview1.19475.24 - 3.1.0-preview1.19475.24 - 3.1.0-preview1.19475.24 + 3.1.0-preview1.19501.11 + 3.1.0-preview1.19501.11 + 3.1.0-preview1.19501.11 + 3.1.0-preview1.19501.11 + 3.1.0-preview1.19501.11 + 3.1.0-preview1.19501.11 From 421ec230d0ac3bd9bdb6367c10d41fc4055d4222 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 2 Oct 2019 12:32:23 -0700 Subject: [PATCH 102/170] Add self-contained end-to-end coverage Also, re-enable skipped test and remove unnecessary workarounds --- test/EndToEnd/ProjectBuildTests.cs | 61 ++++++++++++------------------ 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index be7f7132d..c666d2af1 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -2,16 +2,15 @@ using System.IO; using System.Linq; using System.Xml.Linq; +using Microsoft.DotNet.PlatformAbstractions; using Microsoft.DotNet.TestFramework; using Microsoft.DotNet.Tools.Test.Utilities; using Xunit; namespace EndToEnd.Tests { - public class ProjectBuildTests : TestBase { - [Fact] public void ItCanNewRestoreBuildRunCleanMSBuildProject() { @@ -35,18 +34,8 @@ namespace EndToEnd.Tests .Should().Pass(); var runCommand = new RunCommand() - .WithWorkingDirectory(projectDirectory); - - // Set DOTNET_ROOT as workaround for https://github.com/dotnet/cli/issues/10196 - var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); - if (!string.IsNullOrEmpty(dotnetRoot)) - { - bool useX86 = RepoDirectoriesProvider.DotnetRidUnderTest.EndsWith("x86", StringComparison.InvariantCultureIgnoreCase); - runCommand = runCommand.WithEnvironmentVariable(useX86 ? "DOTNET_ROOT(x86)" : "DOTNET_ROOT", - dotnetRoot); - } - - runCommand.ExecuteWithCapturedOutput() + .WithWorkingDirectory(projectDirectory) + .ExecuteWithCapturedOutput() .Should().Pass() .And.HaveStdOutContaining("Hello World!"); @@ -61,7 +50,7 @@ namespace EndToEnd.Tests binDirectory.Should().NotHaveFilesMatching("*.dll", SearchOption.AllDirectories); } - [Fact(Skip = "Need support for ASP.NET on .NET Core 3.1")] + [Fact] public void ItCanRunAnAppUsingTheWebSdk() { var directory = TestAssets.CreateTestDirectory(); @@ -88,21 +77,10 @@ namespace EndToEnd.Tests .Should().Pass(); var runCommand = new RunCommand() - .WithWorkingDirectory(projectDirectory); - - // Set DOTNET_ROOT as workaround for https://github.com/dotnet/cli/issues/10196 - var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); - if (!string.IsNullOrEmpty(dotnetRoot)) - { - bool useX86 = RepoDirectoriesProvider.DotnetRidUnderTest.EndsWith("x86", StringComparison.InvariantCultureIgnoreCase); - runCommand = runCommand.WithEnvironmentVariable(useX86 ? "DOTNET_ROOT(x86)" : "DOTNET_ROOT", - dotnetRoot); - } - - runCommand.ExecuteWithCapturedOutput() + .WithWorkingDirectory(projectDirectory) + .ExecuteWithCapturedOutput() .Should().Pass() .And.HaveStdOutContaining("Hello World!"); - } [Theory] @@ -125,7 +103,22 @@ namespace EndToEnd.Tests TestTemplateBuild(templateName); } - private void TestTemplateBuild(string templateName) + [WindowsOnlyTheory] + [InlineData("wpf")] + public void ItCanBuildDesktopTemplatesSelfContained(string templateName) + { + TestTemplateBuild(templateName); + } + + [Theory] + [InlineData("web")] + [InlineData("console")] + public void ItCanBuildTemplatesSelfContained(string templateName) + { + TestTemplateBuild(templateName, selfContained: true); + } + + private void TestTemplateBuild(string templateName, bool selfContained = false) { var directory = TestAssets.CreateTestDirectory(identifier: templateName); string projectDirectory = directory.FullName; @@ -136,18 +129,12 @@ namespace EndToEnd.Tests .Execute(newArgs) .Should().Pass(); - // Work-around for MVC template test until ASP.Net publishes Preview 5 'Microsoft.AspNetCore.Mvc.NewtonsoftJson' to NuGet.org - string restoreArgs = string.Equals(templateName, "mvc", StringComparison.OrdinalIgnoreCase) ? "/p:RestoreAdditionalProjectSources=https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" : ""; - new RestoreCommand() - .WithWorkingDirectory(projectDirectory) - .Execute(restoreArgs) - .Should().Pass(); - + var buildArgs = selfContained ? "" :$"-r {RuntimeEnvironment.GetRuntimeIdentifier()}"; var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); new BuildCommand() .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet .WithWorkingDirectory(projectDirectory) - .Execute() + .Execute(buildArgs) .Should().Pass(); } } From 7c72c6cb8db8154f9fe38d87c8605b4f3d8155f5 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 2 Oct 2019 12:42:28 -0700 Subject: [PATCH 103/170] Fix typo causing 3.1 ASP.NET runtime pack to not be found --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index e6966995c..9cec553b0 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -88,7 +88,7 @@ linux-arm; linux-arm64" /> - + From 21e1457e2dffc07fcc548f908a3218901e831082 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 22:21:06 +0000 Subject: [PATCH 104/170] Update dependencies from https://github.com/dotnet/toolset build 20191002.12 (#5074) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19502.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19502.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3980e840..95a58a0d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 0eb7ab18f77c18a07ce0c6785ee930dc7abdfff2 + 52d1e466c33a3913f4976e44e3003c71b2d5c6b8 https://github.com/dotnet/sdk fcf6cead4e21bcd242ddf0687111ca8794020851 - + https://github.com/dotnet/cli - 40b41b92358e6bab9295f67532c403426fe4b605 + ad2542a940868e6d385eb807121a229044edf074 diff --git a/eng/Versions.props b/eng/Versions.props index 6b6a79d1a..c3756e74b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19502.6 + 3.1.100-preview1.19502.12 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19502.2 + 3.1.100-preview1.19502.6 0.2.0 From 2aeb92223dddfdf29aedc2f208caad334a6747dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 02:49:50 +0000 Subject: [PATCH 105/170] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5066) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191002.1 - dotnet-user-secrets - 3.1.0-preview1.19502.1 - dotnet-watch - 3.1.0-preview1.19502.1 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19502.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19502.1 - dotnet-dev-certs - 3.1.0-preview1.19502.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19502.1 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191002.13 - dotnet-user-secrets - 3.1.0-preview1.19502.13 - dotnet-watch - 3.1.0-preview1.19502.13 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19502.13 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19502.13 - dotnet-dev-certs - 3.1.0-preview1.19502.13 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19502.13 --- 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 95a58a0d0..1eb06005a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx e61772dfb9cfc9b08d95950814ebe51f22cd2de6 - + https://github.com/aspnet/AspNetCore - ff095ddf559203abd4ccf906d40b31a444344050 + cca42d9624e6adcff85c3865f1189032a202c2ed - + https://github.com/aspnet/AspNetCore - ff095ddf559203abd4ccf906d40b31a444344050 + cca42d9624e6adcff85c3865f1189032a202c2ed - + https://github.com/aspnet/AspNetCore - ff095ddf559203abd4ccf906d40b31a444344050 + cca42d9624e6adcff85c3865f1189032a202c2ed - + https://github.com/aspnet/AspNetCore - ff095ddf559203abd4ccf906d40b31a444344050 + cca42d9624e6adcff85c3865f1189032a202c2ed - + https://github.com/aspnet/AspNetCore - ff095ddf559203abd4ccf906d40b31a444344050 + cca42d9624e6adcff85c3865f1189032a202c2ed - + https://github.com/aspnet/AspNetCore - ff095ddf559203abd4ccf906d40b31a444344050 + cca42d9624e6adcff85c3865f1189032a202c2ed https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c3756e74b..9c99ba379 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19501.11 - 3.1.0-preview1.19501.11 - 3.1.0-preview1.19501.11 - 3.1.0-preview1.19501.11 - 3.1.0-preview1.19501.11 - 3.1.0-preview1.19501.11 + 3.1.0-preview1.19502.13 + 3.1.0-preview1.19502.13 + 3.1.0-preview1.19502.13 + 3.1.0-preview1.19502.13 + 3.1.0-preview1.19502.13 + 3.1.0-preview1.19502.13 From 7b26e35c70427b0308861a906a3eefe7bd09fd99 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 04:20:38 +0000 Subject: [PATCH 106/170] Update dependencies from https://github.com/dotnet/toolset build 20191002.17 (#5083) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19502.17 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19502.10 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1eb06005a..1e8e6922a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 52d1e466c33a3913f4976e44e3003c71b2d5c6b8 + c4f759675019b19ac14df330e87c24bb5a114696 https://github.com/dotnet/sdk fcf6cead4e21bcd242ddf0687111ca8794020851 - + https://github.com/dotnet/cli - ad2542a940868e6d385eb807121a229044edf074 + e64971ec20eeee64e41ad2f69de06609ac06d954 diff --git a/eng/Versions.props b/eng/Versions.props index 9c99ba379..701f87e6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19502.12 + 3.1.100-preview1.19502.17 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19502.6 + 3.1.100-preview1.19502.10 0.2.0 From f2ef63801542982b56bb311f0e9ff2aa3f6c961f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 07:46:13 +0000 Subject: [PATCH 107/170] Update dependencies from https://github.com/dotnet/toolset build 20191002.20 (#5087) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19502.20 --- 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 1e8e6922a..7776b07b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - c4f759675019b19ac14df330e87c24bb5a114696 + 97b27dc1c39cff6315c977ea63e8104cb45ceb4c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 701f87e6c..d1cc29107 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19502.17 + 3.1.100-preview1.19502.20 From 262a91cb436a5ec452bc54856e8f19fdfe8a3a97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 08:50:44 +0000 Subject: [PATCH 108/170] Update dependencies from https://github.com/dotnet/toolset build 20191003.1 (#5088) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19503.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 7776b07b7..e1220e3e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 97b27dc1c39cff6315c977ea63e8104cb45ceb4c + dbe9eb3587186051340be9ed853670acfc5acf04 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d1cc29107..5dbbe1a7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19502.20 + 3.1.100-preview1.19503.1 From 1a7f735b3e5bc01ce0d1929d0038ac200a096737 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 3 Oct 2019 14:37:59 -0700 Subject: [PATCH 109/170] Enabling ASP.NET targeting pack and shared framework in RPM/DEB native installers. (#5090) --- src/redist/targets/GenerateDebs.targets | 14 ++++++++++---- src/redist/targets/GenerateRPMs.targets | 6 +++++- .../packaging/deb/dotnet-debian_config.json | 4 +++- .../targets/packaging/rpm/dotnet-config.json | 8 ++++++++ 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/redist/targets/GenerateDebs.targets b/src/redist/targets/GenerateDebs.targets index 71a95a41a..cedf06792 100644 --- a/src/redist/targets/GenerateDebs.targets +++ b/src/redist/targets/GenerateDebs.targets @@ -235,10 +235,12 @@ + + - + + - + + @@ -351,9 +353,11 @@ + + @@ -370,9 +374,11 @@ + + diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index 5755bd5df..dd6ac2f09 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -286,10 +286,12 @@ + - + + + + diff --git a/src/redist/targets/packaging/deb/dotnet-debian_config.json b/src/redist/targets/packaging/deb/dotnet-debian_config.json index 836d41375..35a0f433f 100644 --- a/src/redist/targets/packaging/deb/dotnet-debian_config.json +++ b/src/redist/targets/packaging/deb/dotnet-debian_config.json @@ -32,6 +32,8 @@ "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%, "%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }, "%NETCORE_APPHOST_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }, - "%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NET_STANDARD_DEBIAN_PACKAGE_VERSION%" } + "%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NET_STANDARD_DEBIAN_PACKAGE_VERSION%" }, + "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" }, + "%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" } } } diff --git a/src/redist/targets/packaging/rpm/dotnet-config.json b/src/redist/targets/packaging/rpm/dotnet-config.json index d06c428f1..fd090e2d8 100644 --- a/src/redist/targets/packaging/rpm/dotnet-config.json +++ b/src/redist/targets/packaging/rpm/dotnet-config.json @@ -37,6 +37,14 @@ { "package_name": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_NAME%", "package_version": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_VERSION%" + }, + { + "package_name": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%", + "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" + }, + { + "package_name": "%ASPNET_TARGETING_PACK_RPM_PACKAGE_NAME%", + "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" } ], "directories": [ From 56a3333f55853e050a7284a2ce6b391b0328a8d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 15:02:59 -0700 Subject: [PATCH 110/170] Update dependencies from https://github.com/dotnet/toolset build 20191003.5 (#5092) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19503.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19503.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1220e3e2..c60f8f311 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,13 +72,13 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - dbe9eb3587186051340be9ed853670acfc5acf04 + bbb399397efe290384a23c3bb680ee13bf31de87 - + https://github.com/dotnet/sdk - fcf6cead4e21bcd242ddf0687111ca8794020851 + 9fa3ace9cfd9d9517618ce73dd41b522e24f749f https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 5dbbe1a7f..fa7813d25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19503.1 + 3.1.100-preview1.19503.5 @@ -52,7 +52,7 @@ - 3.1.100-preview1.19501.1 + 3.1.100-preview1.19503.1 $(MicrosoftNETSdkPackageVersion) From 776c42b31292dfc3d1adb2a8d561a2c3a16b387d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 17:57:42 -0700 Subject: [PATCH 111/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5093) * Update dependencies from https://github.com/dotnet/toolset build 20191003.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19503.6 * Update dependencies from https://github.com/dotnet/toolset build 20191003.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19503.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19503.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c60f8f311..72ee43916 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - bbb399397efe290384a23c3bb680ee13bf31de87 + 71ef7d7a00f41e83935878f231cdedd9738d93f5 https://github.com/dotnet/sdk 9fa3ace9cfd9d9517618ce73dd41b522e24f749f - + https://github.com/dotnet/cli - e64971ec20eeee64e41ad2f69de06609ac06d954 + 22c175e2daa78616ae41438cc3aca94a349cf8cf diff --git a/eng/Versions.props b/eng/Versions.props index fa7813d25..d220c52ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19503.5 + 3.1.100-preview1.19503.8 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19502.10 + 3.1.100-preview1.19503.3 0.2.0 From 630bfccd296674e761e71fe76e7ff48206bb0f0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 05:55:38 +0000 Subject: [PATCH 112/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20191003.31 (#5098) - dotnet-user-secrets - 3.1.0-preview1.19503.31 - dotnet-watch - 3.1.0-preview1.19503.31 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19503.31 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19503.31 - dotnet-dev-certs - 3.1.0-preview1.19503.31 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19503.31 --- 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 72ee43916..6585661a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx e61772dfb9cfc9b08d95950814ebe51f22cd2de6 - + https://github.com/aspnet/AspNetCore - cca42d9624e6adcff85c3865f1189032a202c2ed + a7b739bab3b1d310eeec6aef551ce39650bdcf24 - + https://github.com/aspnet/AspNetCore - cca42d9624e6adcff85c3865f1189032a202c2ed + a7b739bab3b1d310eeec6aef551ce39650bdcf24 - + https://github.com/aspnet/AspNetCore - cca42d9624e6adcff85c3865f1189032a202c2ed + a7b739bab3b1d310eeec6aef551ce39650bdcf24 - + https://github.com/aspnet/AspNetCore - cca42d9624e6adcff85c3865f1189032a202c2ed + a7b739bab3b1d310eeec6aef551ce39650bdcf24 - + https://github.com/aspnet/AspNetCore - cca42d9624e6adcff85c3865f1189032a202c2ed + a7b739bab3b1d310eeec6aef551ce39650bdcf24 - + https://github.com/aspnet/AspNetCore - cca42d9624e6adcff85c3865f1189032a202c2ed + a7b739bab3b1d310eeec6aef551ce39650bdcf24 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index d220c52ea..5899cabe8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19502.13 - 3.1.0-preview1.19502.13 - 3.1.0-preview1.19502.13 - 3.1.0-preview1.19502.13 - 3.1.0-preview1.19502.13 - 3.1.0-preview1.19502.13 + 3.1.0-preview1.19503.31 + 3.1.0-preview1.19503.31 + 3.1.0-preview1.19503.31 + 3.1.0-preview1.19503.31 + 3.1.0-preview1.19503.31 + 3.1.0-preview1.19503.31 From 02dbcb34c5154a5088ec2a8f2d79e35348a5b364 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 10:25:40 +0000 Subject: [PATCH 113/170] Update dependencies from https://github.com/dotnet/toolset build 20191004.1 (#5103) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.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 6585661a2..fb9c5a587 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 71ef7d7a00f41e83935878f231cdedd9738d93f5 + b2b0e2ae095f1f38f854023124b753457caddea2 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5899cabe8..53a77ecb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19503.8 + 3.1.100-preview1.19504.1 From 0e58699620049b64fe824d1811bec8ed702e22a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 11:40:46 +0000 Subject: [PATCH 114/170] Update dependencies from https://github.com/dotnet/toolset build 20191004.3 (#5105) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb9c5a587..74a70a195 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - b2b0e2ae095f1f38f854023124b753457caddea2 + a5d1be3bd55b78cd1df4936a142d09587f93ce95 https://github.com/dotnet/sdk 9fa3ace9cfd9d9517618ce73dd41b522e24f749f - + https://github.com/dotnet/cli - 22c175e2daa78616ae41438cc3aca94a349cf8cf + b872b3fe70a4d596be9d646a7d8c780b27d4e5b6 diff --git a/eng/Versions.props b/eng/Versions.props index 53a77ecb4..63ecd8b61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19504.1 + 3.1.100-preview1.19504.3 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19503.3 + 3.1.100-preview1.19504.2 0.2.0 From 16e07b44ed916b928eb6272aa8e5547ca02da196 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 13:05:41 +0000 Subject: [PATCH 115/170] Update dependencies from https://github.com/dotnet/toolset build 20191004.4 (#5106) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.4 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19504.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74a70a195..476ec2b6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,13 +72,13 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - a5d1be3bd55b78cd1df4936a142d09587f93ce95 + 9d603ec25c2c08a13711f37b4c3130e532e1bd58 - + https://github.com/dotnet/sdk - 9fa3ace9cfd9d9517618ce73dd41b522e24f749f + 7def7a9c5adc9e4d52a4cf19eee2c3998e3f3b93 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 63ecd8b61..560d8961b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19504.3 + 3.1.100-preview1.19504.4 @@ -52,7 +52,7 @@ - 3.1.100-preview1.19503.1 + 3.1.100-preview1.19504.1 $(MicrosoftNETSdkPackageVersion) From d6f09906f10f1c7f229ab3b1efe65fb10f54e738 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 15:01:33 +0000 Subject: [PATCH 116/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5107) * Update dependencies from https://github.com/dotnet/toolset build 20191004.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.6 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.7 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.7 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 476ec2b6e..c72a18d24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 9d603ec25c2c08a13711f37b4c3130e532e1bd58 + e2b74c1a0fdae19a76b63f21ee8483a7849231cb https://github.com/dotnet/sdk 7def7a9c5adc9e4d52a4cf19eee2c3998e3f3b93 - + https://github.com/dotnet/cli - b872b3fe70a4d596be9d646a7d8c780b27d4e5b6 + 5a44f16c79b1d4f5bf0fb2500454347acdaa38aa diff --git a/eng/Versions.props b/eng/Versions.props index 560d8961b..d5b38508a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19504.4 + 3.1.100-preview1.19504.7 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19504.2 + 3.1.100-preview1.19504.3 0.2.0 From b791284d1eca6ad125690660bb96d73b17e581de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 16:43:43 +0000 Subject: [PATCH 117/170] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5102) * Update dependencies from https://github.com/dotnet/core-setup build 20191003.14 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19503.14 - Microsoft.NETCore.App - 3.1.0-preview1.19503.14 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19503.14 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19503.14 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19503.14 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19503.14 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19503.14 * Update dependencies from https://github.com/dotnet/core-setup build 20191004.2 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19504.2 - Microsoft.NETCore.App - 3.1.0-preview1.19504.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19504.2 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19504.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19504.2 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19504.2 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19504.2 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19504.1 (parent: Microsoft.NetCore.App) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c72a18d24..fc6cbfaaf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec + 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 - + https://github.com/dotnet/core-setup - 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec + 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 - + https://github.com/dotnet/core-setup - 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec + 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 - + https://github.com/dotnet/core-setup - 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec + 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 - + https://github.com/dotnet/core-setup - 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec + 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 - + https://github.com/dotnet/core-setup - 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec + 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 - + https://github.com/dotnet/core-setup - 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec + 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - e61772dfb9cfc9b08d95950814ebe51f22cd2de6 + ba3d206594ca389b309d826604b28410f05f19e7 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index d5b38508a..91bee8ec7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19501.24 - 3.1.0-preview1.19501.24 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19501.24 - 3.1.0-preview1.19501.24 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19501.24 + 3.1.0-preview1.19504.2 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19501.24 - 3.1.0-preview1.19501.24 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 $(MicrosoftWindowsDesktopAppPackageVersion) From 6c136d644fcd27710c4e99a84b3cf418901cf4e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 12:56:39 -0700 Subject: [PATCH 118/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5108) * Update dependencies from https://github.com/dotnet/toolset build 20191004.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.10 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.10 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.13 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.13 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19504.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.4 (parent: Microsoft.Dotnet.Toolset.Internal) --- 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 fc6cbfaaf..69d8325b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - e2b74c1a0fdae19a76b63f21ee8483a7849231cb + fe22c3a615bc55f84d32928f4d45575e0e10550a - + https://github.com/dotnet/sdk - 7def7a9c5adc9e4d52a4cf19eee2c3998e3f3b93 + 484317f665ca9fd05897f864639d639e7238cbbd - + https://github.com/dotnet/cli - 5a44f16c79b1d4f5bf0fb2500454347acdaa38aa + e637600604a575387798a42c9615f9d021d0f415 diff --git a/eng/Versions.props b/eng/Versions.props index 91bee8ec7..d86513e00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19504.7 + 3.1.100-preview1.19504.13 @@ -45,14 +45,14 @@ - 3.1.100-preview1.19504.3 + 3.1.100-preview1.19504.4 0.2.0 - 3.1.100-preview1.19504.1 + 3.1.100-preview1.19504.2 $(MicrosoftNETSdkPackageVersion) From 57f4c6d7e7dbb01cd07f0b0ffb700882b22b72ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 14:10:07 -0700 Subject: [PATCH 119/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5110) * Update dependencies from https://github.com/dotnet/toolset build 20191004.14 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.14 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.6 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.15 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.15 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69d8325b8..62e49b57d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - fe22c3a615bc55f84d32928f4d45575e0e10550a + c6b00f4721e23c3e5769dbb5e69d44504f1bd9bc https://github.com/dotnet/sdk 484317f665ca9fd05897f864639d639e7238cbbd - + https://github.com/dotnet/cli - e637600604a575387798a42c9615f9d021d0f415 + 83d51c4fe49d716729f38178b4e20f2a95f03c78 diff --git a/eng/Versions.props b/eng/Versions.props index d86513e00..9cf969ec9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19504.13 + 3.1.100-preview1.19504.15 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19504.4 + 3.1.100-preview1.19504.6 0.2.0 From 1e8f10a4ef3e81c00b35f30ea7ea08a6ab69bb5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 02:35:42 +0000 Subject: [PATCH 120/170] Update dependencies from https://github.com/dotnet/core-setup build 20191004.13 (#5113) - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19504.13 - Microsoft.NETCore.App - 3.1.0-preview1.19504.13 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19504.13 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19504.13 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19504.13 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19504.13 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19504.13 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62e49b57d..042f05133 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 + fd1162d3db7db9c79bf01d32604862f4bee25b96 - + https://github.com/dotnet/core-setup - 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 + fd1162d3db7db9c79bf01d32604862f4bee25b96 - + https://github.com/dotnet/core-setup - 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 + fd1162d3db7db9c79bf01d32604862f4bee25b96 - + https://github.com/dotnet/core-setup - 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 + fd1162d3db7db9c79bf01d32604862f4bee25b96 - + https://github.com/dotnet/core-setup - 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 + fd1162d3db7db9c79bf01d32604862f4bee25b96 - + https://github.com/dotnet/core-setup - 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 + fd1162d3db7db9c79bf01d32604862f4bee25b96 - + https://github.com/dotnet/core-setup - 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 + fd1162d3db7db9c79bf01d32604862f4bee25b96 diff --git a/eng/Versions.props b/eng/Versions.props index 9cf969ec9..394995588 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.13 + 3.1.0-preview1.19504.13 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.13 + 3.1.0-preview1.19504.13 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.13 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.13 + 3.1.0-preview1.19504.13 $(MicrosoftWindowsDesktopAppPackageVersion) From 6afd7e3c65adb4730b317add3feac933fb65617e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 05:40:39 +0000 Subject: [PATCH 121/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5115) * Update dependencies from https://github.com/dotnet/toolset build 20191004.30 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.30 * Update dependencies from https://github.com/dotnet/toolset build 20191004.31 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.31 * Update dependencies from https://github.com/dotnet/toolset build 20191004.33 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.33 * Update dependencies from https://github.com/dotnet/toolset build 20191004.34 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.34 * Update dependencies from https://github.com/dotnet/toolset build 20191004.35 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.35 * Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.22 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 042f05133..d4687028a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - c6b00f4721e23c3e5769dbb5e69d44504f1bd9bc + fff7792b9db12c0d4a1569686ea60590e5be02ac https://github.com/dotnet/sdk 484317f665ca9fd05897f864639d639e7238cbbd - + https://github.com/dotnet/cli - 83d51c4fe49d716729f38178b4e20f2a95f03c78 + ab9f11b98ce8e64d3ec63768dc5b8f1b33c8189e diff --git a/eng/Versions.props b/eng/Versions.props index 394995588..2963bbcac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19504.15 + 3.1.100-preview1.19504.35 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19504.6 + 3.1.100-preview1.19504.22 0.2.0 From 9088d6cf48eff9e01be5f9fec44345fc740c013a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 05:41:41 +0000 Subject: [PATCH 122/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20191004.2 (#5116) - dotnet-user-secrets - 3.1.0-preview1.19504.2 - dotnet-watch - 3.1.0-preview1.19504.2 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19504.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19504.2 - dotnet-dev-certs - 3.1.0-preview1.19504.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19504.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 d4687028a..0582337ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx ba3d206594ca389b309d826604b28410f05f19e7 - + https://github.com/aspnet/AspNetCore - a7b739bab3b1d310eeec6aef551ce39650bdcf24 + a92f8ffa177a5f4d1189f211049f094fe09e76c5 - + https://github.com/aspnet/AspNetCore - a7b739bab3b1d310eeec6aef551ce39650bdcf24 + a92f8ffa177a5f4d1189f211049f094fe09e76c5 - + https://github.com/aspnet/AspNetCore - a7b739bab3b1d310eeec6aef551ce39650bdcf24 + a92f8ffa177a5f4d1189f211049f094fe09e76c5 - + https://github.com/aspnet/AspNetCore - a7b739bab3b1d310eeec6aef551ce39650bdcf24 + a92f8ffa177a5f4d1189f211049f094fe09e76c5 - + https://github.com/aspnet/AspNetCore - a7b739bab3b1d310eeec6aef551ce39650bdcf24 + a92f8ffa177a5f4d1189f211049f094fe09e76c5 - + https://github.com/aspnet/AspNetCore - a7b739bab3b1d310eeec6aef551ce39650bdcf24 + a92f8ffa177a5f4d1189f211049f094fe09e76c5 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 2963bbcac..6965c6027 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19503.31 - 3.1.0-preview1.19503.31 - 3.1.0-preview1.19503.31 - 3.1.0-preview1.19503.31 - 3.1.0-preview1.19503.31 - 3.1.0-preview1.19503.31 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 From cb63b499dbb6e814fa0ed34274eaf8448437c7c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 05:46:10 +0000 Subject: [PATCH 123/170] Update dependencies from https://github.com/dotnet/core-setup build 20191004.15 (#5118) - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19504.15 - Microsoft.NETCore.App - 3.1.0-preview1.19504.15 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19504.15 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19504.15 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19504.15 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19504.15 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19504.15 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19504.6 (parent: Microsoft.NetCore.App) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0582337ac..66bfcd15a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - fd1162d3db7db9c79bf01d32604862f4bee25b96 + ea8a25eb0679dc4d940623688189885086286adc - + https://github.com/dotnet/core-setup - fd1162d3db7db9c79bf01d32604862f4bee25b96 + ea8a25eb0679dc4d940623688189885086286adc - + https://github.com/dotnet/core-setup - fd1162d3db7db9c79bf01d32604862f4bee25b96 + ea8a25eb0679dc4d940623688189885086286adc - + https://github.com/dotnet/core-setup - fd1162d3db7db9c79bf01d32604862f4bee25b96 + ea8a25eb0679dc4d940623688189885086286adc - + https://github.com/dotnet/core-setup - fd1162d3db7db9c79bf01d32604862f4bee25b96 + ea8a25eb0679dc4d940623688189885086286adc - + https://github.com/dotnet/core-setup - fd1162d3db7db9c79bf01d32604862f4bee25b96 + ea8a25eb0679dc4d940623688189885086286adc - + https://github.com/dotnet/core-setup - fd1162d3db7db9c79bf01d32604862f4bee25b96 + ea8a25eb0679dc4d940623688189885086286adc @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - ba3d206594ca389b309d826604b28410f05f19e7 + f969dd277b3288d0ee07d10dacc5dc3613030674 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 6965c6027..c1298ce05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19504.13 - 3.1.0-preview1.19504.13 + 3.1.0-preview1.19504.15 + 3.1.0-preview1.19504.15 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19504.13 - 3.1.0-preview1.19504.13 + 3.1.0-preview1.19504.15 + 3.1.0-preview1.19504.15 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19504.13 + 3.1.0-preview1.19504.15 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19504.13 - 3.1.0-preview1.19504.13 + 3.1.0-preview1.19504.15 + 3.1.0-preview1.19504.15 $(MicrosoftWindowsDesktopAppPackageVersion) From e8d00d2c43f654efb9e1d8159b9b0e054133a95c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 01:03:14 -0700 Subject: [PATCH 124/170] Update dependencies from https://github.com/dotnet/core-setup build 20191004.18 (#5121) - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19504.18 - Microsoft.NETCore.App - 3.1.0-preview1.19504.18 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19504.18 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19504.18 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19504.18 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19504.18 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19504.18 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19504.8 (parent: Microsoft.NetCore.App) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66bfcd15a..0466c8368 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - ea8a25eb0679dc4d940623688189885086286adc + 27610507ac04a478c225054699afb20e86cc7881 - + https://github.com/dotnet/core-setup - ea8a25eb0679dc4d940623688189885086286adc + 27610507ac04a478c225054699afb20e86cc7881 - + https://github.com/dotnet/core-setup - ea8a25eb0679dc4d940623688189885086286adc + 27610507ac04a478c225054699afb20e86cc7881 - + https://github.com/dotnet/core-setup - ea8a25eb0679dc4d940623688189885086286adc + 27610507ac04a478c225054699afb20e86cc7881 - + https://github.com/dotnet/core-setup - ea8a25eb0679dc4d940623688189885086286adc + 27610507ac04a478c225054699afb20e86cc7881 - + https://github.com/dotnet/core-setup - ea8a25eb0679dc4d940623688189885086286adc + 27610507ac04a478c225054699afb20e86cc7881 - + https://github.com/dotnet/core-setup - ea8a25eb0679dc4d940623688189885086286adc + 27610507ac04a478c225054699afb20e86cc7881 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - f969dd277b3288d0ee07d10dacc5dc3613030674 + f4137889514bef5b9149e25d6edbaeb66f8beba6 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index c1298ce05..9fb788f78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19504.15 - 3.1.0-preview1.19504.15 + 3.1.0-preview1.19504.18 + 3.1.0-preview1.19504.18 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19504.15 - 3.1.0-preview1.19504.15 + 3.1.0-preview1.19504.18 + 3.1.0-preview1.19504.18 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19504.15 + 3.1.0-preview1.19504.18 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19504.15 - 3.1.0-preview1.19504.15 + 3.1.0-preview1.19504.18 + 3.1.0-preview1.19504.18 $(MicrosoftWindowsDesktopAppPackageVersion) From 215b42fe3cad0cea9f81b780c449e7e8a39eb6fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 09:15:40 +0000 Subject: [PATCH 125/170] Update dependencies from https://github.com/dotnet/core-setup build 20191004.20 (#5122) - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19504.20 - Microsoft.NETCore.App - 3.1.0-preview1.19504.20 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19504.20 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19504.20 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19504.20 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19504.20 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19504.20 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19504.10 (parent: Microsoft.NetCore.App) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0466c8368..405ed55af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - 27610507ac04a478c225054699afb20e86cc7881 + 45f675b1acc38eaea182bf6ef284d1b13141d134 - + https://github.com/dotnet/core-setup - 27610507ac04a478c225054699afb20e86cc7881 + 45f675b1acc38eaea182bf6ef284d1b13141d134 - + https://github.com/dotnet/core-setup - 27610507ac04a478c225054699afb20e86cc7881 + 45f675b1acc38eaea182bf6ef284d1b13141d134 - + https://github.com/dotnet/core-setup - 27610507ac04a478c225054699afb20e86cc7881 + 45f675b1acc38eaea182bf6ef284d1b13141d134 - + https://github.com/dotnet/core-setup - 27610507ac04a478c225054699afb20e86cc7881 + 45f675b1acc38eaea182bf6ef284d1b13141d134 - + https://github.com/dotnet/core-setup - 27610507ac04a478c225054699afb20e86cc7881 + 45f675b1acc38eaea182bf6ef284d1b13141d134 - + https://github.com/dotnet/core-setup - 27610507ac04a478c225054699afb20e86cc7881 + 45f675b1acc38eaea182bf6ef284d1b13141d134 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - f4137889514bef5b9149e25d6edbaeb66f8beba6 + 0498dfedf8dbbd088c74399f45bc0b0c861c831a https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 9fb788f78..141f7383f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19504.18 - 3.1.0-preview1.19504.18 + 3.1.0-preview1.19504.20 + 3.1.0-preview1.19504.20 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19504.18 - 3.1.0-preview1.19504.18 + 3.1.0-preview1.19504.20 + 3.1.0-preview1.19504.20 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19504.18 + 3.1.0-preview1.19504.20 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19504.18 - 3.1.0-preview1.19504.18 + 3.1.0-preview1.19504.20 + 3.1.0-preview1.19504.20 $(MicrosoftWindowsDesktopAppPackageVersion) From 4d0cbd16b44d4a6c8ac823d6063d98b0e00e3e5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 10:10:04 +0000 Subject: [PATCH 126/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5120) * Update dependencies from https://github.com/dotnet/toolset build 20191004.36 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.36 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19504.8 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.37 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.37 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19504.8 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.23 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.38 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.38 * Update dependencies from https://github.com/dotnet/toolset build 20191004.39 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.39 * Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19504.8 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.25 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.1 * Update dependencies from https://github.com/dotnet/toolset build 20191005.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.2 * Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19504.9 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.25 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.3 * Update dependencies from https://github.com/dotnet/toolset build 20191005.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.4 * Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19504.9 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- 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 405ed55af..281bfabda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - fff7792b9db12c0d4a1569686ea60590e5be02ac + 05f51e8bc09a746c1a41453fb0f65c01fe4865dc - + https://github.com/dotnet/sdk - 484317f665ca9fd05897f864639d639e7238cbbd + cd1c25c76c39d54a5e9040cc4ed193b39f9a161e - + https://github.com/dotnet/cli - ab9f11b98ce8e64d3ec63768dc5b8f1b33c8189e + 2f59a87ad793f59231d22bffd0d2bc408aa104e8 diff --git a/eng/Versions.props b/eng/Versions.props index 141f7383f..d72759c20 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19504.35 + 3.1.100-preview1.19505.4 @@ -45,14 +45,14 @@ - 3.1.100-preview1.19504.22 + 3.1.100-preview1.19505.1 0.2.0 - 3.1.100-preview1.19504.2 + 3.1.100-preview1.19504.9 $(MicrosoftNETSdkPackageVersion) From 8dbb885ea43eb6ecf9f9ed2fa64a9dd506c38fb7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 05:18:19 -0700 Subject: [PATCH 127/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5123) * Update dependencies from https://github.com/dotnet/toolset build 20191005.7 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.7 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.5 * Update dependencies from https://github.com/dotnet/toolset build 20191005.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.6 * Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 281bfabda..209337e5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 05f51e8bc09a746c1a41453fb0f65c01fe4865dc + 532bc93c64a433f242b1ece66e27b78399c2ad3c https://github.com/dotnet/sdk cd1c25c76c39d54a5e9040cc4ed193b39f9a161e - + https://github.com/dotnet/cli - 2f59a87ad793f59231d22bffd0d2bc408aa104e8 + d254e3023b11bba8779fa598bd4fbf93b5a0bbf3 diff --git a/eng/Versions.props b/eng/Versions.props index d72759c20..2bbdc3dee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.4 + 3.1.100-preview1.19505.6 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19505.1 + 3.1.100-preview1.19505.2 0.2.0 From 924834c23755f97400c4dbc7ce3aadadf367e43b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 13:20:38 +0000 Subject: [PATCH 128/170] Update dependencies from https://github.com/dotnet/toolset build 20191005.10 (#5124) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.10 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 209337e5a..eea75a3a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 532bc93c64a433f242b1ece66e27b78399c2ad3c + 3c548403b5797ea873f96927ac6a626d5a679c82 https://github.com/dotnet/sdk cd1c25c76c39d54a5e9040cc4ed193b39f9a161e - + https://github.com/dotnet/cli - d254e3023b11bba8779fa598bd4fbf93b5a0bbf3 + 1a37c7939ac0f0bfc6c3dde5d570dabf8a6befa1 diff --git a/eng/Versions.props b/eng/Versions.props index 2bbdc3dee..1ad0c7696 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.6 + 3.1.100-preview1.19505.10 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19505.2 + 3.1.100-preview1.19505.3 0.2.0 From 7eafa6014815a365ae6fe5669d27b8ed39e2a375 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 17:31:27 +0000 Subject: [PATCH 129/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5125) * Update dependencies from https://github.com/dotnet/toolset build 20191005.11 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.11 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19505.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.12 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19505.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.4 (parent: Microsoft.Dotnet.Toolset.Internal) --- 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 eea75a3a0..1590831de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 3c548403b5797ea873f96927ac6a626d5a679c82 + e29153307876bfd9d358cef5c11a7ea35f4ce381 - + https://github.com/dotnet/sdk - cd1c25c76c39d54a5e9040cc4ed193b39f9a161e + fc2c6f61b9bae9eb07e80ca11f9d12e20aa02bd3 - + https://github.com/dotnet/cli - 1a37c7939ac0f0bfc6c3dde5d570dabf8a6befa1 + e8db8f5a58c9a4d41a0923447fd6a9a9a68a2db8 diff --git a/eng/Versions.props b/eng/Versions.props index 1ad0c7696..a21ccac58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.10 + 3.1.100-preview1.19505.12 @@ -45,14 +45,14 @@ - 3.1.100-preview1.19505.3 + 3.1.100-preview1.19505.4 0.2.0 - 3.1.100-preview1.19504.9 + 3.1.100-preview1.19505.1 $(MicrosoftNETSdkPackageVersion) From bc140029e3d150e4f6e3e758aeccca2a0d15dfc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 18:56:05 +0000 Subject: [PATCH 130/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20191005.1 (#5128) - dotnet-user-secrets - 3.1.0-preview1.19505.1 - dotnet-watch - 3.1.0-preview1.19505.1 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19505.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19505.1 - dotnet-dev-certs - 3.1.0-preview1.19505.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19505.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 1590831de..81830eea8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx 0498dfedf8dbbd088c74399f45bc0b0c861c831a - + https://github.com/aspnet/AspNetCore - a92f8ffa177a5f4d1189f211049f094fe09e76c5 + 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 - + https://github.com/aspnet/AspNetCore - a92f8ffa177a5f4d1189f211049f094fe09e76c5 + 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 - + https://github.com/aspnet/AspNetCore - a92f8ffa177a5f4d1189f211049f094fe09e76c5 + 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 - + https://github.com/aspnet/AspNetCore - a92f8ffa177a5f4d1189f211049f094fe09e76c5 + 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 - + https://github.com/aspnet/AspNetCore - a92f8ffa177a5f4d1189f211049f094fe09e76c5 + 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 - + https://github.com/aspnet/AspNetCore - a92f8ffa177a5f4d1189f211049f094fe09e76c5 + 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index a21ccac58..5f0bfc82f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 + 3.1.0-preview1.19505.1 + 3.1.0-preview1.19505.1 + 3.1.0-preview1.19505.1 + 3.1.0-preview1.19505.1 + 3.1.0-preview1.19505.1 + 3.1.0-preview1.19505.1 From ec10e1bd08256da9ec31425e3634fff9b75e33ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 12:28:50 -0700 Subject: [PATCH 131/170] Update dependencies from https://github.com/dotnet/toolset build 20191005.14 (#5130) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.14 --- 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 81830eea8..b1c2dee4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - e29153307876bfd9d358cef5c11a7ea35f4ce381 + 0c9f38c9a14314c49e38f943c15b02a6592647cb https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5f0bfc82f..100247ca0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.12 + 3.1.100-preview1.19505.14 From 51aea17b737983b26df1bad2d337557e471e87bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 14:04:41 -0700 Subject: [PATCH 132/170] Update dependencies from https://github.com/dotnet/toolset build 20191005.16 (#5133) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1c2dee4c..5d3ce0cc4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 0c9f38c9a14314c49e38f943c15b02a6592647cb + b2c4aeafa737cf6382c60181f206183a335e625d https://github.com/dotnet/sdk fc2c6f61b9bae9eb07e80ca11f9d12e20aa02bd3 - + https://github.com/dotnet/cli - e8db8f5a58c9a4d41a0923447fd6a9a9a68a2db8 + a1c6d9063dc47bff109253e906660c47dcfc5bcc diff --git a/eng/Versions.props b/eng/Versions.props index 100247ca0..0ed8bd3d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.14 + 3.1.100-preview1.19505.16 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19505.4 + 3.1.100-preview1.19505.6 0.2.0 From 2b6c4266560acb7a389569710eb6db5e569db5b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 19:04:53 -0700 Subject: [PATCH 133/170] Update dependencies from https://github.com/dotnet/core-setup build 20191005.4 (#5135) - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19505.4 - Microsoft.NETCore.App - 3.1.0-preview1.19505.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19505.4 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19505.4 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19505.4 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19505.4 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19505.4 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19504.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19505.1 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d3ce0cc4..59f1d1b69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - 45f675b1acc38eaea182bf6ef284d1b13141d134 + f046fe0e33340def6bf72f939126012f740ea5b5 - + https://github.com/dotnet/core-setup - 45f675b1acc38eaea182bf6ef284d1b13141d134 + f046fe0e33340def6bf72f939126012f740ea5b5 - + https://github.com/dotnet/core-setup - 45f675b1acc38eaea182bf6ef284d1b13141d134 + f046fe0e33340def6bf72f939126012f740ea5b5 - + https://github.com/dotnet/core-setup - 45f675b1acc38eaea182bf6ef284d1b13141d134 + f046fe0e33340def6bf72f939126012f740ea5b5 - + https://github.com/dotnet/core-setup - 45f675b1acc38eaea182bf6ef284d1b13141d134 + f046fe0e33340def6bf72f939126012f740ea5b5 - + https://github.com/dotnet/core-setup - 45f675b1acc38eaea182bf6ef284d1b13141d134 + f046fe0e33340def6bf72f939126012f740ea5b5 - + https://github.com/dotnet/core-setup - 45f675b1acc38eaea182bf6ef284d1b13141d134 + f046fe0e33340def6bf72f939126012f740ea5b5 @@ -85,13 +85,13 @@ a1c6d9063dc47bff109253e906660c47dcfc5bcc - + https://github.com/dotnet/winforms - be3d33927476deb6e299c69cc68f0c54ed1b828c + 1934207dfd7aa570337791a67e4eeec4f6b82265 - + https://github.com/dotnet/wpf - 9a67316ef068c3f4a78a11916777b505b0bbacca + 17d637dbe1d67cadaf4b0a151bd2f6daa5ed97d1 diff --git a/eng/Versions.props b/eng/Versions.props index 0ed8bd3d9..095c7a157 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19501.1 + 4.8.1-preview1.19504.1 - 3.1.0-preview1.19501.6 + 3.1.0-preview1.19505.1 @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19504.20 - 3.1.0-preview1.19504.20 + 3.1.0-preview1.19505.4 + 3.1.0-preview1.19505.4 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19504.20 - 3.1.0-preview1.19504.20 + 3.1.0-preview1.19505.4 + 3.1.0-preview1.19505.4 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19504.20 + 3.1.0-preview1.19505.4 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19504.20 - 3.1.0-preview1.19504.20 + 3.1.0-preview1.19505.4 + 3.1.0-preview1.19505.4 $(MicrosoftWindowsDesktopAppPackageVersion) From 772df19133ef12cd153c1d020595a732b49c17f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 02:30:37 +0000 Subject: [PATCH 134/170] Update dependencies from https://github.com/dotnet/toolset build 20191005.18 (#5136) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.18 --- 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 59f1d1b69..5bc9a111d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - b2c4aeafa737cf6382c60181f206183a335e625d + 74eb66e562b95097c9bf3a1934aed947212e33cd https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 095c7a157..91e3db828 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.16 + 3.1.100-preview1.19505.18 From c5f566eed52b7d73a117470de85a998ccc9fb5cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 05:45:23 +0000 Subject: [PATCH 135/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5137) * Update dependencies from https://github.com/dotnet/toolset build 20191005.19 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.19 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.20 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.20 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19505.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.21 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.21 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19505.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.22 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.22 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19505.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.10 (parent: Microsoft.Dotnet.Toolset.Internal) --- 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 5bc9a111d..dd7507634 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 74eb66e562b95097c9bf3a1934aed947212e33cd + e45016679b66c16db4078fac4f126c3845a7451f - + https://github.com/dotnet/sdk - fc2c6f61b9bae9eb07e80ca11f9d12e20aa02bd3 + c5caf9406ccecd70bf6ebfe3d8bbeb7452df1995 - + https://github.com/dotnet/cli - a1c6d9063dc47bff109253e906660c47dcfc5bcc + 035d1100f8aa6e3d3013e4de33d685ec3fa53d7c diff --git a/eng/Versions.props b/eng/Versions.props index 91e3db828..7b0b358ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.18 + 3.1.100-preview1.19505.22 @@ -45,14 +45,14 @@ - 3.1.100-preview1.19505.6 + 3.1.100-preview1.19505.10 0.2.0 - 3.1.100-preview1.19505.1 + 3.1.100-preview1.19505.2 $(MicrosoftNETSdkPackageVersion) From 7d3605a721ca7a98f416498f31f731acec9d1468 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 08:16:46 +0000 Subject: [PATCH 136/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5140) * Update dependencies from https://github.com/dotnet/toolset build 20191005.23 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.23 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.24 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.24 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191006.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.1 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19505.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.11 (parent: Microsoft.Dotnet.Toolset.Internal) --- 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 dd7507634..1d952ae27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - e45016679b66c16db4078fac4f126c3845a7451f + 7e4493ed6bbf26ce0ddb4a7dc0c26fe45f3ed610 - + https://github.com/dotnet/sdk - c5caf9406ccecd70bf6ebfe3d8bbeb7452df1995 + c3d91f04768a270fb742169e2db08664226f2c22 - + https://github.com/dotnet/cli - 035d1100f8aa6e3d3013e4de33d685ec3fa53d7c + e0371fb5ff31ad88d27ab7df3c2c7fd16d9aae17 diff --git a/eng/Versions.props b/eng/Versions.props index 7b0b358ac..46568864c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.22 + 3.1.100-preview1.19506.1 @@ -45,14 +45,14 @@ - 3.1.100-preview1.19505.10 + 3.1.100-preview1.19505.11 0.2.0 - 3.1.100-preview1.19505.2 + 3.1.100-preview1.19505.3 $(MicrosoftNETSdkPackageVersion) From 257643fd28b7930d65c4400a54cd81156bd586f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 15:07:46 +0000 Subject: [PATCH 137/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5142) * Update dependencies from https://github.com/dotnet/toolset build 20191006.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19506.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191006.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.5 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19506.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191006.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.6 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19506.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d952ae27..e463cc1cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 7e4493ed6bbf26ce0ddb4a7dc0c26fe45f3ed610 + e9ce440a1cb586d9e9fa7012dbb60088037dd0e2 https://github.com/dotnet/sdk c3d91f04768a270fb742169e2db08664226f2c22 - + https://github.com/dotnet/cli - e0371fb5ff31ad88d27ab7df3c2c7fd16d9aae17 + 81e415540553d36bdeffdbb6981c58dde92dbbf5 diff --git a/eng/Versions.props b/eng/Versions.props index 46568864c..e5a32f650 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.1 + 3.1.100-preview1.19506.6 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19505.11 + 3.1.100-preview1.19506.2 0.2.0 From 091383899c47666ae6211d7d6b3d3b53806c4f69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 09:29:46 -0700 Subject: [PATCH 138/170] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5138) * Update dependencies from https://github.com/dotnet/core-setup build 20191005.5 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19505.5 - Microsoft.NETCore.App - 3.1.0-preview1.19505.5 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19505.5 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19505.5 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19505.5 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19505.5 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19505.5 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19505.2 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20191006.1 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19506.1 - Microsoft.NETCore.App - 3.1.0-preview1.19506.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19506.1 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19506.1 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19506.1 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19506.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19506.1 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19505.2 (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 e463cc1cf..80c4b570f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - f046fe0e33340def6bf72f939126012f740ea5b5 + bbf5542781136f9f3a1f30b010cb782e775d54c7 - + https://github.com/dotnet/core-setup - f046fe0e33340def6bf72f939126012f740ea5b5 + bbf5542781136f9f3a1f30b010cb782e775d54c7 - + https://github.com/dotnet/core-setup - f046fe0e33340def6bf72f939126012f740ea5b5 + bbf5542781136f9f3a1f30b010cb782e775d54c7 - + https://github.com/dotnet/core-setup - f046fe0e33340def6bf72f939126012f740ea5b5 + bbf5542781136f9f3a1f30b010cb782e775d54c7 - + https://github.com/dotnet/core-setup - f046fe0e33340def6bf72f939126012f740ea5b5 + bbf5542781136f9f3a1f30b010cb782e775d54c7 - + https://github.com/dotnet/core-setup - f046fe0e33340def6bf72f939126012f740ea5b5 + bbf5542781136f9f3a1f30b010cb782e775d54c7 - + https://github.com/dotnet/core-setup - f046fe0e33340def6bf72f939126012f740ea5b5 + bbf5542781136f9f3a1f30b010cb782e775d54c7 @@ -89,9 +89,9 @@ https://github.com/dotnet/winforms 1934207dfd7aa570337791a67e4eeec4f6b82265 - + https://github.com/dotnet/wpf - 17d637dbe1d67cadaf4b0a151bd2f6daa5ed97d1 + d7adcfe00706477704409105077aec4c6ac7eadb diff --git a/eng/Versions.props b/eng/Versions.props index e5a32f650..124a1dc83 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.1.0-preview1.19505.1 + 3.1.0-preview1.19505.2 @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19505.4 - 3.1.0-preview1.19505.4 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19505.4 - 3.1.0-preview1.19505.4 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19505.4 + 3.1.0-preview1.19506.1 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19505.4 - 3.1.0-preview1.19505.4 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 $(MicrosoftWindowsDesktopAppPackageVersion) From 9dcc06f2a149d39ccc8db7fd0606b15415174cf7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 17:20:13 +0000 Subject: [PATCH 139/170] Update dependencies from https://github.com/dotnet/toolset build 20191006.7 (#5143) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.7 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19506.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80c4b570f..d5b63778e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,13 +72,13 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - e9ce440a1cb586d9e9fa7012dbb60088037dd0e2 + f428d624c16fe2b91a0b744883f5628c5c53ce95 - + https://github.com/dotnet/sdk - c3d91f04768a270fb742169e2db08664226f2c22 + 357126710492d620198a60ee340ebeca9070f133 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 124a1dc83..3f386db93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.6 + 3.1.100-preview1.19506.7 @@ -52,7 +52,7 @@ - 3.1.100-preview1.19505.3 + 3.1.100-preview1.19506.1 $(MicrosoftNETSdkPackageVersion) From 3a518826f467e9e8c543e15d49b4f94a0aa1bad6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 11:23:45 -0700 Subject: [PATCH 140/170] Update dependencies from https://github.com/dotnet/toolset build 20191006.8 (#5145) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19506.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5b63778e..122b02a78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - f428d624c16fe2b91a0b744883f5628c5c53ce95 + b2d176e2ba905f0d6376ecf12cbcd104336992f0 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 81e415540553d36bdeffdbb6981c58dde92dbbf5 + 67f32ea98b5e5c185b55fab26c8b1c4ddef469d6 diff --git a/eng/Versions.props b/eng/Versions.props index 3f386db93..e55cf7df2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.7 + 3.1.100-preview1.19506.8 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19506.2 + 3.1.100-preview1.19506.3 0.2.0 From 0ae9787c4fc2108e9d3523770b38e8382375e297 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 19:46:41 +0000 Subject: [PATCH 141/170] Update dependencies from https://github.com/dotnet/toolset build 20191006.10 (#5147) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.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 122b02a78..730523076 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - b2d176e2ba905f0d6376ecf12cbcd104336992f0 + 037006a38e88bbca07f32cf37e8d5d0091437ef4 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e55cf7df2..c4fd1e08e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.8 + 3.1.100-preview1.19506.10 From 16c181b17c8d3a9aaff4efad9fdf72ae3ceb9b75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 20:31:07 +0000 Subject: [PATCH 142/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20191006.1 (#5148) - dotnet-user-secrets - 3.1.0-preview1.19506.1 - dotnet-watch - 3.1.0-preview1.19506.1 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19506.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19506.1 - dotnet-dev-certs - 3.1.0-preview1.19506.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19506.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 730523076..afe8c906e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx 0498dfedf8dbbd088c74399f45bc0b0c861c831a - + https://github.com/aspnet/AspNetCore - 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 + f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca - + https://github.com/aspnet/AspNetCore - 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 + f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca - + https://github.com/aspnet/AspNetCore - 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 + f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca - + https://github.com/aspnet/AspNetCore - 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 + f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca - + https://github.com/aspnet/AspNetCore - 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 + f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca - + https://github.com/aspnet/AspNetCore - 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 + f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c4fd1e08e..591c1d49d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19505.1 - 3.1.0-preview1.19505.1 - 3.1.0-preview1.19505.1 - 3.1.0-preview1.19505.1 - 3.1.0-preview1.19505.1 - 3.1.0-preview1.19505.1 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 From 04900281244a27f9369a1de46a74294b8638addb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 20:50:27 +0000 Subject: [PATCH 143/170] Update dependencies from https://github.com/dotnet/toolset build 20191006.11 (#5151) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.11 --- 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 afe8c906e..767f0d348 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 037006a38e88bbca07f32cf37e8d5d0091437ef4 + 8e03480c994ae13b1592bbd0a830b08459f8e05c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 591c1d49d..6f5e938e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.10 + 3.1.100-preview1.19506.11 From 85e8a111fae40e0a4e3b400211c3dfd5fbee5114 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 23:26:52 +0000 Subject: [PATCH 144/170] Update dependencies from https://github.com/dotnet/toolset build 20191006.13 (#5152) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19506.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 767f0d348..9084ab7fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 8e03480c994ae13b1592bbd0a830b08459f8e05c + 0cbfdf10228beb100606ea48bc2c532fd7efb088 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 67f32ea98b5e5c185b55fab26c8b1c4ddef469d6 + 71f00700ecf6225fcd7b946938152d9574205c61 diff --git a/eng/Versions.props b/eng/Versions.props index 6f5e938e9..dc52b957c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.11 + 3.1.100-preview1.19506.13 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19506.3 + 3.1.100-preview1.19506.6 0.2.0 From 5a6c8239d1bc5dc203c7b8233e6595a44e9051b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 18:02:47 -0700 Subject: [PATCH 145/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20191006.2 (#5154) - dotnet-user-secrets - 3.1.0-preview1.19506.2 - dotnet-watch - 3.1.0-preview1.19506.2 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19506.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19506.2 - dotnet-dev-certs - 3.1.0-preview1.19506.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19506.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 9084ab7fc..6f0a359ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx 0498dfedf8dbbd088c74399f45bc0b0c861c831a - + https://github.com/aspnet/AspNetCore - f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca + 1def7ea25d56d3c0cd8abdca2edd28346c9e688e - + https://github.com/aspnet/AspNetCore - f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca + 1def7ea25d56d3c0cd8abdca2edd28346c9e688e - + https://github.com/aspnet/AspNetCore - f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca + 1def7ea25d56d3c0cd8abdca2edd28346c9e688e - + https://github.com/aspnet/AspNetCore - f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca + 1def7ea25d56d3c0cd8abdca2edd28346c9e688e - + https://github.com/aspnet/AspNetCore - f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca + 1def7ea25d56d3c0cd8abdca2edd28346c9e688e - + https://github.com/aspnet/AspNetCore - f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca + 1def7ea25d56d3c0cd8abdca2edd28346c9e688e https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index dc52b957c..c86a50829 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.2 + 3.1.0-preview1.19506.2 + 3.1.0-preview1.19506.2 + 3.1.0-preview1.19506.2 + 3.1.0-preview1.19506.2 + 3.1.0-preview1.19506.2 From e6953f59a1f1aca77ce10632b2ac7253b9be8cbf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 19:04:28 -0700 Subject: [PATCH 146/170] Update dependencies from https://github.com/dotnet/toolset build 20191006.16 (#5155) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.16 --- 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 6f0a359ee..c6311ab82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 0cbfdf10228beb100606ea48bc2c532fd7efb088 + 7a864723e64e17c2d2139cbcedcc20596b15d906 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c86a50829..37ab0a7a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.13 + 3.1.100-preview1.19506.16 From 2f2322bfcacdf6e0bb6f051a2056813914b72586 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2019 04:11:02 +0000 Subject: [PATCH 147/170] Update dependencies from https://github.com/dotnet/toolset build 20191006.17 (#5157) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.17 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19506.9 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6311ab82..ef3a42025 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 7a864723e64e17c2d2139cbcedcc20596b15d906 + e9c6794f1f124e273571237eb72a949ee5c950c6 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 71f00700ecf6225fcd7b946938152d9574205c61 + d8f1eacf0615884bfbc1c4b1f6d6a3690b35bb65 diff --git a/eng/Versions.props b/eng/Versions.props index 37ab0a7a0..c0b53ffc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.16 + 3.1.100-preview1.19506.17 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19506.6 + 3.1.100-preview1.19506.9 0.2.0 From afcfe274848c7be0afe8a614002ed145cc0dc6ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2019 01:11:11 +0000 Subject: [PATCH 148/170] Update dependencies from https://github.com/dotnet/toolset build 20191008.11 (#5175) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19508.11 --- 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 ef3a42025..60eff2438 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - e9c6794f1f124e273571237eb72a949ee5c950c6 + 0ee2151da081af3868a93aa28a84e06a900e08e6 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c0b53ffc2..5c6323f6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.17 + 3.1.100-preview1.19508.11 From 9adabe74af1df888dedda18c6c5bd5e6213b150b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2019 05:35:36 +0000 Subject: [PATCH 149/170] Update dependencies from https://github.com/aspnet/AspNetCore build 20191008.20 (#5177) - dotnet-user-secrets - 3.1.0-preview1.19508.20 - dotnet-watch - 3.1.0-preview1.19508.20 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19508.20 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19508.20 - dotnet-dev-certs - 3.1.0-preview1.19508.20 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19508.20 --- 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 60eff2438..a286d15cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx 0498dfedf8dbbd088c74399f45bc0b0c861c831a - + https://github.com/aspnet/AspNetCore - 1def7ea25d56d3c0cd8abdca2edd28346c9e688e + 84be18b1048236ad163d737b442a4ccf3b10d997 - + https://github.com/aspnet/AspNetCore - 1def7ea25d56d3c0cd8abdca2edd28346c9e688e + 84be18b1048236ad163d737b442a4ccf3b10d997 - + https://github.com/aspnet/AspNetCore - 1def7ea25d56d3c0cd8abdca2edd28346c9e688e + 84be18b1048236ad163d737b442a4ccf3b10d997 - + https://github.com/aspnet/AspNetCore - 1def7ea25d56d3c0cd8abdca2edd28346c9e688e + 84be18b1048236ad163d737b442a4ccf3b10d997 - + https://github.com/aspnet/AspNetCore - 1def7ea25d56d3c0cd8abdca2edd28346c9e688e + 84be18b1048236ad163d737b442a4ccf3b10d997 - + https://github.com/aspnet/AspNetCore - 1def7ea25d56d3c0cd8abdca2edd28346c9e688e + 84be18b1048236ad163d737b442a4ccf3b10d997 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5c6323f6a..3b0a14c8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19506.2 - 3.1.0-preview1.19506.2 - 3.1.0-preview1.19506.2 - 3.1.0-preview1.19506.2 - 3.1.0-preview1.19506.2 - 3.1.0-preview1.19506.2 + 3.1.0-preview1.19508.20 + 3.1.0-preview1.19508.20 + 3.1.0-preview1.19508.20 + 3.1.0-preview1.19508.20 + 3.1.0-preview1.19508.20 + 3.1.0-preview1.19508.20 From aac93eb7c142235b2a2b0f6216b5c467e31c32c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2019 07:39:17 +0000 Subject: [PATCH 150/170] Update dependencies from https://github.com/dotnet/toolset build 20191008.12 (#5178) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19508.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 a286d15cd..6baff13d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 0ee2151da081af3868a93aa28a84e06a900e08e6 + ddc9190400be24c30053a900e031bfcaea2cc283 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 3b0a14c8e..ed735b097 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19508.11 + 3.1.100-preview1.19508.12 From ac3b59712d74beaefcb84fc43c6ec875bdc438e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2019 08:15:24 +0000 Subject: [PATCH 151/170] Update dependencies from https://github.com/dotnet/toolset build 20191009.1 (#5179) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19509.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19508.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6baff13d1..bc65cc9b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - ddc9190400be24c30053a900e031bfcaea2cc283 + 77f17e5221f6a2dfca9c0c7eb1a6012584c311c3 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - d8f1eacf0615884bfbc1c4b1f6d6a3690b35bb65 + 4e2114d5c1991e4da355322d9fcc39a94542662d diff --git a/eng/Versions.props b/eng/Versions.props index ed735b097..9a3726f2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19508.12 + 3.1.100-preview1.19509.1 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19506.9 + 3.1.100-preview1.19508.5 0.2.0 From d182beb5480347890008e9236386eb58cd01e07d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 05:45:43 +0000 Subject: [PATCH 152/170] Update dependencies from https://github.com/dotnet/toolset build 20191010.9 (#5205) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19510.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 bc65cc9b9..e021085e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 77f17e5221f6a2dfca9c0c7eb1a6012584c311c3 + 4af474b048cbfa3c68e057d38dc78cfde2aa9965 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9a3726f2b..cd35544c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19509.1 + 3.1.100-preview1.19510.9 From 1f08f3ddaa0b5c9aeae434f3acb5f69ef7c57c73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 08:40:41 +0000 Subject: [PATCH 153/170] Update dependencies from https://github.com/dotnet/toolset build 20191011.1 (#5208) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19511.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 e021085e6..a7c398924 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 4af474b048cbfa3c68e057d38dc78cfde2aa9965 + 69ccfc548e7badc24d2c38b6be7919600e7f0283 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index cd35544c0..f5996c40e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19510.9 + 3.1.100-preview1.19511.1 From a6a7b0f4645de6960befeff0086f3a2a53ccd39b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 22:49:14 +0000 Subject: [PATCH 154/170] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5203) * Update dependencies from https://github.com/dotnet/core-setup build 20191010.20 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19510.20 - Microsoft.NETCore.App - 3.1.0-preview2.19510.20 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview2.19510.20 - Microsoft.WindowsDesktop.App - 3.1.0-preview2.19510.20 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19510.20 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview2.19510.20 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19510.20 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview2.19510.10 (parent: Microsoft.NetCore.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview2.19510.4 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20191010.21 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19510.21 - Microsoft.NETCore.App - 3.1.0-preview2.19510.21 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview2.19510.21 - Microsoft.WindowsDesktop.App - 3.1.0-preview2.19510.21 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19510.21 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview2.19510.21 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19510.21 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview2.19510.14 (parent: Microsoft.NetCore.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview2.19510.4 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20191011.6 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19511.6 - Microsoft.NETCore.App - 3.1.0-preview2.19511.6 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview2.19511.6 - Microsoft.WindowsDesktop.App - 3.1.0-preview2.19511.6 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19511.6 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview2.19511.6 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19511.6 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview2.19511.4 (parent: Microsoft.NetCore.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview2.19510.4 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7c398924..c46087b37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - bbf5542781136f9f3a1f30b010cb782e775d54c7 + f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 - + https://github.com/dotnet/core-setup - bbf5542781136f9f3a1f30b010cb782e775d54c7 + f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 - + https://github.com/dotnet/core-setup - bbf5542781136f9f3a1f30b010cb782e775d54c7 + f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 - + https://github.com/dotnet/core-setup - bbf5542781136f9f3a1f30b010cb782e775d54c7 + f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 - + https://github.com/dotnet/core-setup - bbf5542781136f9f3a1f30b010cb782e775d54c7 + f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 - + https://github.com/dotnet/core-setup - bbf5542781136f9f3a1f30b010cb782e775d54c7 + f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 - + https://github.com/dotnet/core-setup - bbf5542781136f9f3a1f30b010cb782e775d54c7 + f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 0498dfedf8dbbd088c74399f45bc0b0c861c831a + 080eeeb860704f586972f94ac3cabba6f34d08ed https://github.com/aspnet/AspNetCore @@ -89,9 +89,9 @@ https://github.com/dotnet/winforms 1934207dfd7aa570337791a67e4eeec4f6b82265 - + https://github.com/dotnet/wpf - d7adcfe00706477704409105077aec4c6ac7eadb + ea419d76724ac6fd0a4cd731bedba8e3a09c8e43 diff --git a/eng/Versions.props b/eng/Versions.props index f5996c40e..9c20c89d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.1.0-preview1.19505.2 + 3.1.0-preview2.19510.4 @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 + 3.1.0-preview2.19511.6 + 3.1.0-preview2.19511.6 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 + 3.1.0-preview2.19511.6 + 3.1.0-preview2.19511.6 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19506.1 + 3.1.0-preview2.19511.6 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 + 3.1.0-preview2.19511.6 + 3.1.0-preview2.19511.6 $(MicrosoftWindowsDesktopAppPackageVersion) From c143f5e9b3d2f3c2130431cd5d92b2b6f9a6f029 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 14 Oct 2019 11:42:24 -0700 Subject: [PATCH 155/170] Update branding to 3.1.100-preview2 --- 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 e174f99df..e1d48c098 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -4,7 +4,7 @@ 1 1 00 - preview1 + preview2 From 48fe0c154227d1fabfdfd00e868f92d680caf5b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2019 22:09:55 +0000 Subject: [PATCH 156/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5218) * Update dependencies from https://github.com/dotnet/toolset build 20191011.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19511.9 * Update dependencies from https://github.com/dotnet/toolset build 20191014.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19514.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 c46087b37..081c58529 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 69ccfc548e7badc24d2c38b6be7919600e7f0283 + 089dfdfebe493f062569d874fe0899fb80e876e9 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9c20c89d2..90e4e969d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19511.1 + 3.1.100-preview2.19514.3 From 0e1880b4cfcc2be703198647857c96186ecb9828 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2019 23:05:36 +0000 Subject: [PATCH 157/170] Update dependencies from https://github.com/dotnet/toolset build 20191014.5 (#5228) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19514.5 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19514.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 081c58529..9476037da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 089dfdfebe493f062569d874fe0899fb80e876e9 + 3e288fd1432532a9e7747e3f0168379afcd11388 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 4e2114d5c1991e4da355322d9fcc39a94542662d + fc59ff6789f5fa497fbc7a74001596201edd9595 diff --git a/eng/Versions.props b/eng/Versions.props index 90e4e969d..d7562372c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19514.3 + 3.1.100-preview2.19514.5 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19508.5 + 3.1.100-preview2.19514.2 0.2.0 From c47eb9b4f8af05d1bb0cb6fd17b517858a50c481 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 00:56:18 +0000 Subject: [PATCH 158/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5235) * Update dependencies from https://github.com/dotnet/toolset build 20191015.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19515.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19515.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191015.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19515.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19515.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9476037da..70b9325ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 3e288fd1432532a9e7747e3f0168379afcd11388 + 8ee30306ac5348d7a98a8872e13a0a29ab426b8b https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - fc59ff6789f5fa497fbc7a74001596201edd9595 + 36bd8c868d4bd0ccd643ce27cc05179aff254028 diff --git a/eng/Versions.props b/eng/Versions.props index d7562372c..786234d81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19514.5 + 3.1.100-preview2.19515.12 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19514.2 + 3.1.100-preview2.19515.6 0.2.0 From fda8e34c66272ffd41238a8a3d6a67d78ec49847 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 06:05:34 +0000 Subject: [PATCH 159/170] Update dependencies from https://github.com/dotnet/core-setup build 20191015.16 (#5238) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19515.16 - Microsoft.NETCore.App - 3.1.0-preview2.19515.16 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview2.19515.16 - Microsoft.WindowsDesktop.App - 3.1.0-preview2.19515.16 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19515.16 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview2.19515.16 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19515.16 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview2.19514.6 (parent: Microsoft.NetCore.App) - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19515.8 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview2.19515.8 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70b9325ce..e16544a7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 + 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 - + https://github.com/dotnet/core-setup - f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 + 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 - + https://github.com/dotnet/core-setup - f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 + 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 - + https://github.com/dotnet/core-setup - f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 + 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 - + https://github.com/dotnet/core-setup - f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 + 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 - + https://github.com/dotnet/core-setup - f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 + 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 - + https://github.com/dotnet/core-setup - f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 + 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 080eeeb860704f586972f94ac3cabba6f34d08ed + d6156966c01a8a45a069fecdc68c162f94d9d58d https://github.com/aspnet/AspNetCore @@ -85,13 +85,13 @@ 36bd8c868d4bd0ccd643ce27cc05179aff254028 - + https://github.com/dotnet/winforms - 1934207dfd7aa570337791a67e4eeec4f6b82265 + 3886eb2dc8384f5490e289a321707ddc454ec45e - + https://github.com/dotnet/wpf - ea419d76724ac6fd0a4cd731bedba8e3a09c8e43 + 8c5494aa7298e8182ccb4639eb52b002458d0158 diff --git a/eng/Versions.props b/eng/Versions.props index 786234d81..cf2cf939c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19504.1 + 4.8.1-preview1.19515.8 - 3.1.0-preview2.19510.4 + 3.1.0-preview2.19515.8 @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview2.19511.6 - 3.1.0-preview2.19511.6 + 3.1.0-preview2.19515.16 + 3.1.0-preview2.19515.16 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview2.19511.6 - 3.1.0-preview2.19511.6 + 3.1.0-preview2.19515.16 + 3.1.0-preview2.19515.16 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview2.19511.6 + 3.1.0-preview2.19515.16 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview2.19511.6 - 3.1.0-preview2.19511.6 + 3.1.0-preview2.19515.16 + 3.1.0-preview2.19515.16 $(MicrosoftWindowsDesktopAppPackageVersion) From 09d6567e85ca53c9a7f7a001f04500ecf677f7a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 06:56:16 +0000 Subject: [PATCH 160/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5237) * Update dependencies from https://github.com/dotnet/toolset build 20191015.14 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19515.14 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19515.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191015.15 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19515.15 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19515.9 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e16544a7e..d64ba232b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 8ee30306ac5348d7a98a8872e13a0a29ab426b8b + 5408c9880fbe5a38823e1fd730df6157b6a96d29 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 36bd8c868d4bd0ccd643ce27cc05179aff254028 + 676366c557959d002c573887e46f9da4d306fe6e diff --git a/eng/Versions.props b/eng/Versions.props index cf2cf939c..70c36ee4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19515.12 + 3.1.100-preview2.19515.15 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19515.6 + 3.1.100-preview2.19515.9 0.2.0 From 20ff01940b761685559ad87d12d7992d757456e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 08:05:47 +0000 Subject: [PATCH 161/170] Update dependencies from https://github.com/dotnet/toolset build 20191016.1 (#5240) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19516.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19515.10 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d64ba232b..180a2658a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 5408c9880fbe5a38823e1fd730df6157b6a96d29 + a25adb6deaf5be938a181a21f327fdbd7bfcf0c7 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 676366c557959d002c573887e46f9da4d306fe6e + 210eda4a041d2a9dc84c0b0b27669727608065f0 diff --git a/eng/Versions.props b/eng/Versions.props index 70c36ee4f..34659c1d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19515.15 + 3.1.100-preview2.19516.1 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19515.9 + 3.1.100-preview2.19515.10 0.2.0 From 6f7202d895275c4608a29c2ecdf5e0c46e19e0fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 13:05:44 +0000 Subject: [PATCH 162/170] Update dependencies from https://github.com/dotnet/core-setup build 20191016.1 (#5243) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19516.1 - Microsoft.NETCore.App - 3.1.0-preview2.19516.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview2.19516.1 - Microsoft.WindowsDesktop.App - 3.1.0-preview2.19516.1 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19516.1 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview2.19516.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19516.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 180a2658a..8434afad9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a diff --git a/eng/Versions.props b/eng/Versions.props index 34659c1d2..0efcbf930 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview2.19515.16 - 3.1.0-preview2.19515.16 + 3.1.0-preview2.19516.1 + 3.1.0-preview2.19516.1 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview2.19515.16 - 3.1.0-preview2.19515.16 + 3.1.0-preview2.19516.1 + 3.1.0-preview2.19516.1 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview2.19515.16 + 3.1.0-preview2.19516.1 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview2.19515.16 - 3.1.0-preview2.19515.16 + 3.1.0-preview2.19516.1 + 3.1.0-preview2.19516.1 $(MicrosoftWindowsDesktopAppPackageVersion) From 8e00216d4c3a93026506f3ba75145167cbdffdb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 19:38:32 +0000 Subject: [PATCH 163/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5244) * Update dependencies from https://github.com/dotnet/toolset build 20191016.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19516.5 * Update dependencies from https://github.com/dotnet/toolset build 20191016.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19516.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19516.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8434afad9..9ad8ca676 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - a25adb6deaf5be938a181a21f327fdbd7bfcf0c7 + b1a610f7a41f1d494a53ceca71e04733d89115aa https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 210eda4a041d2a9dc84c0b0b27669727608065f0 + 6e4e8182c7a005729b4232b10dda6428c86f40e1 diff --git a/eng/Versions.props b/eng/Versions.props index 0efcbf930..9f63cf56a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19516.1 + 3.1.100-preview2.19516.9 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19515.10 + 3.1.100-preview2.19516.2 0.2.0 From 1150508cc1cd45398d14bd25726363913c53c359 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 23:15:51 +0000 Subject: [PATCH 164/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5248) * Update dependencies from https://github.com/dotnet/toolset build 20191016.16 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19516.16 * Update dependencies from https://github.com/dotnet/toolset build 20191016.17 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19516.17 --- 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 9ad8ca676..bb2ad68d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - b1a610f7a41f1d494a53ceca71e04733d89115aa + c6d46c4650f475d96af4342b217a109b410321b7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9f63cf56a..ff33a2453 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19516.9 + 3.1.100-preview2.19516.17 From c3079ffab5436bbba8a45c0a48b4ff692d7a3505 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 04:35:47 +0000 Subject: [PATCH 165/170] Update dependencies from https://github.com/dotnet/toolset build 20191016.21 (#5255) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19516.21 --- 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 bb2ad68d0..b11348bb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - c6d46c4650f475d96af4342b217a109b410321b7 + 720a03cd44ef592643529b9aeb54c1bc4c3f629b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index ff33a2453..e03531ccd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19516.17 + 3.1.100-preview2.19516.21 From a0d8585d3159cc5498e17a9920e19a2f99f69ada Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 05:30:53 +0000 Subject: [PATCH 166/170] Update dependencies from https://github.com/dotnet/toolset build 20191016.22 (#5258) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19516.22 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19516.7 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b11348bb0..6f88a02aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 720a03cd44ef592643529b9aeb54c1bc4c3f629b + ee44feb9fd48d49d2c6db468b21360298e0a91c5 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 6e4e8182c7a005729b4232b10dda6428c86f40e1 + 9ab8ebd60375c33c2e10399f208eb50de84c4a1f diff --git a/eng/Versions.props b/eng/Versions.props index e03531ccd..ad7aa5c92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19516.21 + 3.1.100-preview2.19516.22 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19516.2 + 3.1.100-preview2.19516.7 0.2.0 From fa24912bf4e83bbaa68d9fa5ad42b292b779b010 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 08:30:39 +0000 Subject: [PATCH 167/170] Update dependencies from https://github.com/dotnet/toolset build 20191017.1 (#5260) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19517.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 6f88a02aa..bfbb8b5b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - ee44feb9fd48d49d2c6db468b21360298e0a91c5 + 30d9a11fb60ad91bf0dc89a0cb5b93f07cfabbaa https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index ad7aa5c92..09f47081a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19516.22 + 3.1.100-preview2.19517.1 From fe70f7c907f1542a80917994be7037826670051f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 10:40:40 +0000 Subject: [PATCH 168/170] Update dependencies from https://github.com/dotnet/toolset build 20191017.2 (#5261) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19517.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19517.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfbb8b5b8..438914015 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 30d9a11fb60ad91bf0dc89a0cb5b93f07cfabbaa + 7f6121051a79b902b8166bc23ccca762ec8c9e8c https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 9ab8ebd60375c33c2e10399f208eb50de84c4a1f + 5363e0119503e08b40eea53ff85b02839a86fa44 diff --git a/eng/Versions.props b/eng/Versions.props index 09f47081a..592750a0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19517.1 + 3.1.100-preview2.19517.2 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19516.7 + 3.1.100-preview2.19517.1 0.2.0 From dfda3722d98146fa20b3ce6dffc33862b1de1084 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 16:20:40 +0000 Subject: [PATCH 169/170] Update dependencies from https://github.com/dotnet/toolset build 20191017.4 (#5266) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19517.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 438914015..4b548a975 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 7f6121051a79b902b8166bc23ccca762ec8c9e8c + b6e9a36966a01a9f49d9c44ac6fd51926b6d5c86 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 592750a0c..4eb2e7939 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19517.2 + 3.1.100-preview2.19517.4 From fd2bcc9a3f419c64756f05f1ffb7cbd4254a8cd8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 21:20:59 +0000 Subject: [PATCH 170/170] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5270) * Update dependencies from https://github.com/dotnet/toolset build 20191017.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19517.8 * Update dependencies from https://github.com/dotnet/toolset build 20191017.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19517.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 4b548a975..7670a3be6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - b6e9a36966a01a9f49d9c44ac6fd51926b6d5c86 + 1dc7bd5eeaebc0176f07957d59ae3a2dcb1632d7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 4eb2e7939..4a1a57f00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19517.4 + 3.1.100-preview2.19517.9