From 66bf831f5b4dacdb2582a934546693f7dce35a60 Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 26 Oct 2020 16:39:42 -0700 Subject: [PATCH 01/64] Update branding 5.0.2xx --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 897ab3c1e..c99d7ce69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,14 +7,14 @@ 5 0 - 1 + 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + preview $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - true + false release From fc1e9110305611099605e8878cdf2d213fdf3e71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Nov 2020 19:05:10 +0000 Subject: [PATCH 02/64] Update dependencies from https://github.com/dotnet/sdk build 20201103.4 (#8995) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rtm.20520.1 to 5.0.0-rtm.20529.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rtm.20519.4 to 5.0.0-rtm.20529.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rtm.20523.6 to 5.0.0-rtm.20529.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.0-rtm.20523.6 to 5.0.0-rtm.20529.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.EntityFrameworkCore: from 5.0.0 to 5.0.0 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - dotnet-dev-certs: from 5.0.0-rtm.20523.6 to 5.0.0-rtm.20529.7 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rtm.20523.6 to 5.0.0-rtm.20529.7 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rtm.20523.6 to 5.0.0-rtm.20529.7 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rtm.20520.1 to 5.0.0-rtm.20529.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rtm.20520.3 to 5.0.0-rtm.20529.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Cli.CommandLine: from 1.0.0-preview.19208.1 to 1.0.0-preview.19208.1 (parent: Microsoft.NET.Sdk) --- NuGet.config | 22 ++++++++++---- eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 3 files changed, 61 insertions(+), 49 deletions(-) diff --git a/NuGet.config b/NuGet.config index 822f50170..110374230 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,12 +6,24 @@ - - - + + + + + + + - - + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 334bccb9f..089821884 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,35 +3,35 @@ https://github.com/dotnet/windowsdesktop - ec2af60c1eb8b2665745750f6445b3ff133178fb + 5848b16d1fc803ea4892692b3b5dd9ee79955428 - + https://github.com/dotnet/windowsdesktop - ec2af60c1eb8b2665745750f6445b3ff133178fb + 5848b16d1fc803ea4892692b3b5dd9ee79955428 https://github.com/dotnet/windowsdesktop - ec2af60c1eb8b2665745750f6445b3ff133178fb + 5848b16d1fc803ea4892692b3b5dd9ee79955428 https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + 7ef6d50b312217d2f7c17b9697891fa8ab98a19d - + https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + 7ef6d50b312217d2f7c17b9697891fa8ab98a19d https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + 7ef6d50b312217d2f7c17b9697891fa8ab98a19d https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + 7ef6d50b312217d2f7c17b9697891fa8ab98a19d https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + 7ef6d50b312217d2f7c17b9697891fa8ab98a19d @@ -41,39 +41,39 @@ https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + 7ef6d50b312217d2f7c17b9697891fa8ab98a19d https://github.com/dotnet/aspnetcore - c15cd69b65a5b999b7c7042c5408c7c3be2ac7e7 + 80f8669450b2b79085d624f81f74c8d7ad5be089 - + https://github.com/dotnet/aspnetcore - c15cd69b65a5b999b7c7042c5408c7c3be2ac7e7 + 80f8669450b2b79085d624f81f74c8d7ad5be089 https://github.com/dotnet/aspnetcore - c15cd69b65a5b999b7c7042c5408c7c3be2ac7e7 + 80f8669450b2b79085d624f81f74c8d7ad5be089 - + https://github.com/dotnet/aspnetcore - c15cd69b65a5b999b7c7042c5408c7c3be2ac7e7 + 80f8669450b2b79085d624f81f74c8d7ad5be089 https://github.com/dotnet/efcore - 73566d1fb936ebccd9e8c476fb286ffd451bdd46 + c57d3d2083c50ed3fa746e55016ce5dc0e863e5b - + https://github.com/dotnet/aspnetcore - c15cd69b65a5b999b7c7042c5408c7c3be2ac7e7 + 80f8669450b2b79085d624f81f74c8d7ad5be089 - + https://github.com/dotnet/aspnetcore - c15cd69b65a5b999b7c7042c5408c7c3be2ac7e7 + 80f8669450b2b79085d624f81f74c8d7ad5be089 - + https://github.com/dotnet/aspnetcore - c15cd69b65a5b999b7c7042c5408c7c3be2ac7e7 + 80f8669450b2b79085d624f81f74c8d7ad5be089 https://github.com/dotnet/test-templates @@ -87,22 +87,22 @@ https://github.com/dotnet/templating 31980633108a1bef00c798136fcd30a873c90fa3 - + https://github.com/dotnet/sdk - 2c9e8d8b135ff8ad9bef9dcf4805c05cbd9cb585 + 18ad595395c424400e46947e6f9ce4d13e9256bb - + https://github.com/dotnet/sdk - 2c9e8d8b135ff8ad9bef9dcf4805c05cbd9cb585 + 18ad595395c424400e46947e6f9ce4d13e9256bb - + https://github.com/dotnet/winforms - 30738f0987bdccb72f705af705521051fe141a46 + 7d4355bb5f5c1f98ded2fb0497f8795cd1b0305f - + https://github.com/dotnet/wpf - 9e81b0885121e9958e48895ae48be9639a396528 + 61553660e51cd7fe9a733d6cdbc20e537710b8a8 https://github.com/dotnet/fsharp @@ -130,7 +130,7 @@ 830c8be45dbbccd411ecf6080abff0c2c98079cf - https://github.com/dotnet/cliCommandLineParser + https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 diff --git a/eng/Versions.props b/eng/Versions.props index c99d7ce69..c30ae2437 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.0-rtm.20520.1 + 5.0.0-rtm.20529.3 - 5.0.0-rtm.20520.3 + 5.0.0-rtm.20529.5 @@ -45,19 +45,19 @@ 5.0.0 5.0.0 - 5.0.0-rtm.20523.6 - 5.0.0-rtm.20523.6 - 5.0.0-rtm.20523.6 - 5.0.0-rtm.20523.6 - 5.0.0-rtm.20523.6 + 5.0.0-rtm.20529.7 + 5.0.0-rtm.20529.7 + 5.0.0-rtm.20529.7 + 5.0.0-rtm.20529.7 + 5.0.0-rtm.20529.7 0.2.0 - 5.0.100-rtm.20526.7 - 5.0.100-rtm.20526.7 + 5.0.200-preview.20553.4 + 5.0.200-preview.20553.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.0-rtm.20519.4 + 5.0.0-rtm.20529.3 5.0.0 5.0.0 5.0.0 @@ -77,7 +77,7 @@ - 5.0.0-rtm.20520.1 + 5.0.0-rtm.20529.4 5.0.0 5.0.0 From ce522fa8575c22780f415f7fbc156485160844f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Nov 2020 22:14:29 +0000 Subject: [PATCH 03/64] Update dependencies from https://github.com/dotnet/sdk build 20201103.7 (#8997) [release/5.0.2xx] Update dependencies from dotnet/sdk --- NuGet.config | 12 ++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 110374230..d376e2811 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,6 +25,18 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 089821884..85c820831 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 31980633108a1bef00c798136fcd30a873c90fa3 - + https://github.com/dotnet/sdk - 18ad595395c424400e46947e6f9ce4d13e9256bb + 2456ed254ca805a436994ed6a8f1f7baf75265bb - + https://github.com/dotnet/sdk - 18ad595395c424400e46947e6f9ce4d13e9256bb + 2456ed254ca805a436994ed6a8f1f7baf75265bb diff --git a/eng/Versions.props b/eng/Versions.props index c30ae2437..8e53c8667 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20553.4 - 5.0.200-preview.20553.4 + 5.0.200-preview.20553.7 + 5.0.200-preview.20553.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 11de31078ef42ee1277b3cc0fbdf0d2064ec4350 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2020 20:26:40 +0000 Subject: [PATCH 04/64] Update dependencies from https://github.com/dotnet/sdk build 20201104.6 (#9009) [release/5.0.2xx] Update dependencies from dotnet/sdk --- NuGet.config | 12 ++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index d376e2811..ed9194f6b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -37,6 +37,18 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85c820831..78368c8a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 31980633108a1bef00c798136fcd30a873c90fa3 - + https://github.com/dotnet/sdk - 2456ed254ca805a436994ed6a8f1f7baf75265bb + c95a06c70008c54aafabb2226d0583cb3c1f6327 - + https://github.com/dotnet/sdk - 2456ed254ca805a436994ed6a8f1f7baf75265bb + c95a06c70008c54aafabb2226d0583cb3c1f6327 diff --git a/eng/Versions.props b/eng/Versions.props index 8e53c8667..8890d305c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20553.7 - 5.0.200-preview.20553.7 + 5.0.200-preview.20554.6 + 5.0.200-preview.20554.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3599b2ecaf60832dccd84efa68b16108ac7ab2e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Nov 2020 00:03:18 +0000 Subject: [PATCH 05/64] Update dependencies from https://github.com/dotnet/sdk build 20201104.9 (#9012) [release/5.0.2xx] Update dependencies from dotnet/sdk --- NuGet.config | 12 ++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index ed9194f6b..55e574443 100644 --- a/NuGet.config +++ b/NuGet.config @@ -49,6 +49,18 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78368c8a8..222710234 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 31980633108a1bef00c798136fcd30a873c90fa3 - + https://github.com/dotnet/sdk - c95a06c70008c54aafabb2226d0583cb3c1f6327 + 18f89e181f7cc6fa3a01c493e208ca348057494e - + https://github.com/dotnet/sdk - c95a06c70008c54aafabb2226d0583cb3c1f6327 + 18f89e181f7cc6fa3a01c493e208ca348057494e diff --git a/eng/Versions.props b/eng/Versions.props index 8890d305c..ef8b11225 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20554.6 - 5.0.200-preview.20554.6 + 5.0.200-preview.20554.9 + 5.0.200-preview.20554.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4e810da96b71f4887e9478636579d1d4081fcedc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Nov 2020 18:52:21 +0000 Subject: [PATCH 06/64] Update dependencies from https://github.com/dotnet/arcade build 20201110.3 (#9039) [release/5.0.2xx] Update dependencies from dotnet/arcade --- NuGet.config | 15 +- eng/Version.Details.xml | 8 +- eng/Versions.props | 2 +- eng/common/build.ps1 | 2 - eng/common/build.sh | 9 +- .../dotnet-install-scripts/dotnet-install.ps1 | 774 ----------- .../dotnet-install-scripts/dotnet-install.sh | 1133 ----------------- .../templates/post-build/post-build.yml | 314 ++--- eng/common/tools.ps1 | 63 +- eng/common/tools.sh | 37 +- global.json | 4 +- 11 files changed, 217 insertions(+), 2144 deletions(-) delete mode 100644 eng/common/dotnet-install-scripts/dotnet-install.ps1 delete mode 100644 eng/common/dotnet-install-scripts/dotnet-install.sh diff --git a/NuGet.config b/NuGet.config index 55e574443..527c2513b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,9 +6,6 @@ - - - @@ -61,6 +58,18 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 222710234..d2ab94b78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - 6813f5aa511a7a4498fa217a54219b5704a01f83 + 6f54e001de0c52e52578e5252cb279f5bc9a2eb6 - + https://github.com/dotnet/arcade - 6813f5aa511a7a4498fa217a54219b5704a01f83 + 6f54e001de0c52e52578e5252cb279f5bc9a2eb6 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ef8b11225..1d9a9614b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.20510.1 + 5.0.0-beta.20560.3 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 1fd7f686f..94a91c081 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -7,7 +7,6 @@ Param( [string] $msbuildEngine = $null, [bool] $warnAsError = $true, [bool] $nodeReuse = $true, - [bool] $useDefaultDotnetInstall = $false, [switch][Alias('r')]$restore, [switch] $deployDeps, [switch][Alias('b')]$build, @@ -66,7 +65,6 @@ function Print-Usage() { Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build" Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." - Write-Host " -useDefaultDotnetInstall Use dotnet-install.* scripts from public location as opposed to from eng common folder" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." diff --git a/eng/common/build.sh b/eng/common/build.sh index 19849adbe..252b63604 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -36,8 +36,6 @@ usage() echo " --prepareMachine Prepare machine for CI run, clean up processes after build" echo " --nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" echo " --warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" - echo " --useDefaultDotnetInstall Use dotnet-install.* scripts from public location as opposed to from eng common folder" - echo "" echo "Command line arguments not listed above are passed thru to msbuild." echo "Arguments can also be passed in with a single hyphen." @@ -80,7 +78,6 @@ prepare_machine=false verbosity='minimal' runtime_source_feed='' runtime_source_feed_key='' -use_default_dotnet_install=false properties='' while [[ $# > 0 ]]; do @@ -159,14 +156,10 @@ while [[ $# > 0 ]]; do runtime_source_feed=$2 shift ;; - -runtimesourcefeedkey) + -runtimesourcefeedkey) runtime_source_feed_key=$2 shift ;; - -usedefaultdotnetinstall) - use_default_dotnet_install=$2 - shift - ;; *) properties="$properties $1" ;; diff --git a/eng/common/dotnet-install-scripts/dotnet-install.ps1 b/eng/common/dotnet-install-scripts/dotnet-install.ps1 deleted file mode 100644 index f63b533f2..000000000 --- a/eng/common/dotnet-install-scripts/dotnet-install.ps1 +++ /dev/null @@ -1,774 +0,0 @@ -# -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. -# - -# Copied from https://dot.net/v1/dotnet-install.ps1 on 8/26/2020 - -<# -.SYNOPSIS - Installs dotnet cli -.DESCRIPTION - Installs dotnet cli. If dotnet installation already exists in the given directory - it will update it only if the requested version differs from the one already installed. -.PARAMETER Channel - Default: LTS - Download from the Channel specified. Possible values: - - Current - most current release - - LTS - most current supported release - - 2-part version in a format A.B - represents a specific release - examples: 2.0, 1.0 - - Branch name - examples: release/2.0.0, Master - Note: The version parameter overrides the channel parameter. -.PARAMETER Version - Default: latest - Represents a build version on specific channel. Possible values: - - latest - most latest build on specific channel - - coherent - most latest coherent build on specific channel - coherent applies only to SDK downloads - - 3-part version in a format A.B.C - represents specific version of build - examples: 2.0.0-preview2-006120, 1.1.0 -.PARAMETER InstallDir - Default: %LocalAppData%\Microsoft\dotnet - Path to where to install dotnet. Note that binaries will be placed directly in a given directory. -.PARAMETER Architecture - Default: - this value represents currently running OS architecture - Architecture of dotnet binaries to be installed. - Possible values are: , amd64, x64, x86, arm64, arm -.PARAMETER SharedRuntime - This parameter is obsolete and may be removed in a future version of this script. - The recommended alternative is '-Runtime dotnet'. - Installs just the shared runtime bits, not the entire SDK. -.PARAMETER Runtime - Installs just a shared runtime, not the entire SDK. - Possible values: - - dotnet - the Microsoft.NETCore.App shared runtime - - aspnetcore - the Microsoft.AspNetCore.App shared runtime - - windowsdesktop - the Microsoft.WindowsDesktop.App shared runtime -.PARAMETER DryRun - If set it will not perform installation but instead display what command line to use to consistently install - currently requested version of dotnet cli. In example if you specify version 'latest' it will display a link - with specific version so that this command can be used deterministicly in a build script. - It also displays binaries location if you prefer to install or download it yourself. -.PARAMETER NoPath - By default this script will set environment variable PATH for the current process to the binaries folder inside installation folder. - If set it will display binaries location but not set any environment variable. -.PARAMETER Verbose - Displays diagnostics information. -.PARAMETER AzureFeed - Default: https://dotnetcli.azureedge.net/dotnet - This parameter typically is not changed by the user. - It allows changing the URL for the Azure feed used by this installer. -.PARAMETER UncachedFeed - This parameter typically is not changed by the user. - It allows changing the URL for the Uncached feed used by this installer. -.PARAMETER FeedCredential - Used as a query string to append to the Azure feed. - It allows changing the URL to use non-public blob storage accounts. -.PARAMETER ProxyAddress - If set, the installer will use the proxy when making web requests -.PARAMETER ProxyUseDefaultCredentials - Default: false - Use default credentials, when using proxy address. -.PARAMETER ProxyBypassList - If set with ProxyAddress, will provide the list of comma separated urls that will bypass the proxy -.PARAMETER SkipNonVersionedFiles - Default: false - Skips installing non-versioned files if they already exist, such as dotnet.exe. -.PARAMETER NoCdn - Disable downloading from the Azure CDN, and use the uncached feed directly. -.PARAMETER JSonFile - Determines the SDK version from a user specified global.json file - Note: global.json must have a value for 'SDK:Version' -#> -[cmdletbinding()] -param( - [string]$Channel="LTS", - [string]$Version="Latest", - [string]$JSonFile, - [string]$InstallDir="", - [string]$Architecture="", - [ValidateSet("dotnet", "aspnetcore", "windowsdesktop", IgnoreCase = $false)] - [string]$Runtime, - [Obsolete("This parameter may be removed in a future version of this script. The recommended alternative is '-Runtime dotnet'.")] - [switch]$SharedRuntime, - [switch]$DryRun, - [switch]$NoPath, - [string]$AzureFeed="https://dotnetcli.azureedge.net/dotnet", - [string]$UncachedFeed="https://dotnetcli.blob.core.windows.net/dotnet", - [string]$FeedCredential, - [string]$ProxyAddress, - [switch]$ProxyUseDefaultCredentials, - [string[]]$ProxyBypassList=@(), - [switch]$SkipNonVersionedFiles, - [switch]$NoCdn -) - -Set-StrictMode -Version Latest -$ErrorActionPreference="Stop" -$ProgressPreference="SilentlyContinue" - -if ($NoCdn) { - $AzureFeed = $UncachedFeed -} - -$BinFolderRelativePath="" - -if ($SharedRuntime -and (-not $Runtime)) { - $Runtime = "dotnet" -} - -# example path with regex: shared/1.0.0-beta-12345/somepath -$VersionRegEx="/\d+\.\d+[^/]+/" -$OverrideNonVersionedFiles = !$SkipNonVersionedFiles - -function Say($str) { - try - { - Write-Host "dotnet-install: $str" - } - catch - { - # Some platforms cannot utilize Write-Host (Azure Functions, for instance). Fall back to Write-Output - Write-Output "dotnet-install: $str" - } -} - -function Say-Verbose($str) { - try - { - Write-Verbose "dotnet-install: $str" - } - catch - { - # Some platforms cannot utilize Write-Verbose (Azure Functions, for instance). Fall back to Write-Output - Write-Output "dotnet-install: $str" - } -} - -function Say-Invocation($Invocation) { - $command = $Invocation.MyCommand; - $args = (($Invocation.BoundParameters.Keys | foreach { "-$_ `"$($Invocation.BoundParameters[$_])`"" }) -join " ") - Say-Verbose "$command $args" -} - -function Invoke-With-Retry([ScriptBlock]$ScriptBlock, [int]$MaxAttempts = 3, [int]$SecondsBetweenAttempts = 1) { - $Attempts = 0 - - while ($true) { - try { - return $ScriptBlock.Invoke() - } - catch { - $Attempts++ - if ($Attempts -lt $MaxAttempts) { - Start-Sleep $SecondsBetweenAttempts - } - else { - throw - } - } - } -} - -function Get-Machine-Architecture() { - Say-Invocation $MyInvocation - - # On PS x86, PROCESSOR_ARCHITECTURE reports x86 even on x64 systems. - # To get the correct architecture, we need to use PROCESSOR_ARCHITEW6432. - # PS x64 doesn't define this, so we fall back to PROCESSOR_ARCHITECTURE. - # Possible values: amd64, x64, x86, arm64, arm - - if( $ENV:PROCESSOR_ARCHITEW6432 -ne $null ) - { - return $ENV:PROCESSOR_ARCHITEW6432 - } - - return $ENV:PROCESSOR_ARCHITECTURE -} - -function Get-CLIArchitecture-From-Architecture([string]$Architecture) { - Say-Invocation $MyInvocation - - switch ($Architecture.ToLower()) { - { $_ -eq "" } { return Get-CLIArchitecture-From-Architecture $(Get-Machine-Architecture) } - { ($_ -eq "amd64") -or ($_ -eq "x64") } { return "x64" } - { $_ -eq "x86" } { return "x86" } - { $_ -eq "arm" } { return "arm" } - { $_ -eq "arm64" } { return "arm64" } - default { throw "Architecture not supported. If you think this is a bug, report it at https://github.com/dotnet/sdk/issues" } - } -} - -# The version text returned from the feeds is a 1-line or 2-line string: -# For the SDK and the dotnet runtime (2 lines): -# Line 1: # commit_hash -# Line 2: # 4-part version -# For the aspnetcore runtime (1 line): -# Line 1: # 4-part version -function Get-Version-Info-From-Version-Text([string]$VersionText) { - Say-Invocation $MyInvocation - - $Data = -split $VersionText - - $VersionInfo = @{ - CommitHash = $(if ($Data.Count -gt 1) { $Data[0] }) - Version = $Data[-1] # last line is always the version number. - } - return $VersionInfo -} - -function Load-Assembly([string] $Assembly) { - try { - Add-Type -Assembly $Assembly | Out-Null - } - catch { - # On Nano Server, Powershell Core Edition is used. Add-Type is unable to resolve base class assemblies because they are not GAC'd. - # Loading the base class assemblies is not unnecessary as the types will automatically get resolved. - } -} - -function GetHTTPResponse([Uri] $Uri) -{ - Invoke-With-Retry( - { - - $HttpClient = $null - - try { - # HttpClient is used vs Invoke-WebRequest in order to support Nano Server which doesn't support the Invoke-WebRequest cmdlet. - Load-Assembly -Assembly System.Net.Http - - if(-not $ProxyAddress) { - try { - # Despite no proxy being explicitly specified, we may still be behind a default proxy - $DefaultProxy = [System.Net.WebRequest]::DefaultWebProxy; - if($DefaultProxy -and (-not $DefaultProxy.IsBypassed($Uri))) { - $ProxyAddress = $DefaultProxy.GetProxy($Uri).OriginalString - $ProxyUseDefaultCredentials = $true - } - } catch { - # Eat the exception and move forward as the above code is an attempt - # at resolving the DefaultProxy that may not have been a problem. - $ProxyAddress = $null - Say-Verbose("Exception ignored: $_.Exception.Message - moving forward...") - } - } - - if($ProxyAddress) { - $HttpClientHandler = New-Object System.Net.Http.HttpClientHandler - $HttpClientHandler.Proxy = New-Object System.Net.WebProxy -Property @{ - Address=$ProxyAddress; - UseDefaultCredentials=$ProxyUseDefaultCredentials; - BypassList = $ProxyBypassList; - } - $HttpClient = New-Object System.Net.Http.HttpClient -ArgumentList $HttpClientHandler - } - else { - - $HttpClient = New-Object System.Net.Http.HttpClient - } - # Default timeout for HttpClient is 100s. For a 50 MB download this assumes 500 KB/s average, any less will time out - # 20 minutes allows it to work over much slower connections. - $HttpClient.Timeout = New-TimeSpan -Minutes 20 - $Response = $HttpClient.GetAsync("${Uri}${FeedCredential}").Result - if (($Response -eq $null) -or (-not ($Response.IsSuccessStatusCode))) { - # The feed credential is potentially sensitive info. Do not log FeedCredential to console output. - $ErrorMsg = "Failed to download $Uri." - if ($Response -ne $null) { - $ErrorMsg += " $Response" - } - - throw $ErrorMsg - } - - return $Response - } - finally { - if ($HttpClient -ne $null) { - $HttpClient.Dispose() - } - } - }) -} - -function Get-Latest-Version-Info([string]$AzureFeed, [string]$Channel, [bool]$Coherent) { - Say-Invocation $MyInvocation - - $VersionFileUrl = $null - if ($Runtime -eq "dotnet") { - $VersionFileUrl = "$UncachedFeed/Runtime/$Channel/latest.version" - } - elseif ($Runtime -eq "aspnetcore") { - $VersionFileUrl = "$UncachedFeed/aspnetcore/Runtime/$Channel/latest.version" - } - # Currently, the WindowsDesktop runtime is manufactured with the .Net core runtime - elseif ($Runtime -eq "windowsdesktop") { - $VersionFileUrl = "$UncachedFeed/Runtime/$Channel/latest.version" - } - elseif (-not $Runtime) { - if ($Coherent) { - $VersionFileUrl = "$UncachedFeed/Sdk/$Channel/latest.coherent.version" - } - else { - $VersionFileUrl = "$UncachedFeed/Sdk/$Channel/latest.version" - } - } - else { - throw "Invalid value for `$Runtime" - } - try { - $Response = GetHTTPResponse -Uri $VersionFileUrl - } - catch { - throw "Could not resolve version information." - } - $StringContent = $Response.Content.ReadAsStringAsync().Result - - switch ($Response.Content.Headers.ContentType) { - { ($_ -eq "application/octet-stream") } { $VersionText = $StringContent } - { ($_ -eq "text/plain") } { $VersionText = $StringContent } - { ($_ -eq "text/plain; charset=UTF-8") } { $VersionText = $StringContent } - default { throw "``$Response.Content.Headers.ContentType`` is an unknown .version file content type." } - } - - $VersionInfo = Get-Version-Info-From-Version-Text $VersionText - - return $VersionInfo -} - -function Parse-Jsonfile-For-Version([string]$JSonFile) { - Say-Invocation $MyInvocation - - If (-Not (Test-Path $JSonFile)) { - throw "Unable to find '$JSonFile'" - } - try { - $JSonContent = Get-Content($JSonFile) -Raw | ConvertFrom-Json | Select-Object -expand "sdk" -ErrorAction SilentlyContinue - } - catch { - throw "Json file unreadable: '$JSonFile'" - } - if ($JSonContent) { - try { - $JSonContent.PSObject.Properties | ForEach-Object { - $PropertyName = $_.Name - if ($PropertyName -eq "version") { - $Version = $_.Value - Say-Verbose "Version = $Version" - } - } - } - catch { - throw "Unable to parse the SDK node in '$JSonFile'" - } - } - else { - throw "Unable to find the SDK node in '$JSonFile'" - } - If ($Version -eq $null) { - throw "Unable to find the SDK:version node in '$JSonFile'" - } - return $Version -} - -function Get-Specific-Version-From-Version([string]$AzureFeed, [string]$Channel, [string]$Version, [string]$JSonFile) { - Say-Invocation $MyInvocation - - if (-not $JSonFile) { - switch ($Version.ToLower()) { - { $_ -eq "latest" } { - $LatestVersionInfo = Get-Latest-Version-Info -AzureFeed $AzureFeed -Channel $Channel -Coherent $False - return $LatestVersionInfo.Version - } - { $_ -eq "coherent" } { - $LatestVersionInfo = Get-Latest-Version-Info -AzureFeed $AzureFeed -Channel $Channel -Coherent $True - return $LatestVersionInfo.Version - } - default { return $Version } - } - } - else { - return Parse-Jsonfile-For-Version $JSonFile - } -} - -function Get-Download-Link([string]$AzureFeed, [string]$SpecificVersion, [string]$CLIArchitecture) { - Say-Invocation $MyInvocation - - # If anything fails in this lookup it will default to $SpecificVersion - $SpecificProductVersion = Get-Product-Version -AzureFeed $AzureFeed -SpecificVersion $SpecificVersion - - if ($Runtime -eq "dotnet") { - $PayloadURL = "$AzureFeed/Runtime/$SpecificVersion/dotnet-runtime-$SpecificProductVersion-win-$CLIArchitecture.zip" - } - elseif ($Runtime -eq "aspnetcore") { - $PayloadURL = "$AzureFeed/aspnetcore/Runtime/$SpecificVersion/aspnetcore-runtime-$SpecificProductVersion-win-$CLIArchitecture.zip" - } - elseif ($Runtime -eq "windowsdesktop") { - $PayloadURL = "$AzureFeed/Runtime/$SpecificVersion/windowsdesktop-runtime-$SpecificProductVersion-win-$CLIArchitecture.zip" - } - elseif (-not $Runtime) { - $PayloadURL = "$AzureFeed/Sdk/$SpecificVersion/dotnet-sdk-$SpecificProductVersion-win-$CLIArchitecture.zip" - } - else { - throw "Invalid value for `$Runtime" - } - - Say-Verbose "Constructed primary named payload URL: $PayloadURL" - - return $PayloadURL, $SpecificProductVersion -} - -function Get-LegacyDownload-Link([string]$AzureFeed, [string]$SpecificVersion, [string]$CLIArchitecture) { - Say-Invocation $MyInvocation - - if (-not $Runtime) { - $PayloadURL = "$AzureFeed/Sdk/$SpecificVersion/dotnet-dev-win-$CLIArchitecture.$SpecificVersion.zip" - } - elseif ($Runtime -eq "dotnet") { - $PayloadURL = "$AzureFeed/Runtime/$SpecificVersion/dotnet-win-$CLIArchitecture.$SpecificVersion.zip" - } - else { - return $null - } - - Say-Verbose "Constructed legacy named payload URL: $PayloadURL" - - return $PayloadURL -} - -function Get-Product-Version([string]$AzureFeed, [string]$SpecificVersion) { - Say-Invocation $MyInvocation - - if ($Runtime -eq "dotnet") { - $ProductVersionTxtURL = "$AzureFeed/Runtime/$SpecificVersion/productVersion.txt" - } - elseif ($Runtime -eq "aspnetcore") { - $ProductVersionTxtURL = "$AzureFeed/aspnetcore/Runtime/$SpecificVersion/productVersion.txt" - } - elseif ($Runtime -eq "windowsdesktop") { - $ProductVersionTxtURL = "$AzureFeed/Runtime/$SpecificVersion/productVersion.txt" - } - elseif (-not $Runtime) { - $ProductVersionTxtURL = "$AzureFeed/Sdk/$SpecificVersion/productVersion.txt" - } - else { - throw "Invalid value specified for `$Runtime" - } - - Say-Verbose "Checking for existence of $ProductVersionTxtURL" - - try { - $productVersionResponse = GetHTTPResponse($productVersionTxtUrl) - - if ($productVersionResponse.StatusCode -eq 200) { - $productVersion = $productVersionResponse.Content.ReadAsStringAsync().Result.Trim() - if ($productVersion -ne $SpecificVersion) - { - Say "Using alternate version $productVersion found in $ProductVersionTxtURL" - } - - return $productVersion - } - else { - Say-Verbose "Got StatusCode $($productVersionResponse.StatusCode) trying to get productVersion.txt at $productVersionTxtUrl, so using default value of $SpecificVersion" - $productVersion = $SpecificVersion - } - } catch { - Say-Verbose "Could not read productVersion.txt at $productVersionTxtUrl, so using default value of $SpecificVersion" - $productVersion = $SpecificVersion - } - - return $productVersion -} - -function Get-User-Share-Path() { - Say-Invocation $MyInvocation - - $InstallRoot = $env:DOTNET_INSTALL_DIR - if (!$InstallRoot) { - $InstallRoot = "$env:LocalAppData\Microsoft\dotnet" - } - return $InstallRoot -} - -function Resolve-Installation-Path([string]$InstallDir) { - Say-Invocation $MyInvocation - - if ($InstallDir -eq "") { - return Get-User-Share-Path - } - return $InstallDir -} - -function Is-Dotnet-Package-Installed([string]$InstallRoot, [string]$RelativePathToPackage, [string]$SpecificVersion) { - Say-Invocation $MyInvocation - - $DotnetPackagePath = Join-Path -Path $InstallRoot -ChildPath $RelativePathToPackage | Join-Path -ChildPath $SpecificVersion - Say-Verbose "Is-Dotnet-Package-Installed: DotnetPackagePath=$DotnetPackagePath" - return Test-Path $DotnetPackagePath -PathType Container -} - -function Get-Absolute-Path([string]$RelativeOrAbsolutePath) { - # Too much spam - # Say-Invocation $MyInvocation - - return $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($RelativeOrAbsolutePath) -} - -function Get-Path-Prefix-With-Version($path) { - $match = [regex]::match($path, $VersionRegEx) - if ($match.Success) { - return $entry.FullName.Substring(0, $match.Index + $match.Length) - } - - return $null -} - -function Get-List-Of-Directories-And-Versions-To-Unpack-From-Dotnet-Package([System.IO.Compression.ZipArchive]$Zip, [string]$OutPath) { - Say-Invocation $MyInvocation - - $ret = @() - foreach ($entry in $Zip.Entries) { - $dir = Get-Path-Prefix-With-Version $entry.FullName - if ($dir -ne $null) { - $path = Get-Absolute-Path $(Join-Path -Path $OutPath -ChildPath $dir) - if (-Not (Test-Path $path -PathType Container)) { - $ret += $dir - } - } - } - - $ret = $ret | Sort-Object | Get-Unique - - $values = ($ret | foreach { "$_" }) -join ";" - Say-Verbose "Directories to unpack: $values" - - return $ret -} - -# Example zip content and extraction algorithm: -# Rule: files if extracted are always being extracted to the same relative path locally -# .\ -# a.exe # file does not exist locally, extract -# b.dll # file exists locally, override only if $OverrideFiles set -# aaa\ # same rules as for files -# ... -# abc\1.0.0\ # directory contains version and exists locally -# ... # do not extract content under versioned part -# abc\asd\ # same rules as for files -# ... -# def\ghi\1.0.1\ # directory contains version and does not exist locally -# ... # extract content -function Extract-Dotnet-Package([string]$ZipPath, [string]$OutPath) { - Say-Invocation $MyInvocation - - Load-Assembly -Assembly System.IO.Compression.FileSystem - Set-Variable -Name Zip - try { - $Zip = [System.IO.Compression.ZipFile]::OpenRead($ZipPath) - - $DirectoriesToUnpack = Get-List-Of-Directories-And-Versions-To-Unpack-From-Dotnet-Package -Zip $Zip -OutPath $OutPath - - foreach ($entry in $Zip.Entries) { - $PathWithVersion = Get-Path-Prefix-With-Version $entry.FullName - if (($PathWithVersion -eq $null) -Or ($DirectoriesToUnpack -contains $PathWithVersion)) { - $DestinationPath = Get-Absolute-Path $(Join-Path -Path $OutPath -ChildPath $entry.FullName) - $DestinationDir = Split-Path -Parent $DestinationPath - $OverrideFiles=$OverrideNonVersionedFiles -Or (-Not (Test-Path $DestinationPath)) - if ((-Not $DestinationPath.EndsWith("\")) -And $OverrideFiles) { - New-Item -ItemType Directory -Force -Path $DestinationDir | Out-Null - [System.IO.Compression.ZipFileExtensions]::ExtractToFile($entry, $DestinationPath, $OverrideNonVersionedFiles) - } - } - } - } - finally { - if ($Zip -ne $null) { - $Zip.Dispose() - } - } -} - -function DownloadFile($Source, [string]$OutPath) { - if ($Source -notlike "http*") { - # Using System.IO.Path.GetFullPath to get the current directory - # does not work in this context - $pwd gives the current directory - if (![System.IO.Path]::IsPathRooted($Source)) { - $Source = $(Join-Path -Path $pwd -ChildPath $Source) - } - $Source = Get-Absolute-Path $Source - Say "Copying file from $Source to $OutPath" - Copy-Item $Source $OutPath - return - } - - $Stream = $null - - try { - $Response = GetHTTPResponse -Uri $Source - $Stream = $Response.Content.ReadAsStreamAsync().Result - $File = [System.IO.File]::Create($OutPath) - $Stream.CopyTo($File) - $File.Close() - } - finally { - if ($Stream -ne $null) { - $Stream.Dispose() - } - } -} - -function Prepend-Sdk-InstallRoot-To-Path([string]$InstallRoot, [string]$BinFolderRelativePath) { - $BinPath = Get-Absolute-Path $(Join-Path -Path $InstallRoot -ChildPath $BinFolderRelativePath) - if (-Not $NoPath) { - $SuffixedBinPath = "$BinPath;" - if (-Not $env:path.Contains($SuffixedBinPath)) { - Say "Adding to current process PATH: `"$BinPath`". Note: This change will not be visible if PowerShell was run as a child process." - $env:path = $SuffixedBinPath + $env:path - } else { - Say-Verbose "Current process PATH already contains `"$BinPath`"" - } - } - else { - Say "Binaries of dotnet can be found in $BinPath" - } -} - -$CLIArchitecture = Get-CLIArchitecture-From-Architecture $Architecture -$SpecificVersion = Get-Specific-Version-From-Version -AzureFeed $AzureFeed -Channel $Channel -Version $Version -JSonFile $JSonFile -$DownloadLink, $EffectiveVersion = Get-Download-Link -AzureFeed $AzureFeed -SpecificVersion $SpecificVersion -CLIArchitecture $CLIArchitecture -$LegacyDownloadLink = Get-LegacyDownload-Link -AzureFeed $AzureFeed -SpecificVersion $SpecificVersion -CLIArchitecture $CLIArchitecture - -$InstallRoot = Resolve-Installation-Path $InstallDir -Say-Verbose "InstallRoot: $InstallRoot" -$ScriptName = $MyInvocation.MyCommand.Name - -if ($DryRun) { - Say "Payload URLs:" - Say "Primary named payload URL: $DownloadLink" - if ($LegacyDownloadLink) { - Say "Legacy named payload URL: $LegacyDownloadLink" - } - $RepeatableCommand = ".\$ScriptName -Version `"$SpecificVersion`" -InstallDir `"$InstallRoot`" -Architecture `"$CLIArchitecture`"" - if ($Runtime -eq "dotnet") { - $RepeatableCommand+=" -Runtime `"dotnet`"" - } - elseif ($Runtime -eq "aspnetcore") { - $RepeatableCommand+=" -Runtime `"aspnetcore`"" - } - foreach ($key in $MyInvocation.BoundParameters.Keys) { - if (-not (@("Architecture","Channel","DryRun","InstallDir","Runtime","SharedRuntime","Version") -contains $key)) { - $RepeatableCommand+=" -$key `"$($MyInvocation.BoundParameters[$key])`"" - } - } - Say "Repeatable invocation: $RepeatableCommand" - exit 0 -} - -if ($Runtime -eq "dotnet") { - $assetName = ".NET Core Runtime" - $dotnetPackageRelativePath = "shared\Microsoft.NETCore.App" -} -elseif ($Runtime -eq "aspnetcore") { - $assetName = "ASP.NET Core Runtime" - $dotnetPackageRelativePath = "shared\Microsoft.AspNetCore.App" -} -elseif ($Runtime -eq "windowsdesktop") { - $assetName = ".NET Core Windows Desktop Runtime" - $dotnetPackageRelativePath = "shared\Microsoft.WindowsDesktop.App" -} -elseif (-not $Runtime) { - $assetName = ".NET Core SDK" - $dotnetPackageRelativePath = "sdk" -} -else { - throw "Invalid value for `$Runtime" -} - -if ($SpecificVersion -ne $EffectiveVersion) -{ - Say "Performing installation checks for effective version: $EffectiveVersion" - $SpecificVersion = $EffectiveVersion -} - -# Check if the SDK version is already installed. -$isAssetInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $SpecificVersion -if ($isAssetInstalled) { - Say "$assetName version $SpecificVersion is already installed." - Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot -BinFolderRelativePath $BinFolderRelativePath - exit 0 -} - -New-Item -ItemType Directory -Force -Path $InstallRoot | Out-Null - -$installDrive = $((Get-Item $InstallRoot).PSDrive.Name); -$diskInfo = Get-PSDrive -Name $installDrive -if ($diskInfo.Free / 1MB -le 100) { - Say "There is not enough disk space on drive ${installDrive}:" - exit 0 -} - -$ZipPath = [System.IO.Path]::combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName()) -Say-Verbose "Zip path: $ZipPath" - -$DownloadFailed = $false -Say "Downloading link: $DownloadLink" -try { - DownloadFile -Source $DownloadLink -OutPath $ZipPath -} -catch { - Say "Cannot download: $DownloadLink" - if ($LegacyDownloadLink) { - $DownloadLink = $LegacyDownloadLink - $ZipPath = [System.IO.Path]::combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName()) - Say-Verbose "Legacy zip path: $ZipPath" - Say "Downloading legacy link: $DownloadLink" - try { - DownloadFile -Source $DownloadLink -OutPath $ZipPath - } - catch { - Say "Cannot download: $DownloadLink" - $DownloadFailed = $true - } - } - else { - $DownloadFailed = $true - } -} - -if ($DownloadFailed) { - throw "Could not find/download: `"$assetName`" with version = $SpecificVersion`nRefer to: https://aka.ms/dotnet-os-lifecycle for information on .NET Core support" -} - -Say "Extracting zip from $DownloadLink" -Extract-Dotnet-Package -ZipPath $ZipPath -OutPath $InstallRoot - -# Check if the SDK version is installed; if not, fail the installation. -$isAssetInstalled = $false - -# if the version contains "RTM" or "servicing"; check if a 'release-type' SDK version is installed. -if ($SpecificVersion -Match "rtm" -or $SpecificVersion -Match "servicing") { - $ReleaseVersion = $SpecificVersion.Split("-")[0] - Say-Verbose "Checking installation: version = $ReleaseVersion" - $isAssetInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $ReleaseVersion -} - -# Check if the SDK version is installed. -if (!$isAssetInstalled) { - Say-Verbose "Checking installation: version = $SpecificVersion" - $isAssetInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $SpecificVersion -} - -if (!$isAssetInstalled) { - throw "`"$assetName`" with version = $SpecificVersion failed to install with an unknown error." -} - -Remove-Item $ZipPath - -Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot -BinFolderRelativePath $BinFolderRelativePath - -Say "Installation finished" -exit 0 \ No newline at end of file diff --git a/eng/common/dotnet-install-scripts/dotnet-install.sh b/eng/common/dotnet-install-scripts/dotnet-install.sh deleted file mode 100644 index 92161141f..000000000 --- a/eng/common/dotnet-install-scripts/dotnet-install.sh +++ /dev/null @@ -1,1133 +0,0 @@ -#!/usr/bin/env bash -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. -# - -# Stop script on NZEC -set -e -# Stop script if unbound variable found (use ${var:-} if intentional) -set -u -# By default cmd1 | cmd2 returns exit code of cmd2 regardless of cmd1 success -# This is causing it to fail -set -o pipefail - -# Use in the the functions: eval $invocation -invocation='say_verbose "Calling: ${yellow:-}${FUNCNAME[0]} ${green:-}$*${normal:-}"' - -# standard output may be used as a return value in the functions -# we need a way to write text on the screen in the functions so that -# it won't interfere with the return value. -# Exposing stream 3 as a pipe to standard output of the script itself -exec 3>&1 - -# Setup some colors to use. These need to work in fairly limited shells, like the Ubuntu Docker container where there are only 8 colors. -# See if stdout is a terminal -if [ -t 1 ] && command -v tput > /dev/null; then - # see if it supports colors - ncolors=$(tput colors) - if [ -n "$ncolors" ] && [ $ncolors -ge 8 ]; then - bold="$(tput bold || echo)" - normal="$(tput sgr0 || echo)" - black="$(tput setaf 0 || echo)" - red="$(tput setaf 1 || echo)" - green="$(tput setaf 2 || echo)" - yellow="$(tput setaf 3 || echo)" - blue="$(tput setaf 4 || echo)" - magenta="$(tput setaf 5 || echo)" - cyan="$(tput setaf 6 || echo)" - white="$(tput setaf 7 || echo)" - fi -fi - -say_warning() { - printf "%b\n" "${yellow:-}dotnet_install: Warning: $1${normal:-}" -} - -say_err() { - printf "%b\n" "${red:-}dotnet_install: Error: $1${normal:-}" >&2 -} - -say() { - # using stream 3 (defined in the beginning) to not interfere with stdout of functions - # which may be used as return value - printf "%b\n" "${cyan:-}dotnet-install:${normal:-} $1" >&3 -} - -say_verbose() { - if [ "$verbose" = true ]; then - say "$1" - fi -} - -# This platform list is finite - if the SDK/Runtime has supported Linux distribution-specific assets, -# then and only then should the Linux distribution appear in this list. -# Adding a Linux distribution to this list does not imply distribution-specific support. -get_legacy_os_name_from_platform() { - eval $invocation - - platform="$1" - case "$platform" in - "centos.7") - echo "centos" - return 0 - ;; - "debian.8") - echo "debian" - return 0 - ;; - "debian.9") - echo "debian.9" - return 0 - ;; - "fedora.23") - echo "fedora.23" - return 0 - ;; - "fedora.24") - echo "fedora.24" - return 0 - ;; - "fedora.27") - echo "fedora.27" - return 0 - ;; - "fedora.28") - echo "fedora.28" - return 0 - ;; - "opensuse.13.2") - echo "opensuse.13.2" - return 0 - ;; - "opensuse.42.1") - echo "opensuse.42.1" - return 0 - ;; - "opensuse.42.3") - echo "opensuse.42.3" - return 0 - ;; - "rhel.7"*) - echo "rhel" - return 0 - ;; - "ubuntu.14.04") - echo "ubuntu" - return 0 - ;; - "ubuntu.16.04") - echo "ubuntu.16.04" - return 0 - ;; - "ubuntu.16.10") - echo "ubuntu.16.10" - return 0 - ;; - "ubuntu.18.04") - echo "ubuntu.18.04" - return 0 - ;; - "alpine.3.4.3") - echo "alpine" - return 0 - ;; - esac - return 1 -} - -get_linux_platform_name() { - eval $invocation - - if [ -n "$runtime_id" ]; then - echo "${runtime_id%-*}" - return 0 - else - if [ -e /etc/os-release ]; then - . /etc/os-release - echo "$ID${VERSION_ID:+.${VERSION_ID}}" - return 0 - elif [ -e /etc/redhat-release ]; then - local redhatRelease=$(&1 || true) | grep -q musl -} - -get_current_os_name() { - eval $invocation - - local uname=$(uname) - if [ "$uname" = "Darwin" ]; then - echo "osx" - return 0 - elif [ "$uname" = "FreeBSD" ]; then - echo "freebsd" - return 0 - elif [ "$uname" = "Linux" ]; then - local linux_platform_name - linux_platform_name="$(get_linux_platform_name)" || { echo "linux" && return 0 ; } - - if [ "$linux_platform_name" = "rhel.6" ]; then - echo $linux_platform_name - return 0 - elif is_musl_based_distro; then - echo "linux-musl" - return 0 - else - echo "linux" - return 0 - fi - fi - - say_err "OS name could not be detected: UName = $uname" - return 1 -} - -get_legacy_os_name() { - eval $invocation - - local uname=$(uname) - if [ "$uname" = "Darwin" ]; then - echo "osx" - return 0 - elif [ -n "$runtime_id" ]; then - echo $(get_legacy_os_name_from_platform "${runtime_id%-*}" || echo "${runtime_id%-*}") - return 0 - else - if [ -e /etc/os-release ]; then - . /etc/os-release - os=$(get_legacy_os_name_from_platform "$ID${VERSION_ID:+.${VERSION_ID}}" || echo "") - if [ -n "$os" ]; then - echo "$os" - return 0 - fi - fi - fi - - say_verbose "Distribution specific OS name and version could not be detected: UName = $uname" - return 1 -} - -machine_has() { - eval $invocation - - hash "$1" > /dev/null 2>&1 - return $? -} - - -check_min_reqs() { - local hasMinimum=false - if machine_has "curl"; then - hasMinimum=true - elif machine_has "wget"; then - hasMinimum=true - fi - - if [ "$hasMinimum" = "false" ]; then - say_err "curl (recommended) or wget are required to download dotnet. Install missing prerequisite to proceed." - return 1 - fi - return 0 -} - -check_pre_reqs() { - eval $invocation - - if [ "${DOTNET_INSTALL_SKIP_PREREQS:-}" = "1" ]; then - return 0 - fi - - if [ "$(uname)" = "Linux" ]; then - if is_musl_based_distro; then - if ! command -v scanelf > /dev/null; then - say_warning "scanelf not found, please install pax-utils package." - return 0 - fi - LDCONFIG_COMMAND="scanelf --ldpath -BF '%f'" - [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libintl)" ] && say_warning "Unable to locate libintl. Probable prerequisite missing; install libintl (or gettext)." - else - if [ ! -x "$(command -v ldconfig)" ]; then - say_verbose "ldconfig is not in PATH, trying /sbin/ldconfig." - LDCONFIG_COMMAND="/sbin/ldconfig" - else - LDCONFIG_COMMAND="ldconfig" - fi - local librarypath=${LD_LIBRARY_PATH:-} - LDCONFIG_COMMAND="$LDCONFIG_COMMAND -NXv ${librarypath//:/ }" - fi - - [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep zlib)" ] && say_warning "Unable to locate zlib. Probable prerequisite missing; install zlib." - [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep ssl)" ] && say_warning "Unable to locate libssl. Probable prerequisite missing; install libssl." - [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libicu)" ] && say_warning "Unable to locate libicu. Probable prerequisite missing; install libicu." - [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep lttng)" ] && say_warning "Unable to locate liblttng. Probable prerequisite missing; install libcurl." - [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libcurl)" ] && say_warning "Unable to locate libcurl. Probable prerequisite missing; install libcurl." - fi - - return 0 -} - -# args: -# input - $1 -to_lowercase() { - #eval $invocation - - echo "$1" | tr '[:upper:]' '[:lower:]' - return 0 -} - -# args: -# input - $1 -remove_trailing_slash() { - #eval $invocation - - local input="${1:-}" - echo "${input%/}" - return 0 -} - -# args: -# input - $1 -remove_beginning_slash() { - #eval $invocation - - local input="${1:-}" - echo "${input#/}" - return 0 -} - -# args: -# root_path - $1 -# child_path - $2 - this parameter can be empty -combine_paths() { - eval $invocation - - # TODO: Consider making it work with any number of paths. For now: - if [ ! -z "${3:-}" ]; then - say_err "combine_paths: Function takes two parameters." - return 1 - fi - - local root_path="$(remove_trailing_slash "$1")" - local child_path="$(remove_beginning_slash "${2:-}")" - say_verbose "combine_paths: root_path=$root_path" - say_verbose "combine_paths: child_path=$child_path" - echo "$root_path/$child_path" - return 0 -} - -get_machine_architecture() { - eval $invocation - - if command -v uname > /dev/null; then - CPUName=$(uname -m) - case $CPUName in - armv7l) - echo "arm" - return 0 - ;; - aarch64) - echo "arm64" - return 0 - ;; - esac - fi - - # Always default to 'x64' - echo "x64" - return 0 -} - -# args: -# architecture - $1 -get_normalized_architecture_from_architecture() { - eval $invocation - - local architecture="$(to_lowercase "$1")" - case "$architecture" in - \) - echo "$(get_normalized_architecture_from_architecture "$(get_machine_architecture)")" - return 0 - ;; - amd64|x64) - echo "x64" - return 0 - ;; - arm) - echo "arm" - return 0 - ;; - arm64) - echo "arm64" - return 0 - ;; - esac - - say_err "Architecture \`$architecture\` not supported. If you think this is a bug, report it at https://github.com/dotnet/sdk/issues" - return 1 -} - -# The version text returned from the feeds is a 1-line or 2-line string: -# For the SDK and the dotnet runtime (2 lines): -# Line 1: # commit_hash -# Line 2: # 4-part version -# For the aspnetcore runtime (1 line): -# Line 1: # 4-part version - -# args: -# version_text - stdin -get_version_from_version_info() { - eval $invocation - - cat | tail -n 1 | sed 's/\r$//' - return 0 -} - -# args: -# install_root - $1 -# relative_path_to_package - $2 -# specific_version - $3 -is_dotnet_package_installed() { - eval $invocation - - local install_root="$1" - local relative_path_to_package="$2" - local specific_version="${3//[$'\t\r\n']}" - - local dotnet_package_path="$(combine_paths "$(combine_paths "$install_root" "$relative_path_to_package")" "$specific_version")" - say_verbose "is_dotnet_package_installed: dotnet_package_path=$dotnet_package_path" - - if [ -d "$dotnet_package_path" ]; then - return 0 - else - return 1 - fi -} - -# args: -# azure_feed - $1 -# channel - $2 -# normalized_architecture - $3 -# coherent - $4 -get_latest_version_info() { - eval $invocation - - local azure_feed="$1" - local channel="$2" - local normalized_architecture="$3" - local coherent="$4" - - local version_file_url=null - if [[ "$runtime" == "dotnet" ]]; then - version_file_url="$uncached_feed/Runtime/$channel/latest.version" - elif [[ "$runtime" == "aspnetcore" ]]; then - version_file_url="$uncached_feed/aspnetcore/Runtime/$channel/latest.version" - elif [ -z "$runtime" ]; then - if [ "$coherent" = true ]; then - version_file_url="$uncached_feed/Sdk/$channel/latest.coherent.version" - else - version_file_url="$uncached_feed/Sdk/$channel/latest.version" - fi - else - say_err "Invalid value for \$runtime" - return 1 - fi - say_verbose "get_latest_version_info: latest url: $version_file_url" - - download "$version_file_url" - return $? -} - -# args: -# json_file - $1 -parse_jsonfile_for_version() { - eval $invocation - - local json_file="$1" - if [ ! -f "$json_file" ]; then - say_err "Unable to find \`$json_file\`" - return 1 - fi - - sdk_section=$(cat $json_file | awk '/"sdk"/,/}/') - if [ -z "$sdk_section" ]; then - say_err "Unable to parse the SDK node in \`$json_file\`" - return 1 - fi - - sdk_list=$(echo $sdk_section | awk -F"[{}]" '{print $2}') - sdk_list=${sdk_list//[\" ]/} - sdk_list=${sdk_list//,/$'\n'} - sdk_list="$(echo -e "${sdk_list}" | tr -d '[[:space:]]')" - - local version_info="" - while read -r line; do - IFS=: - while read -r key value; do - if [[ "$key" == "version" ]]; then - version_info=$value - fi - done <<< "$line" - done <<< "$sdk_list" - if [ -z "$version_info" ]; then - say_err "Unable to find the SDK:version node in \`$json_file\`" - return 1 - fi - - unset IFS; - echo "$version_info" - return 0 -} - -# args: -# azure_feed - $1 -# channel - $2 -# normalized_architecture - $3 -# version - $4 -# json_file - $5 -get_specific_version_from_version() { - eval $invocation - - local azure_feed="$1" - local channel="$2" - local normalized_architecture="$3" - local version="$(to_lowercase "$4")" - local json_file="$5" - - if [ -z "$json_file" ]; then - case "$version" in - latest) - local version_info - version_info="$(get_latest_version_info "$azure_feed" "$channel" "$normalized_architecture" false)" || return 1 - say_verbose "get_specific_version_from_version: version_info=$version_info" - echo "$version_info" | get_version_from_version_info - return 0 - ;; - coherent) - local version_info - version_info="$(get_latest_version_info "$azure_feed" "$channel" "$normalized_architecture" true)" || return 1 - say_verbose "get_specific_version_from_version: version_info=$version_info" - echo "$version_info" | get_version_from_version_info - return 0 - ;; - *) - echo "$version" - return 0 - ;; - esac - else - local version_info - version_info="$(parse_jsonfile_for_version "$json_file")" || return 1 - echo "$version_info" - return 0 - fi -} - -# args: -# azure_feed - $1 -# channel - $2 -# normalized_architecture - $3 -# specific_version - $4 -construct_download_link() { - eval $invocation - - local azure_feed="$1" - local channel="$2" - local normalized_architecture="$3" - local specific_version="${4//[$'\t\r\n']}" - local specific_product_version="$(get_specific_product_version "$1" "$4")" - - local osname - osname="$(get_current_os_name)" || return 1 - - local download_link=null - if [[ "$runtime" == "dotnet" ]]; then - download_link="$azure_feed/Runtime/$specific_version/dotnet-runtime-$specific_product_version-$osname-$normalized_architecture.tar.gz" - elif [[ "$runtime" == "aspnetcore" ]]; then - download_link="$azure_feed/aspnetcore/Runtime/$specific_version/aspnetcore-runtime-$specific_product_version-$osname-$normalized_architecture.tar.gz" - elif [ -z "$runtime" ]; then - download_link="$azure_feed/Sdk/$specific_version/dotnet-sdk-$specific_product_version-$osname-$normalized_architecture.tar.gz" - else - return 1 - fi - - echo "$download_link" - return 0 -} - -# args: -# azure_feed - $1 -# specific_version - $2 -get_specific_product_version() { - # If we find a 'productVersion.txt' at the root of any folder, we'll use its contents - # to resolve the version of what's in the folder, superseding the specified version. - eval $invocation - - local azure_feed="$1" - local specific_version="${2//[$'\t\r\n']}" - local specific_product_version=$specific_version - - local download_link=null - if [[ "$runtime" == "dotnet" ]]; then - download_link="$azure_feed/Runtime/$specific_version/productVersion.txt${feed_credential}" - elif [[ "$runtime" == "aspnetcore" ]]; then - download_link="$azure_feed/aspnetcore/Runtime/$specific_version/productVersion.txt${feed_credential}" - elif [ -z "$runtime" ]; then - download_link="$azure_feed/Sdk/$specific_version/productVersion.txt${feed_credential}" - else - return 1 - fi - - specific_product_version=$(curl -s --fail "$download_link") - if [ $? -ne 0 ] - then - specific_product_version=$(wget -qO- "$download_link") - if [ $? -ne 0 ] - then - specific_product_version=$specific_version - fi - fi - specific_product_version="${specific_product_version//[$'\t\r\n']}" - - echo "$specific_product_version" - return 0 -} - -# args: -# azure_feed - $1 -# channel - $2 -# normalized_architecture - $3 -# specific_version - $4 -construct_legacy_download_link() { - eval $invocation - - local azure_feed="$1" - local channel="$2" - local normalized_architecture="$3" - local specific_version="${4//[$'\t\r\n']}" - - local distro_specific_osname - distro_specific_osname="$(get_legacy_os_name)" || return 1 - - local legacy_download_link=null - if [[ "$runtime" == "dotnet" ]]; then - legacy_download_link="$azure_feed/Runtime/$specific_version/dotnet-$distro_specific_osname-$normalized_architecture.$specific_version.tar.gz" - elif [ -z "$runtime" ]; then - legacy_download_link="$azure_feed/Sdk/$specific_version/dotnet-dev-$distro_specific_osname-$normalized_architecture.$specific_version.tar.gz" - else - return 1 - fi - - echo "$legacy_download_link" - return 0 -} - -get_user_install_path() { - eval $invocation - - if [ ! -z "${DOTNET_INSTALL_DIR:-}" ]; then - echo "$DOTNET_INSTALL_DIR" - else - echo "$HOME/.dotnet" - fi - return 0 -} - -# args: -# install_dir - $1 -resolve_installation_path() { - eval $invocation - - local install_dir=$1 - if [ "$install_dir" = "" ]; then - local user_install_path="$(get_user_install_path)" - say_verbose "resolve_installation_path: user_install_path=$user_install_path" - echo "$user_install_path" - return 0 - fi - - echo "$install_dir" - return 0 -} - -# args: -# relative_or_absolute_path - $1 -get_absolute_path() { - eval $invocation - - local relative_or_absolute_path=$1 - echo "$(cd "$(dirname "$1")" && pwd -P)/$(basename "$1")" - return 0 -} - -# args: -# input_files - stdin -# root_path - $1 -# out_path - $2 -# override - $3 -copy_files_or_dirs_from_list() { - eval $invocation - - local root_path="$(remove_trailing_slash "$1")" - local out_path="$(remove_trailing_slash "$2")" - local override="$3" - local osname="$(get_current_os_name)" - local override_switch=$( - if [ "$override" = false ]; then - if [ "$osname" = "linux-musl" ]; then - printf -- "-u"; - else - printf -- "-n"; - fi - fi) - - cat | uniq | while read -r file_path; do - local path="$(remove_beginning_slash "${file_path#$root_path}")" - local target="$out_path/$path" - if [ "$override" = true ] || (! ([ -d "$target" ] || [ -e "$target" ])); then - mkdir -p "$out_path/$(dirname "$path")" - if [ -d "$target" ]; then - rm -rf "$target" - fi - cp -R $override_switch "$root_path/$path" "$target" - fi - done -} - -# args: -# zip_path - $1 -# out_path - $2 -extract_dotnet_package() { - eval $invocation - - local zip_path="$1" - local out_path="$2" - - local temp_out_path="$(mktemp -d "$temporary_file_template")" - - local failed=false - tar -xzf "$zip_path" -C "$temp_out_path" > /dev/null || failed=true - - local folders_with_version_regex='^.*/[0-9]+\.[0-9]+[^/]+/' - find "$temp_out_path" -type f | grep -Eo "$folders_with_version_regex" | sort | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" false - find "$temp_out_path" -type f | grep -Ev "$folders_with_version_regex" | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" "$override_non_versioned_files" - - rm -rf "$temp_out_path" - - if [ "$failed" = true ]; then - say_err "Extraction failed" - return 1 - fi -} - -# args: -# remote_path - $1 -# [out_path] - $2 - stdout if not provided -download() { - eval $invocation - - local remote_path="$1" - local out_path="${2:-}" - - if [[ "$remote_path" != "http"* ]]; then - cp "$remote_path" "$out_path" - return $? - fi - - local failed=false - if machine_has "curl"; then - downloadcurl "$remote_path" "$out_path" || failed=true - elif machine_has "wget"; then - downloadwget "$remote_path" "$out_path" || failed=true - else - failed=true - fi - if [ "$failed" = true ]; then - say_verbose "Download failed: $remote_path" - return 1 - fi - return 0 -} - -downloadcurl() { - eval $invocation - local remote_path="$1" - local out_path="${2:-}" - - # Append feed_credential as late as possible before calling curl to avoid logging feed_credential - remote_path="${remote_path}${feed_credential}" - - local curl_options="--retry 20 --retry-delay 2 --connect-timeout 15 -sSL -f --create-dirs " - local failed=false - if [ -z "$out_path" ]; then - curl $curl_options "$remote_path" || failed=true - else - curl $curl_options -o "$out_path" "$remote_path" || failed=true - fi - if [ "$failed" = true ]; then - say_verbose "Curl download failed" - return 1 - fi - return 0 -} - -downloadwget() { - eval $invocation - local remote_path="$1" - local out_path="${2:-}" - - # Append feed_credential as late as possible before calling wget to avoid logging feed_credential - remote_path="${remote_path}${feed_credential}" - local wget_options="--tries 20 --waitretry 2 --connect-timeout 15 " - local failed=false - if [ -z "$out_path" ]; then - wget -q $wget_options -O - "$remote_path" || failed=true - else - wget $wget_options -O "$out_path" "$remote_path" || failed=true - fi - if [ "$failed" = true ]; then - say_verbose "Wget download failed" - return 1 - fi - return 0 -} - -calculate_vars() { - eval $invocation - valid_legacy_download_link=true - - normalized_architecture="$(get_normalized_architecture_from_architecture "$architecture")" - say_verbose "normalized_architecture=$normalized_architecture" - - specific_version="$(get_specific_version_from_version "$azure_feed" "$channel" "$normalized_architecture" "$version" "$json_file")" - specific_product_version="$(get_specific_product_version "$azure_feed" "$specific_version")" - say_verbose "specific_version=$specific_version" - if [ -z "$specific_version" ]; then - say_err "Could not resolve version information." - return 1 - fi - - download_link="$(construct_download_link "$azure_feed" "$channel" "$normalized_architecture" "$specific_version")" - say_verbose "Constructed primary named payload URL: $download_link" - - legacy_download_link="$(construct_legacy_download_link "$azure_feed" "$channel" "$normalized_architecture" "$specific_version")" || valid_legacy_download_link=false - - if [ "$valid_legacy_download_link" = true ]; then - say_verbose "Constructed legacy named payload URL: $legacy_download_link" - else - say_verbose "Cound not construct a legacy_download_link; omitting..." - fi - - install_root="$(resolve_installation_path "$install_dir")" - say_verbose "InstallRoot: $install_root" -} - -install_dotnet() { - eval $invocation - local download_failed=false - local asset_name='' - local asset_relative_path='' - - if [[ "$runtime" == "dotnet" ]]; then - asset_relative_path="shared/Microsoft.NETCore.App" - asset_name=".NET Core Runtime" - elif [[ "$runtime" == "aspnetcore" ]]; then - asset_relative_path="shared/Microsoft.AspNetCore.App" - asset_name="ASP.NET Core Runtime" - elif [ -z "$runtime" ]; then - asset_relative_path="sdk" - asset_name=".NET Core SDK" - else - say_err "Invalid value for \$runtime" - return 1 - fi - - # Check if the SDK version is already installed. - if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$specific_version"; then - say "$asset_name version $specific_version is already installed." - return 0 - fi - - mkdir -p "$install_root" - zip_path="$(mktemp "$temporary_file_template")" - say_verbose "Zip path: $zip_path" - - say "Downloading link: $download_link" - - # Failures are normal in the non-legacy case for ultimately legacy downloads. - # Do not output to stderr, since output to stderr is considered an error. - download "$download_link" "$zip_path" 2>&1 || download_failed=true - - # if the download fails, download the legacy_download_link - if [ "$download_failed" = true ]; then - say "Cannot download: $download_link" - - if [ "$valid_legacy_download_link" = true ]; then - download_failed=false - download_link="$legacy_download_link" - zip_path="$(mktemp "$temporary_file_template")" - say_verbose "Legacy zip path: $zip_path" - say "Downloading legacy link: $download_link" - download "$download_link" "$zip_path" 2>&1 || download_failed=true - - if [ "$download_failed" = true ]; then - say "Cannot download: $download_link" - fi - fi - fi - - if [ "$download_failed" = true ]; then - say_err "Could not find/download: \`$asset_name\` with version = $specific_version" - say_err "Refer to: https://aka.ms/dotnet-os-lifecycle for information on .NET Core support" - return 1 - fi - - say "Extracting zip from $download_link" - extract_dotnet_package "$zip_path" "$install_root" - - # Check if the SDK version is installed; if not, fail the installation. - # if the version contains "RTM" or "servicing"; check if a 'release-type' SDK version is installed. - if [[ $specific_version == *"rtm"* || $specific_version == *"servicing"* ]]; then - IFS='-' - read -ra verArr <<< "$specific_version" - release_version="${verArr[0]}" - unset IFS; - say_verbose "Checking installation: version = $release_version" - if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$release_version"; then - return 0 - fi - fi - - # Check if the standard SDK version is installed. - say_verbose "Checking installation: version = $specific_product_version" - if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$specific_product_version"; then - return 0 - fi - - say_err "\`$asset_name\` with version = $specific_product_version failed to install with an unknown error." - return 1 -} - -args=("$@") - -local_version_file_relative_path="/.version" -bin_folder_relative_path="" -temporary_file_template="${TMPDIR:-/tmp}/dotnet.XXXXXXXXX" - -channel="LTS" -version="Latest" -json_file="" -install_dir="" -architecture="" -dry_run=false -no_path=false -no_cdn=false -azure_feed="https://dotnetcli.azureedge.net/dotnet" -uncached_feed="https://dotnetcli.blob.core.windows.net/dotnet" -feed_credential="" -verbose=false -runtime="" -runtime_id="" -override_non_versioned_files=true -non_dynamic_parameters="" - -while [ $# -ne 0 ] -do - name="$1" - case "$name" in - -c|--channel|-[Cc]hannel) - shift - channel="$1" - ;; - -v|--version|-[Vv]ersion) - shift - version="$1" - ;; - -i|--install-dir|-[Ii]nstall[Dd]ir) - shift - install_dir="$1" - ;; - --arch|--architecture|-[Aa]rch|-[Aa]rchitecture) - shift - architecture="$1" - ;; - --shared-runtime|-[Ss]hared[Rr]untime) - say_warning "The --shared-runtime flag is obsolete and may be removed in a future version of this script. The recommended usage is to specify '--runtime dotnet'." - if [ -z "$runtime" ]; then - runtime="dotnet" - fi - ;; - --runtime|-[Rr]untime) - shift - runtime="$1" - if [[ "$runtime" != "dotnet" ]] && [[ "$runtime" != "aspnetcore" ]]; then - say_err "Unsupported value for --runtime: '$1'. Valid values are 'dotnet' and 'aspnetcore'." - if [[ "$runtime" == "windowsdesktop" ]]; then - say_err "WindowsDesktop archives are manufactured for Windows platforms only." - fi - exit 1 - fi - ;; - --dry-run|-[Dd]ry[Rr]un) - dry_run=true - ;; - --no-path|-[Nn]o[Pp]ath) - no_path=true - non_dynamic_parameters+=" $name" - ;; - --verbose|-[Vv]erbose) - verbose=true - non_dynamic_parameters+=" $name" - ;; - --no-cdn|-[Nn]o[Cc]dn) - no_cdn=true - non_dynamic_parameters+=" $name" - ;; - --azure-feed|-[Aa]zure[Ff]eed) - shift - azure_feed="$1" - non_dynamic_parameters+=" $name "\""$1"\""" - ;; - --uncached-feed|-[Uu]ncached[Ff]eed) - shift - uncached_feed="$1" - non_dynamic_parameters+=" $name "\""$1"\""" - ;; - --feed-credential|-[Ff]eed[Cc]redential) - shift - feed_credential="$1" - non_dynamic_parameters+=" $name "\""$1"\""" - ;; - --runtime-id|-[Rr]untime[Ii]d) - shift - runtime_id="$1" - non_dynamic_parameters+=" $name "\""$1"\""" - ;; - --jsonfile|-[Jj][Ss]on[Ff]ile) - shift - json_file="$1" - ;; - --skip-non-versioned-files|-[Ss]kip[Nn]on[Vv]ersioned[Ff]iles) - override_non_versioned_files=false - non_dynamic_parameters+=" $name" - ;; - -?|--?|-h|--help|-[Hh]elp) - script_name="$(basename "$0")" - echo ".NET Tools Installer" - echo "Usage: $script_name [-c|--channel ] [-v|--version ] [-p|--prefix ]" - echo " $script_name -h|-?|--help" - echo "" - echo "$script_name is a simple command line interface for obtaining dotnet cli." - echo "" - echo "Options:" - echo " -c,--channel Download from the channel specified, Defaults to \`$channel\`." - echo " -Channel" - echo " Possible values:" - echo " - Current - most current release" - echo " - LTS - most current supported release" - echo " - 2-part version in a format A.B - represents a specific release" - echo " examples: 2.0; 1.0" - echo " - Branch name" - echo " examples: release/2.0.0; Master" - echo " Note: The version parameter overrides the channel parameter." - echo " -v,--version Use specific VERSION, Defaults to \`$version\`." - echo " -Version" - echo " Possible values:" - echo " - latest - most latest build on specific channel" - echo " - coherent - most latest coherent build on specific channel" - echo " coherent applies only to SDK downloads" - echo " - 3-part version in a format A.B.C - represents specific version of build" - echo " examples: 2.0.0-preview2-006120; 1.1.0" - echo " -i,--install-dir Install under specified location (see Install Location below)" - echo " -InstallDir" - echo " --architecture Architecture of dotnet binaries to be installed, Defaults to \`$architecture\`." - echo " --arch,-Architecture,-Arch" - echo " Possible values: x64, arm, and arm64" - echo " --runtime Installs a shared runtime only, without the SDK." - echo " -Runtime" - echo " Possible values:" - echo " - dotnet - the Microsoft.NETCore.App shared runtime" - echo " - aspnetcore - the Microsoft.AspNetCore.App shared runtime" - echo " --dry-run,-DryRun Do not perform installation. Display download link." - echo " --no-path, -NoPath Do not set PATH for the current process." - echo " --verbose,-Verbose Display diagnostics information." - echo " --azure-feed,-AzureFeed Azure feed location. Defaults to $azure_feed, This parameter typically is not changed by the user." - echo " --uncached-feed,-UncachedFeed Uncached feed location. This parameter typically is not changed by the user." - echo " --feed-credential,-FeedCredential Azure feed shared access token. This parameter typically is not specified." - echo " --skip-non-versioned-files Skips non-versioned files if they already exist, such as the dotnet executable." - echo " -SkipNonVersionedFiles" - echo " --no-cdn,-NoCdn Disable downloading from the Azure CDN, and use the uncached feed directly." - echo " --jsonfile Determines the SDK version from a user specified global.json file." - echo " Note: global.json must have a value for 'SDK:Version'" - echo " --runtime-id Installs the .NET Tools for the given platform (use linux-x64 for portable linux)." - echo " -RuntimeId" - echo " -?,--?,-h,--help,-Help Shows this help message" - echo "" - echo "Obsolete parameters:" - echo " --shared-runtime The recommended alternative is '--runtime dotnet'." - echo " This parameter is obsolete and may be removed in a future version of this script." - echo " Installs just the shared runtime bits, not the entire SDK." - echo "" - echo "Install Location:" - echo " Location is chosen in following order:" - echo " - --install-dir option" - echo " - Environmental variable DOTNET_INSTALL_DIR" - echo " - $HOME/.dotnet" - exit 0 - ;; - *) - say_err "Unknown argument \`$name\`" - exit 1 - ;; - esac - - shift -done - -if [ "$no_cdn" = true ]; then - azure_feed="$uncached_feed" -fi - -check_min_reqs -calculate_vars -script_name=$(basename "$0") - -if [ "$dry_run" = true ]; then - say "Payload URLs:" - say "Primary named payload URL: $download_link" - if [ "$valid_legacy_download_link" = true ]; then - say "Legacy named payload URL: $legacy_download_link" - fi - repeatable_command="./$script_name --version "\""$specific_version"\"" --install-dir "\""$install_root"\"" --architecture "\""$normalized_architecture"\""" - if [[ "$runtime" == "dotnet" ]]; then - repeatable_command+=" --runtime "\""dotnet"\""" - elif [[ "$runtime" == "aspnetcore" ]]; then - repeatable_command+=" --runtime "\""aspnetcore"\""" - fi - repeatable_command+="$non_dynamic_parameters" - say "Repeatable invocation: $repeatable_command" - exit 0 -fi - -check_pre_reqs -install_dotnet - -bin_path="$(get_absolute_path "$(combine_paths "$install_root" "$bin_folder_relative_path")")" -if [ "$no_path" = false ]; then - say "Adding to current process PATH: \`$bin_path\`. Note: This change will be visible only when sourcing script." - export PATH="$bin_path":"$PATH" -else - say "Binaries of dotnet can be found in $bin_path" -fi - -say "Installation finished successfully." diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 0854e4896..761fb1a29 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -67,176 +67,180 @@ parameters: VSMasterChannelId: 1012 stages: -- stage: Validate - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Validate Build Assets - variables: - - template: common-variables.yml - jobs: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}: - - job: - displayName: Post-build Checks - dependsOn: setupMaestroVars - variables: - - name: TargetChannels - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'] ] - pool: - vmImage: 'windows-2019' - steps: - - task: PowerShell@2 - displayName: Maestro Channels Consistency - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 - arguments: -PromoteToChannels "$(TargetChannels)" - -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.Net5RC2ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}} - - - job: - displayName: NuGet Validation - dependsOn: setupMaestroVars - condition: eq( ${{ parameters.enableNugetValidation }}, 'true') - pool: - vmImage: 'windows-2019' - variables: - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - - - job: - displayName: Signing Validation - dependsOn: setupMaestroVars - condition: eq( ${{ parameters.enableSigningValidation }}, 'true') +- ${{ if or(and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')), eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + - stage: Validate + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Validate Build Assets variables: - template: common-variables.yml - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - pool: - vmImage: 'windows-2019' - steps: - - ${{ if eq(parameters.useBuildManifest, true) }}: + jobs: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}: + - job: + displayName: Post-build Checks + dependsOn: setupMaestroVars + variables: + - name: TargetChannels + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'] ] + pool: + vmImage: 'windows-2019' + steps: + - task: PowerShell@2 + displayName: Maestro Channels Consistency + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 + arguments: -PromoteToChannels "$(TargetChannels)" + -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.Net5RC2ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}} + + - job: + displayName: NuGet Validation + dependsOn: setupMaestroVars + condition: eq( ${{ parameters.enableNugetValidation }}, 'true') + pool: + vmImage: 'windows-2019' + variables: + - name: AzDOProjectName + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] + - name: AzDOPipelineId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] + - name: AzDOBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] + steps: - task: DownloadBuildArtifacts@0 - displayName: Download build manifest + displayName: Download Package Artifacts inputs: buildType: specific buildVersionToDownload: specific project: $(AzDOProjectName) pipeline: $(AzDOPipelineId) buildId: $(AzDOBuildId) - artifactName: BuildManifests - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts + artifactName: PackageArtifacts - # This is necessary whenever we want to publish/restore to an AzDO private feed - # Since sdk-task.ps1 tries to restore packages we need to do this authentication here - # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - # Signing validation will optionally work with the buildmanifest file which is downloaded from - # Azure DevOps above. - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' - ${{ parameters.signingValidationAdditionalParameters }} - - - template: ../steps/publish-logs.yml - parameters: - StageLabel: 'Validation' - JobLabel: 'Signing' - - - job: - displayName: SourceLink Validation - dependsOn: setupMaestroVars - condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') - variables: - - template: common-variables.yml - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - continueOnError: true - - - template: /eng/common/templates/job/execute-sdl.yml - parameters: - enable: ${{ parameters.SDLValidationParameters.enable }} + - job: + displayName: Signing Validation dependsOn: setupMaestroVars - additionalParameters: ${{ parameters.SDLValidationParameters.params }} - continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} - artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} - downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }} + condition: eq( ${{ parameters.enableSigningValidation }}, 'true') + variables: + - template: common-variables.yml + - name: AzDOProjectName + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] + - name: AzDOPipelineId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] + - name: AzDOBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] + pool: + vmImage: 'windows-2019' + steps: + - ${{ if eq(parameters.useBuildManifest, true) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download build manifest + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BuildManifests + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: ../steps/publish-logs.yml + parameters: + StageLabel: 'Validation' + JobLabel: 'Signing' + + - job: + displayName: SourceLink Validation + dependsOn: setupMaestroVars + condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') + variables: + - template: common-variables.yml + - name: AzDOProjectName + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] + - name: AzDOPipelineId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] + - name: AzDOBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true + + - template: /eng/common/templates/job/execute-sdl.yml + parameters: + enable: ${{ parameters.SDLValidationParameters.enable }} + dependsOn: setupMaestroVars + additionalParameters: ${{ parameters.SDLValidationParameters.params }} + continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} + artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} + downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }} - ${{ if or(ge(parameters.publishingInfraVersion, 3), eq(parameters.inline, 'false')) }}: - stage: publish_using_darc - dependsOn: Validate + ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: Validate + ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: ${{ parameters.validateDependsOn }} displayName: Publish using Darc variables: - template: common-variables.yml diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9014e0625..60eb601c8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -62,10 +62,6 @@ $ErrorActionPreference = 'Stop' # Base-64 encoded SAS token that has permission to storage container described by $runtimeSourceFeed [string]$runtimeSourceFeedKey = if (Test-Path variable:runtimeSourceFeedKey) { $runtimeSourceFeedKey } else { $null } -# If false, use copy of dotnet-install from /eng/common/dotnet-install-scripts (for custom behaviors). -# otherwise will fetch from public location. -[bool]$useDefaultDotnetInstall = if (Test-Path variable:useDefaultDotnetInstall) { $useDefaultDotnetInstall } else { $false } - function Create-Directory ([string[]] $path) { New-Item -Path $path -Force -ItemType 'Directory' | Out-Null } @@ -197,46 +193,37 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { function GetDotNetInstallScript([string] $dotnetRoot) { $installScript = Join-Path $dotnetRoot 'dotnet-install.ps1' if (!(Test-Path $installScript)) { - create-directory $dotnetroot + Create-Directory $dotnetRoot + $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - if ($useDefaultDotnetInstall) - { - $progresspreference = 'silentlycontinue' # don't display the console progress ui - it's a huge perf hit + $maxRetries = 5 + $retries = 1 - $maxretries = 5 - $retries = 1 + $uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" - $uri = "https://dot.net/$dotnetinstallscriptversion/dotnet-install.ps1" - - while($true) { - try { - write-host "get $uri" - invoke-webrequest $uri -outfile $installscript - break - } - catch { - write-host "failed to download '$uri'" - write-error $_.exception.message -erroraction continue - } - - if (++$retries -le $maxretries) { - $delayinseconds = [math]::pow(2, $retries) - 1 # exponential backoff - write-host "retrying. waiting for $delayinseconds seconds before next attempt ($retries of $maxretries)." - start-sleep -seconds $delayinseconds - } - else { - throw "unable to download file in $maxretries attempts." - } + while($true) { + try { + Write-Host "GET $uri" + Invoke-WebRequest $uri -OutFile $installScript + break } - } - else - { - # Use a special version of the script from eng/common that understands the existence of a "productVersion.txt" in a dotnet path. - # See https://github.com/dotnet/arcade/issues/6047 for details - $engCommonCopy = Resolve-Path (Join-Path $PSScriptRoot 'dotnet-install-scripts\dotnet-install.ps1') - Copy-Item $engCommonCopy -Destination $installScript -Force + catch { + Write-Host "Failed to download '$uri'" + Write-Error $_.Exception.Message -ErrorAction Continue + } + + if (++$retries -le $maxRetries) { + $delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff + Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)." + Start-Sleep -Seconds $delayInSeconds + } + else { + throw "Unable to download file in $maxRetries attempts." + } + } } + return $installScript } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index b5d63cb1b..98186e784 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -68,10 +68,6 @@ fi runtime_source_feed=${runtime_source_feed:-''} runtime_source_feed_key=${runtime_source_feed_key:-''} -# Determines if dotnet-install.sh comes from the eng/common folder or the internet -# (default = public version) -use_default_dotnet_install=${use_default_dotnet_install:-false} - # Resolve any symlinks in the given path. function ResolvePath { local path=$1 @@ -271,30 +267,23 @@ function GetDotNetInstallScript { if [[ ! -a "$install_script" ]]; then mkdir -p "$root" - if [[ "$use_default_dotnet_install" == true ]]; then - echo "Downloading '$install_script_url'" + echo "Downloading '$install_script_url'" - # Use curl if available, otherwise use wget - if command -v curl > /dev/null; then - with_retries 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 - with_retries wget -v -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 + # Use curl if available, otherwise use wget + if command -v curl > /dev/null; then + with_retries 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 - # Use a special version of the script from eng/common that understands the existence of a "productVersion.txt" in a dotnet path. - # See https://github.com/dotnet/arcade/issues/6047 for details - cp $repo_root/eng/common/dotnet-install-scripts/dotnet-install.sh $install_script + with_retries wget -v -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 b07dd147c..6f7250607 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "5.0.100-rc.2.20479.15", + "dotnet": "5.0.100", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20510.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20560.3" } } From c5573dd5799d478e56711f5ec8e66b539e64da4d Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 10 Nov 2020 14:54:42 -0800 Subject: [PATCH 07/64] Update 3.1 template versions from asp.net (#9043) --- eng/Versions.props | 4 ++-- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1d9a9614b..778fc8471 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -105,10 +105,10 @@ 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 1.7.2 - 3.1.8 + 3.1.10 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.8 + 3.1.10 3.2.1 4.8.0-rc2.19462.10 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index f6c7024fc..14936d0fc 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -43,8 +43,8 @@ <_AspNet30RuntimePackVersion>3.0.3 <_AspNet30TargetingPackVersion>3.0.1 - <_AspNet31RuntimePackVersion>3.1.9 - <_AspNet31TargetingPackVersion>3.1.8 + <_AspNet31RuntimePackVersion>3.1.10 + <_AspNet31TargetingPackVersion>3.1.10 <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) From ebc9a69c8d5c62d91addba8c296d13080d0377d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Nov 2020 01:19:00 +0000 Subject: [PATCH 08/64] [release/5.0.2xx] Update dependencies from dotnet/sdk (#9062) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.0-rtm.20529.4 to 5.0.1-servicing.20562.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rtm.20529.3 to 5.0.1-servicing.20561.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rtm.20529.5 to 5.0.1-servicing.20561.15 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - NuGet.Build.Tasks: from 5.8.0-rc.6930 to 5.9.0-preview.1.6955 (parent: Microsoft.NET.Sdk) - Use non-stable location to find targeting pack version - Fix windows desktop base url --- NuGet.config | 62 +---------------------- eng/Version.Details.xml | 34 +++++++------ eng/Versions.props | 13 ++--- src/redist/targets/GenerateLayout.targets | 4 +- 4 files changed, 29 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index 527c2513b..d1df725e0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,70 +6,10 @@ - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2ab94b78..f1b5609b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,17 @@ https://github.com/dotnet/windowsdesktop 5848b16d1fc803ea4892692b3b5dd9ee79955428 - + https://github.com/dotnet/windowsdesktop - 5848b16d1fc803ea4892692b3b5dd9ee79955428 + 0cf726307719dbe98f89015c02959afc65ec3a26 - + https://github.com/dotnet/windowsdesktop - 5848b16d1fc803ea4892692b3b5dd9ee79955428 + 0cf726307719dbe98f89015c02959afc65ec3a26 + + + https://github.com/dotnet/windowsdesktop + ec2af60c1eb8b2665745750f6445b3ff133178fb https://github.com/dotnet/runtime @@ -85,24 +89,24 @@ https://github.com/dotnet/templating - 31980633108a1bef00c798136fcd30a873c90fa3 + aad1ae3fddb2d5b785e7c2936c3b40b53a201a1d - + https://github.com/dotnet/sdk - 18f89e181f7cc6fa3a01c493e208ca348057494e + 76a633df45daddd65035b09aefb1d4082fb1f28b - + https://github.com/dotnet/sdk - 18f89e181f7cc6fa3a01c493e208ca348057494e + 76a633df45daddd65035b09aefb1d4082fb1f28b - + https://github.com/dotnet/winforms - 7d4355bb5f5c1f98ded2fb0497f8795cd1b0305f + b1b9f1706e86ef3bdb08365b67b9ad46f0ff3cfe - + https://github.com/dotnet/wpf - 61553660e51cd7fe9a733d6cdbc20e537710b8a8 + 6b11a5429bf577f5a65d5cd8ad8c49b962fad90b https://github.com/dotnet/fsharp @@ -125,9 +129,9 @@ https://github.com/dotnet/msbuild 126527ff107ae93fed10af675506c56d046aa5a3 - + https://github.com/NuGet/NuGet.Client - 830c8be45dbbccd411ecf6080abff0c2c98079cf + fa9fbcb87b8ce717d7f78d494cd16cf174be48e9 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 778fc8471..6a6598b08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.0-rtm.20529.3 + 5.0.1-servicing.20561.12 - 5.0.0-rtm.20529.5 + 5.0.1-servicing.20561.15 @@ -56,8 +56,8 @@ - 5.0.200-preview.20554.9 - 5.0.200-preview.20554.9 + 5.0.200-preview.20562.3 + 5.0.200-preview.20562.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,9 +77,10 @@ - 5.0.0-rtm.20529.4 - 5.0.0 + 5.0.1-servicing.20562.1 + 5.0.1 5.0.0 + 5.0.0-rtm.20520.1 diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 9e7249d91..5707d9a87 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -18,7 +18,7 @@ $(CoreSetupBlobVersion) $(MicrosoftAspNetCoreAppRefInternalPackageVersion) - $(WindowsDesktopBlobVersion) + $(VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion) 3.0.0 @@ -298,7 +298,7 @@ - $(WinFormsAndWpfSharedFxRootUrl)$(WindowsDesktopTargetingPackBlobVersion) + $(WinFormsAndWpfSharedFxRootUrl)$(WindowsDesktopBlobVersion) $(WinFormsAndWpfSharedFxArchiveFileName) From a3d1471507204056627d998b596e226a87eae25d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Nov 2020 23:14:11 +0000 Subject: [PATCH 09/64] Update dependencies from https://github.com/dotnet/sdk build 20201113.4 (#9072) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.5.0: from 5.0.0-rtm.20520.1 to 5.0.0-rtm.20529.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rtm.20529.3 to 5.0.0-rtm.20563.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Cli.CommandLine: from 1.0.0-preview.19208.1 to 1.0.0-preview.19208.1 (parent: Microsoft.NET.Sdk) --- NuGet.config | 3 +++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index d1df725e0..c60ea7ecc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1b5609b6..416bf20e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,29 +13,29 @@ https://github.com/dotnet/windowsdesktop 0cf726307719dbe98f89015c02959afc65ec3a26 - + https://github.com/dotnet/windowsdesktop - ec2af60c1eb8b2665745750f6445b3ff133178fb + 5848b16d1fc803ea4892692b3b5dd9ee79955428 https://github.com/dotnet/runtime - 7ef6d50b312217d2f7c17b9697891fa8ab98a19d + 56b65e0f66bdf66ad011b94cc0e27d9f714c5721 - + https://github.com/dotnet/runtime - 7ef6d50b312217d2f7c17b9697891fa8ab98a19d + 56b65e0f66bdf66ad011b94cc0e27d9f714c5721 https://github.com/dotnet/runtime - 7ef6d50b312217d2f7c17b9697891fa8ab98a19d + 56b65e0f66bdf66ad011b94cc0e27d9f714c5721 https://github.com/dotnet/runtime - 7ef6d50b312217d2f7c17b9697891fa8ab98a19d + 56b65e0f66bdf66ad011b94cc0e27d9f714c5721 https://github.com/dotnet/runtime - 7ef6d50b312217d2f7c17b9697891fa8ab98a19d + 56b65e0f66bdf66ad011b94cc0e27d9f714c5721 @@ -45,7 +45,7 @@ https://github.com/dotnet/runtime - 7ef6d50b312217d2f7c17b9697891fa8ab98a19d + 56b65e0f66bdf66ad011b94cc0e27d9f714c5721 https://github.com/dotnet/aspnetcore @@ -91,13 +91,13 @@ https://github.com/dotnet/templating aad1ae3fddb2d5b785e7c2936c3b40b53a201a1d - + https://github.com/dotnet/sdk - 76a633df45daddd65035b09aefb1d4082fb1f28b + b52fe23e3d5d90e2a113ed0d2fc5ea4c0780e939 - + https://github.com/dotnet/sdk - 76a633df45daddd65035b09aefb1d4082fb1f28b + b52fe23e3d5d90e2a113ed0d2fc5ea4c0780e939 @@ -134,7 +134,7 @@ fa9fbcb87b8ce717d7f78d494cd16cf174be48e9 - https://github.com/dotnet/CliCommandLineParser + https://github.com/dotnet/cliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 diff --git a/eng/Versions.props b/eng/Versions.props index 6a6598b08..c8527b84e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20562.3 - 5.0.200-preview.20562.3 + 5.0.200-preview.20563.4 + 5.0.200-preview.20563.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.0-rtm.20529.3 + 5.0.0-rtm.20563.5 5.0.0 5.0.0 5.0.0 @@ -80,7 +80,7 @@ 5.0.1-servicing.20562.1 5.0.1 5.0.0 - 5.0.0-rtm.20520.1 + 5.0.0-rtm.20529.4 From 93ab0fbbd8fb91d069d3db420b13dc1a189c387f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Nov 2020 21:21:01 +0000 Subject: [PATCH 10/64] Update dependencies from https://github.com/dotnet/sdk build 20201114.1 (#9073) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rtm.20563.5 to 5.0.0-rtm.20563.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index c60ea7ecc..b555a5802 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 416bf20e5..d8363ea62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,23 +19,23 @@ https://github.com/dotnet/runtime - 56b65e0f66bdf66ad011b94cc0e27d9f714c5721 + bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 - + https://github.com/dotnet/runtime - 56b65e0f66bdf66ad011b94cc0e27d9f714c5721 + bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 https://github.com/dotnet/runtime - 56b65e0f66bdf66ad011b94cc0e27d9f714c5721 + bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 https://github.com/dotnet/runtime - 56b65e0f66bdf66ad011b94cc0e27d9f714c5721 + bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 https://github.com/dotnet/runtime - 56b65e0f66bdf66ad011b94cc0e27d9f714c5721 + bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 @@ -45,7 +45,7 @@ https://github.com/dotnet/runtime - 56b65e0f66bdf66ad011b94cc0e27d9f714c5721 + bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 https://github.com/dotnet/aspnetcore @@ -91,13 +91,13 @@ https://github.com/dotnet/templating aad1ae3fddb2d5b785e7c2936c3b40b53a201a1d - + https://github.com/dotnet/sdk - b52fe23e3d5d90e2a113ed0d2fc5ea4c0780e939 + 604e02618de210933b2b5a845b9d2ae84fa0c64f - + https://github.com/dotnet/sdk - b52fe23e3d5d90e2a113ed0d2fc5ea4c0780e939 + 604e02618de210933b2b5a845b9d2ae84fa0c64f diff --git a/eng/Versions.props b/eng/Versions.props index c8527b84e..1dd8046a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20563.4 - 5.0.200-preview.20563.4 + 5.0.200-preview.20564.1 + 5.0.200-preview.20564.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.0-rtm.20563.5 + 5.0.0-rtm.20563.12 5.0.0 5.0.0 5.0.0 From d0415f1fb0e10f0f12a5d91b71c4970d0c958500 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Nov 2020 05:48:36 +0000 Subject: [PATCH 11/64] Update dependencies from https://github.com/dotnet/sdk build 20201116.3 (#9077) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0 to 5.0.1 (parent: Microsoft.NET.Sdk) --- NuGet.config | 6 +++--- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index b555a5802..b8be44cbe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,9 +6,9 @@ - - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8363ea62..b2b8f284a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,17 +87,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - aad1ae3fddb2d5b785e7c2936c3b40b53a201a1d + 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - 604e02618de210933b2b5a845b9d2ae84fa0c64f + a17af9963eda3e80369561e1e46210bab3deefd7 - + https://github.com/dotnet/sdk - 604e02618de210933b2b5a845b9d2ae84fa0c64f + a17af9963eda3e80369561e1e46210bab3deefd7 diff --git a/eng/Versions.props b/eng/Versions.props index 1dd8046a8..5eb1c835a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.0 + 5.0.1 @@ -56,8 +56,8 @@ - 5.0.200-preview.20564.1 - 5.0.200-preview.20564.1 + 5.0.200-preview.20566.3 + 5.0.200-preview.20566.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1b9adda990d715fcdda5f1855363eb3b56081e9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Nov 2020 23:59:13 +0000 Subject: [PATCH 12/64] Update dependencies from https://github.com/dotnet/sdk build 20201117.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20566.3 -> To Version 5.0.200-preview.20567.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.5.0,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.EntityFrameworkCore,Microsoft.AspNetCore.App.Runtime.win-x64,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0 -> To Version 5.0.0 (parent: Microsoft.NET.Sdk --- NuGet.config | 11 +++++- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++--------- 3 files changed, 63 insertions(+), 54 deletions(-) diff --git a/NuGet.config b/NuGet.config index b8be44cbe..84cdbcc2b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,11 +6,20 @@ + + + + + + + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2b8f284a..f45cf92bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,39 +3,39 @@ https://github.com/dotnet/windowsdesktop - 5848b16d1fc803ea4892692b3b5dd9ee79955428 + ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://github.com/dotnet/windowsdesktop - 0cf726307719dbe98f89015c02959afc65ec3a26 + a8f8d26d9af8ae258d8687beaa4539dca6982962 https://github.com/dotnet/windowsdesktop - 0cf726307719dbe98f89015c02959afc65ec3a26 + a8f8d26d9af8ae258d8687beaa4539dca6982962 - + https://github.com/dotnet/windowsdesktop - 5848b16d1fc803ea4892692b3b5dd9ee79955428 + ec2af60c1eb8b2665745750f6445b3ff133178fb https://github.com/dotnet/runtime bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 - + https://github.com/dotnet/runtime - bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 + bed28f348ccd4bffbac619eb5c55c98836a3ef4b - + https://github.com/dotnet/runtime - bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 + bed28f348ccd4bffbac619eb5c55c98836a3ef4b - + https://github.com/dotnet/runtime - bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 + bed28f348ccd4bffbac619eb5c55c98836a3ef4b - + https://github.com/dotnet/runtime - bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 + bed28f348ccd4bffbac619eb5c55c98836a3ef4b @@ -49,35 +49,35 @@ https://github.com/dotnet/aspnetcore - 80f8669450b2b79085d624f81f74c8d7ad5be089 + 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://github.com/dotnet/aspnetcore - 80f8669450b2b79085d624f81f74c8d7ad5be089 + 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://github.com/dotnet/aspnetcore - 80f8669450b2b79085d624f81f74c8d7ad5be089 + de177e3a80cfa8cfa869d8164e19dfb3b82e28b7 - + https://github.com/dotnet/aspnetcore - 80f8669450b2b79085d624f81f74c8d7ad5be089 + de177e3a80cfa8cfa869d8164e19dfb3b82e28b7 - + https://github.com/dotnet/efcore - c57d3d2083c50ed3fa746e55016ce5dc0e863e5b + 593d967ef28e55cd411236d5ebeb75bfb74bdc65 - + https://github.com/dotnet/aspnetcore - 80f8669450b2b79085d624f81f74c8d7ad5be089 + de177e3a80cfa8cfa869d8164e19dfb3b82e28b7 - + https://github.com/dotnet/aspnetcore - 80f8669450b2b79085d624f81f74c8d7ad5be089 + de177e3a80cfa8cfa869d8164e19dfb3b82e28b7 - + https://github.com/dotnet/aspnetcore - 80f8669450b2b79085d624f81f74c8d7ad5be089 + de177e3a80cfa8cfa869d8164e19dfb3b82e28b7 https://github.com/dotnet/test-templates @@ -91,22 +91,22 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - a17af9963eda3e80369561e1e46210bab3deefd7 + 1f552664fdbac47b1943385685fa7de947278949 - + https://github.com/dotnet/sdk - a17af9963eda3e80369561e1e46210bab3deefd7 + 1f552664fdbac47b1943385685fa7de947278949 - + https://github.com/dotnet/winforms - b1b9f1706e86ef3bdb08365b67b9ad46f0ff3cfe + f408cf01e4b750b79f3ad8fff7cee944ac678b0c - + https://github.com/dotnet/wpf - 6b11a5429bf577f5a65d5cd8ad8c49b962fad90b + c90e7fd35ce50aa8973e075b10925c7924141b47 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5eb1c835a..16b829c05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.1-servicing.20561.12 + 5.0.1-servicing.20566.1 - 5.0.1-servicing.20561.15 + 5.0.1-servicing.20566.1 @@ -43,21 +43,21 @@ - 5.0.0 + 5.0.1 5.0.0 - 5.0.0-rtm.20529.7 - 5.0.0-rtm.20529.7 - 5.0.0-rtm.20529.7 - 5.0.0-rtm.20529.7 - 5.0.0-rtm.20529.7 + 5.0.0-rtm.20526.5 + 5.0.1-servicing.20566.11 + 5.0.1-servicing.20566.11 + 5.0.1-servicing.20566.11 + 5.0.1-servicing.20566.11 0.2.0 - 5.0.200-preview.20566.3 - 5.0.200-preview.20566.3 + 5.0.200-preview.20567.9 + 5.0.200-preview.20567.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,19 +68,19 @@ - 5.0.0-rtm.20563.12 - 5.0.0 - 5.0.0 + 5.0.1-servicing.20566.8 + 5.0.1 + 5.0.1 5.0.0 - 5.0.0 + 5.0.1 2.1.0 - 5.0.1-servicing.20562.1 + 5.0.1-servicing.20566.1 5.0.1 5.0.0 - 5.0.0-rtm.20529.4 + 5.0.0-rtm.20520.1 From 7d9109c58d0a9548f7c192d692b66c80f9a36b57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Nov 2020 16:07:52 +0000 Subject: [PATCH 13/64] Update dependencies from https://github.com/dotnet/sdk build 20201118.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20566.3 -> To Version 5.0.200-preview.20568.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.5.0,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.EntityFrameworkCore,Microsoft.AspNetCore.App.Runtime.win-x64,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0 -> To Version 5.0.0 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 84cdbcc2b..59bdce391 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f45cf92bc..56ab78c18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 - + https://github.com/dotnet/runtime - bed28f348ccd4bffbac619eb5c55c98836a3ef4b + 06330b8839f8409f20625473ae59b84ce3e68f58 https://github.com/dotnet/runtime - bed28f348ccd4bffbac619eb5c55c98836a3ef4b + 06330b8839f8409f20625473ae59b84ce3e68f58 https://github.com/dotnet/runtime - bed28f348ccd4bffbac619eb5c55c98836a3ef4b + 06330b8839f8409f20625473ae59b84ce3e68f58 https://github.com/dotnet/runtime - bed28f348ccd4bffbac619eb5c55c98836a3ef4b + 06330b8839f8409f20625473ae59b84ce3e68f58 @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - 1f552664fdbac47b1943385685fa7de947278949 + b3eebe81a7dcb86ef649dc75ad02a643fb6eaae3 - + https://github.com/dotnet/sdk - 1f552664fdbac47b1943385685fa7de947278949 + b3eebe81a7dcb86ef649dc75ad02a643fb6eaae3 diff --git a/eng/Versions.props b/eng/Versions.props index 16b829c05..94f3fce05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20567.9 - 5.0.200-preview.20567.9 + 5.0.200-preview.20568.6 + 5.0.200-preview.20568.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.1-servicing.20566.8 + 5.0.1-servicing.20567.12 5.0.1 5.0.1 5.0.0 From ad8f847cfa5577dcf987a12a4dd72bb37efc2d6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Nov 2020 23:16:21 +0000 Subject: [PATCH 14/64] Update dependencies from https://github.com/dotnet/sdk build 20201118.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20566.3 -> To Version 5.0.200-preview.20568.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.5.0,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.EntityFrameworkCore,Microsoft.AspNetCore.App.Runtime.win-x64,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0 -> To Version 5.0.0 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59bdce391..e4a096504 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56ab78c18..48ea0d069 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 - + https://github.com/dotnet/runtime - 06330b8839f8409f20625473ae59b84ce3e68f58 + 51873a07965f04c4c1d43a674311a606ab5dda8f https://github.com/dotnet/runtime - 06330b8839f8409f20625473ae59b84ce3e68f58 + 51873a07965f04c4c1d43a674311a606ab5dda8f https://github.com/dotnet/runtime - 06330b8839f8409f20625473ae59b84ce3e68f58 + 51873a07965f04c4c1d43a674311a606ab5dda8f https://github.com/dotnet/runtime - 06330b8839f8409f20625473ae59b84ce3e68f58 + 51873a07965f04c4c1d43a674311a606ab5dda8f @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - b3eebe81a7dcb86ef649dc75ad02a643fb6eaae3 + 13fceb68ef8e92a395c39b0c3f36e54d26249e1b - + https://github.com/dotnet/sdk - b3eebe81a7dcb86ef649dc75ad02a643fb6eaae3 + 13fceb68ef8e92a395c39b0c3f36e54d26249e1b diff --git a/eng/Versions.props b/eng/Versions.props index 94f3fce05..415950eed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20568.6 - 5.0.200-preview.20568.6 + 5.0.200-preview.20568.11 + 5.0.200-preview.20568.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.1-servicing.20567.12 + 5.0.1-servicing.20568.5 5.0.1 5.0.1 5.0.0 From 55b2e70b2536b6f79dd7d968812ad6e38a3def80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Nov 2020 03:09:47 +0000 Subject: [PATCH 15/64] Update dependencies from https://github.com/dotnet/sdk build 20201118.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20566.3 -> To Version 5.0.200-preview.20568.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.5.0,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.EntityFrameworkCore,Microsoft.AspNetCore.App.Runtime.win-x64,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0 -> To Version 5.0.0 (parent: Microsoft.NET.Sdk --- 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 48ea0d069..34b5a699f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - 13fceb68ef8e92a395c39b0c3f36e54d26249e1b + d1efaca13424908cfe3966c87b3b6c0579651b47 - + https://github.com/dotnet/sdk - 13fceb68ef8e92a395c39b0c3f36e54d26249e1b + d1efaca13424908cfe3966c87b3b6c0579651b47 diff --git a/eng/Versions.props b/eng/Versions.props index 415950eed..1792d999c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20568.11 - 5.0.200-preview.20568.11 + 5.0.200-preview.20568.13 + 5.0.200-preview.20568.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f3bd2813c185ef2104f5b15785d2876a9ce865d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Nov 2020 08:25:54 +0000 Subject: [PATCH 16/64] Update dependencies from https://github.com/dotnet/sdk build 20201118.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20566.3 -> To Version 5.0.200-preview.20568.15 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.5.0,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.EntityFrameworkCore,Microsoft.AspNetCore.App.Runtime.win-x64,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0 -> To Version 5.0.0 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index e4a096504..84e9ffb17 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34b5a699f..a3423f8fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 - + https://github.com/dotnet/runtime - 51873a07965f04c4c1d43a674311a606ab5dda8f + a05d7533168a89e5ddd8eaedfd2c03adc0b8d10b https://github.com/dotnet/runtime - 51873a07965f04c4c1d43a674311a606ab5dda8f + a05d7533168a89e5ddd8eaedfd2c03adc0b8d10b https://github.com/dotnet/runtime - 51873a07965f04c4c1d43a674311a606ab5dda8f + a05d7533168a89e5ddd8eaedfd2c03adc0b8d10b https://github.com/dotnet/runtime - 51873a07965f04c4c1d43a674311a606ab5dda8f + a05d7533168a89e5ddd8eaedfd2c03adc0b8d10b @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - d1efaca13424908cfe3966c87b3b6c0579651b47 + be6fe0f300fdaf9908c23a8be34ddbb9eb668103 - + https://github.com/dotnet/sdk - d1efaca13424908cfe3966c87b3b6c0579651b47 + be6fe0f300fdaf9908c23a8be34ddbb9eb668103 diff --git a/eng/Versions.props b/eng/Versions.props index 1792d999c..f6658b5c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20568.13 - 5.0.200-preview.20568.13 + 5.0.200-preview.20568.15 + 5.0.200-preview.20568.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.1-servicing.20568.5 + 5.0.1-servicing.20568.11 5.0.1 5.0.1 5.0.0 From 703c5b7de73518aa59df996fce8db54e093e6564 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Nov 2020 15:06:37 +0000 Subject: [PATCH 17/64] Update dependencies from https://github.com/dotnet/sdk build 20201119.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20566.3 -> To Version 5.0.200-preview.20569.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.5.0,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.EntityFrameworkCore,Microsoft.AspNetCore.App.Runtime.win-x64,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,NuGet.Build.Tasks From Version 5.0.0 -> To Version 5.0.0 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3423f8fb..4826c1ead 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - be6fe0f300fdaf9908c23a8be34ddbb9eb668103 + 8030b947b55634b070ff26a69b2004aa16d83153 - + https://github.com/dotnet/sdk - be6fe0f300fdaf9908c23a8be34ddbb9eb668103 + 8030b947b55634b070ff26a69b2004aa16d83153 @@ -129,9 +129,9 @@ https://github.com/dotnet/msbuild 126527ff107ae93fed10af675506c56d046aa5a3 - + https://github.com/NuGet/NuGet.Client - fa9fbcb87b8ce717d7f78d494cd16cf174be48e9 + a4c9d63bf942f1df1ba9486a87bad2e4b6888488 https://github.com/dotnet/cliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index f6658b5c8..236d825f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20568.15 - 5.0.200-preview.20568.15 + 5.0.200-preview.20569.1 + 5.0.200-preview.20569.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9d449decf80275583b9e1ed86628a384d0d48c97 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 19 Nov 2020 10:33:56 -0800 Subject: [PATCH 18/64] Pin NETCoreAppTargetingPackBlobVersion Since we no longer produce Targeting packs every build after 5.0.0 runtime release. --- 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 5707d9a87..46beb66e7 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -16,7 +16,7 @@ $(MicrosoftWindowsDesktopAppPackageVersion) - $(CoreSetupBlobVersion) + 5.0.0-rtm.20563.12 $(MicrosoftAspNetCoreAppRefInternalPackageVersion) $(VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion) 3.0.0 From 003b1d1d5c287660542b466d2ee0f1868aba5fc4 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 20 Nov 2020 00:42:14 -0800 Subject: [PATCH 19/64] Add NETCoreSdkPortableRuntimeIdentifier to bundled versions --- src/redist/targets/GenerateBundledVersions.targets | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 14936d0fc..e8f03f504 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -168,6 +168,11 @@ DefaultVersion="2.2.0" LatestVersion="2.2.8"/> + + + $(ProductMonikerRid) + + @@ -197,6 +202,7 @@ Copyright (c) .NET Foundation. All rights reserved. %24(MSBuildThisFileDirectory)RuntimeIdentifierGraph.json $(Version) $(ProductMonikerRid) + $(PortableProduktMonikerRid) <_NETCoreSdkIsPreview>$(_NETCoreSdkBeingBuiltIsPreview) From 096e69de3ad43fd434eb3fbb0648de1293836a9d Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 20 Nov 2020 00:42:41 -0800 Subject: [PATCH 20/64] Generate NETCoreSdkRuntimeIdentifierChain.txt in SDK folder --- .../GenerateSdkRuntimeIdentifierChain.cs | 33 +++++++++++++++++++ src/core-sdk-tasks/core-sdk-tasks.csproj | 3 +- src/redist/targets/BuildCoreSdkTasks.targets | 1 + .../targets/GenerateBundledVersions.targets | 7 +++- 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs diff --git a/src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs b/src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs new file mode 100644 index 000000000..028f1aa32 --- /dev/null +++ b/src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; +using NuGet.RuntimeModel; + +namespace Microsoft.DotNet.Cli.Build +{ + public class GenerateSdkRuntimeIdentifierChain : Task + { + [Required] + public string RuntimeIdentifier { get; set; } + + [Required] + public string RuntimeIdentifierGraphPath { get; set; } + + [Required] + public string RuntimeIdentifierChainOutputPath { get; set; } + + public override bool Execute() + { + var runtimeIdentifierGraph = JsonRuntimeFormat.ReadRuntimeGraph(RuntimeIdentifierGraphPath); + + var chainContents = string.Join("\n", runtimeIdentifierGraph.ExpandRuntime(RuntimeIdentifier)); + File.WriteAllText(RuntimeIdentifierChainOutputPath, chainContents); + + return true; + } + } +} diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 20ce4702e..00420b6ba 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -11,7 +11,8 @@ - + + diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets index 99bef9140..b2f7b64fa 100644 --- a/src/redist/targets/BuildCoreSdkTasks.targets +++ b/src/redist/targets/BuildCoreSdkTasks.targets @@ -39,5 +39,6 @@ + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index e8f03f504..4ad16591f 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -520,7 +520,12 @@ Copyright (c) .NET Foundation. All rights reserved. + SkipUnchangedFiles="true"/> + + From 833bfd10b5a6488321c988226f477c4afe6e3320 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 20 Nov 2020 10:06:32 -0800 Subject: [PATCH 21/64] Apply suggestions from code review Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com> --- src/redist/targets/GenerateBundledVersions.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 4ad16591f..11bafc1b5 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -170,7 +170,7 @@ - $(ProductMonikerRid) + $(ProductMonikerRid) @@ -202,7 +202,7 @@ Copyright (c) .NET Foundation. All rights reserved. %24(MSBuildThisFileDirectory)RuntimeIdentifierGraph.json $(Version) $(ProductMonikerRid) - $(PortableProduktMonikerRid) + $(PortableProductMonikerRid) <_NETCoreSdkIsPreview>$(_NETCoreSdkBeingBuiltIsPreview) @@ -523,7 +523,7 @@ Copyright (c) .NET Foundation. All rights reserved. SkipUnchangedFiles="true"/> From 03594568b5a9a693c7ff67500e2aa7a33f273958 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 21 Nov 2020 07:31:19 +0000 Subject: [PATCH 22/64] Update dependencies from https://github.com/dotnet/sdk build 20201120.9 (#9113) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Internal: from 5.0.1-servicing.20568.11 to 5.0.1-servicing.20570.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 84e9ffb17..ccf66a7a8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4826c1ead..141fc7b72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 - + https://github.com/dotnet/runtime - a05d7533168a89e5ddd8eaedfd2c03adc0b8d10b + 9ecbcd746c9648d00d4bf98bf15f31e21e01db6e https://github.com/dotnet/runtime - a05d7533168a89e5ddd8eaedfd2c03adc0b8d10b + 9ecbcd746c9648d00d4bf98bf15f31e21e01db6e https://github.com/dotnet/runtime - a05d7533168a89e5ddd8eaedfd2c03adc0b8d10b + 9ecbcd746c9648d00d4bf98bf15f31e21e01db6e https://github.com/dotnet/runtime - a05d7533168a89e5ddd8eaedfd2c03adc0b8d10b + 9ecbcd746c9648d00d4bf98bf15f31e21e01db6e @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - 8030b947b55634b070ff26a69b2004aa16d83153 + ef5595aad21a8867711ba62eadd95056fe293ab9 - + https://github.com/dotnet/sdk - 8030b947b55634b070ff26a69b2004aa16d83153 + ef5595aad21a8867711ba62eadd95056fe293ab9 diff --git a/eng/Versions.props b/eng/Versions.props index 236d825f7..6c96794ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20569.1 - 5.0.200-preview.20569.1 + 5.0.200-preview.20570.9 + 5.0.200-preview.20570.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.1-servicing.20568.11 + 5.0.1-servicing.20570.12 5.0.1 5.0.1 5.0.0 From 02adcca78683aac6464449c9d9c7c1e70d2c1693 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 23 Nov 2020 22:31:10 +0000 Subject: [PATCH 23/64] Update dependencies from https://github.com/dotnet/sdk build 20201123.6 (#9126) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.1-servicing.20566.1 to 5.0.1-servicing.20570.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.1-servicing.20566.1 to 5.0.1-servicing.20570.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.1-servicing.20566.1 to 5.0.1-servicing.20570.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index ccf66a7a8..f3c971259 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 141fc7b72..5ec735e5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://github.com/dotnet/windowsdesktop - a8f8d26d9af8ae258d8687beaa4539dca6982962 + 06cbddd933082010c720d1f9d922b99205510b83 https://github.com/dotnet/windowsdesktop - a8f8d26d9af8ae258d8687beaa4539dca6982962 + 06cbddd933082010c720d1f9d922b99205510b83 https://github.com/dotnet/windowsdesktop @@ -91,22 +91,22 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - ef5595aad21a8867711ba62eadd95056fe293ab9 + f19cfaa3ea74a6ac2b0e054da4af5879863d0259 - + https://github.com/dotnet/sdk - ef5595aad21a8867711ba62eadd95056fe293ab9 + f19cfaa3ea74a6ac2b0e054da4af5879863d0259 - + https://github.com/dotnet/winforms - f408cf01e4b750b79f3ad8fff7cee944ac678b0c + 820c2a319254121bc051748bda2c19b66581f6f5 - + https://github.com/dotnet/wpf - c90e7fd35ce50aa8973e075b10925c7924141b47 + c0c75050abe143b54182b3ff9c32008baace7b59 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6c96794ce..0e071d391 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.1-servicing.20566.1 + 5.0.1-servicing.20570.4 - 5.0.1-servicing.20566.1 + 5.0.1-servicing.20570.4 @@ -56,8 +56,8 @@ - 5.0.200-preview.20570.9 - 5.0.200-preview.20570.9 + 5.0.200-preview.20573.6 + 5.0.200-preview.20573.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,7 +77,7 @@ - 5.0.1-servicing.20566.1 + 5.0.1-servicing.20570.3 5.0.1 5.0.0 5.0.0-rtm.20520.1 From e2a321b122c5a5bf4c5476f0dbebe28afd0b645b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Nov 2020 02:47:44 +0000 Subject: [PATCH 24/64] Update dependencies from https://github.com/dotnet/sdk build 20201123.12 (#9133) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.1-servicing.20570.3 to 5.0.1-servicing.20573.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.1-servicing.20570.12 to 5.0.1-servicing.20572.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.1-servicing.20570.4 to 5.0.1-servicing.20573.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.1-servicing.20570.4 to 5.0.1-servicing.20573.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 12 ++++++------ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index f3c971259..93b0b0a1e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,13 +13,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ec735e5b..640b53a44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://github.com/dotnet/windowsdesktop - 06cbddd933082010c720d1f9d922b99205510b83 + 7fed9e7f0e301960f67d88efc7d7ee7f63d5f72d https://github.com/dotnet/windowsdesktop - 06cbddd933082010c720d1f9d922b99205510b83 + 7fed9e7f0e301960f67d88efc7d7ee7f63d5f72d https://github.com/dotnet/windowsdesktop @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 - + https://github.com/dotnet/runtime - 9ecbcd746c9648d00d4bf98bf15f31e21e01db6e + e564220b5228e7d26a959dcecec62e6c98d8cbb7 https://github.com/dotnet/runtime - 9ecbcd746c9648d00d4bf98bf15f31e21e01db6e + e564220b5228e7d26a959dcecec62e6c98d8cbb7 https://github.com/dotnet/runtime - 9ecbcd746c9648d00d4bf98bf15f31e21e01db6e + e564220b5228e7d26a959dcecec62e6c98d8cbb7 https://github.com/dotnet/runtime - 9ecbcd746c9648d00d4bf98bf15f31e21e01db6e + e564220b5228e7d26a959dcecec62e6c98d8cbb7 @@ -91,22 +91,22 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - f19cfaa3ea74a6ac2b0e054da4af5879863d0259 + 28188deddeebd411f89b80b137b682df604ce387 - + https://github.com/dotnet/sdk - f19cfaa3ea74a6ac2b0e054da4af5879863d0259 + 28188deddeebd411f89b80b137b682df604ce387 - + https://github.com/dotnet/winforms - 820c2a319254121bc051748bda2c19b66581f6f5 + af41134ff98cf2793a2fcf40f21f95dc94f3ee79 - + https://github.com/dotnet/wpf - c0c75050abe143b54182b3ff9c32008baace7b59 + bc5c9ff6297179457642dc5e8e5e2eaf3710f917 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0e071d391..f30566723 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.1-servicing.20570.4 + 5.0.1-servicing.20573.1 - 5.0.1-servicing.20570.4 + 5.0.1-servicing.20573.3 @@ -56,8 +56,8 @@ - 5.0.200-preview.20573.6 - 5.0.200-preview.20573.6 + 5.0.200-preview.20573.12 + 5.0.200-preview.20573.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.1-servicing.20570.12 + 5.0.1-servicing.20572.4 5.0.1 5.0.1 5.0.0 @@ -77,7 +77,7 @@ - 5.0.1-servicing.20570.3 + 5.0.1-servicing.20573.3 5.0.1 5.0.0 5.0.0-rtm.20520.1 From 42984adf0f6e9ff44d124c2dcb3d5d7a31ffcbcb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Nov 2020 05:51:58 +0000 Subject: [PATCH 25/64] Update dependencies from https://github.com/dotnet/sdk build 20201123.16 (#9136) [release/5.0.2xx] Update dependencies from dotnet/sdk --- 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 640b53a44..eb776104c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - 28188deddeebd411f89b80b137b682df604ce387 + de8ccfdddfbbdb15462c260987f43b7ddca0972a - + https://github.com/dotnet/sdk - 28188deddeebd411f89b80b137b682df604ce387 + de8ccfdddfbbdb15462c260987f43b7ddca0972a diff --git a/eng/Versions.props b/eng/Versions.props index f30566723..ee59d5bc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20573.12 - 5.0.200-preview.20573.12 + 5.0.200-preview.20573.16 + 5.0.200-preview.20573.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 65b921573f54b9f8064176f8ed445805cfc95a62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Nov 2020 08:28:10 +0000 Subject: [PATCH 26/64] Update dependencies from https://github.com/dotnet/sdk build 20201123.20 (#9140) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.1-servicing.20566.11 to 5.0.1-servicing.20573.6 (parent: Microsoft.NET.Sdk) - Microsoft.EntityFrameworkCore: from 5.0.1 to 5.0.1 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.1-servicing.20566.11 to 5.0.1-servicing.20573.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.1-servicing.20566.11 to 5.0.1-servicing.20573.6 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.1-servicing.20566.11 to 5.0.1-servicing.20573.6 (parent: Microsoft.NET.Sdk) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 93b0b0a1e..82000e217 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb776104c..7eba1ac5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,27 +57,27 @@ https://github.com/dotnet/aspnetcore - de177e3a80cfa8cfa869d8164e19dfb3b82e28b7 + af907cdea52e9c1fca03e3300664490566d1bbe1 - + https://github.com/dotnet/aspnetcore - de177e3a80cfa8cfa869d8164e19dfb3b82e28b7 + af907cdea52e9c1fca03e3300664490566d1bbe1 https://github.com/dotnet/efcore - 593d967ef28e55cd411236d5ebeb75bfb74bdc65 + 240223ef37a9bb44688f93ebab203c2c8f3c3e95 - + https://github.com/dotnet/aspnetcore - de177e3a80cfa8cfa869d8164e19dfb3b82e28b7 + af907cdea52e9c1fca03e3300664490566d1bbe1 - + https://github.com/dotnet/aspnetcore - de177e3a80cfa8cfa869d8164e19dfb3b82e28b7 + af907cdea52e9c1fca03e3300664490566d1bbe1 - + https://github.com/dotnet/aspnetcore - de177e3a80cfa8cfa869d8164e19dfb3b82e28b7 + af907cdea52e9c1fca03e3300664490566d1bbe1 https://github.com/dotnet/test-templates @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - de8ccfdddfbbdb15462c260987f43b7ddca0972a + a4b8cb9342057e2b48676073c6ccce411250d8fb - + https://github.com/dotnet/sdk - de8ccfdddfbbdb15462c260987f43b7ddca0972a + a4b8cb9342057e2b48676073c6ccce411250d8fb diff --git a/eng/Versions.props b/eng/Versions.props index ee59d5bc0..a5342c1a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 5.0.1 5.0.0 5.0.0-rtm.20526.5 - 5.0.1-servicing.20566.11 - 5.0.1-servicing.20566.11 - 5.0.1-servicing.20566.11 - 5.0.1-servicing.20566.11 + 5.0.1-servicing.20573.6 + 5.0.1-servicing.20573.6 + 5.0.1-servicing.20573.6 + 5.0.1-servicing.20573.6 0.2.0 - 5.0.200-preview.20573.16 - 5.0.200-preview.20573.16 + 5.0.200-preview.20573.20 + 5.0.200-preview.20573.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9fafe41ba5a1cc5251d887099e687d85eed2a237 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Nov 2020 01:39:39 +0000 Subject: [PATCH 27/64] Update dependencies from https://github.com/dotnet/sdk build 20201124.4 (#9144) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Internal: from 5.0.1-servicing.20572.4 to 5.0.1-servicing.20574.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 82000e217..a875fe7c8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7eba1ac5f..c74371dbf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 - + https://github.com/dotnet/runtime - e564220b5228e7d26a959dcecec62e6c98d8cbb7 + 2767f4466bd3fe4e3678510aba636b66f02b11b4 https://github.com/dotnet/runtime - e564220b5228e7d26a959dcecec62e6c98d8cbb7 + 2767f4466bd3fe4e3678510aba636b66f02b11b4 https://github.com/dotnet/runtime - e564220b5228e7d26a959dcecec62e6c98d8cbb7 + 2767f4466bd3fe4e3678510aba636b66f02b11b4 https://github.com/dotnet/runtime - e564220b5228e7d26a959dcecec62e6c98d8cbb7 + 2767f4466bd3fe4e3678510aba636b66f02b11b4 @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - a4b8cb9342057e2b48676073c6ccce411250d8fb + a2a4ceea90cc9af723ca59409d62917441dfd900 - + https://github.com/dotnet/sdk - a4b8cb9342057e2b48676073c6ccce411250d8fb + a2a4ceea90cc9af723ca59409d62917441dfd900 diff --git a/eng/Versions.props b/eng/Versions.props index a5342c1a5..d2376196c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20573.20 - 5.0.200-preview.20573.20 + 5.0.200-preview.20574.4 + 5.0.200-preview.20574.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.1-servicing.20572.4 + 5.0.1-servicing.20574.5 5.0.1 5.0.1 5.0.0 From acea66f9540f12099020f4bd4c2bfc82370190c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Nov 2020 06:05:39 +0000 Subject: [PATCH 28/64] Update dependencies from https://github.com/dotnet/sdk build 20201124.9 (#9147) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.1-servicing.20573.3 to 5.0.1-servicing.20574.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.1-servicing.20574.5 to 5.0.1-servicing.20574.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.1-servicing.20573.1 to 5.0.1-servicing.20574.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.1-servicing.20573.3 to 5.0.1-servicing.20574.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 12 ++++++------ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index a875fe7c8..f9f3d3cd1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,13 +13,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c74371dbf..099146caa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://github.com/dotnet/windowsdesktop - 7fed9e7f0e301960f67d88efc7d7ee7f63d5f72d + e4cb18f4777640a30a9e745d037edafc6a0e0a5c https://github.com/dotnet/windowsdesktop - 7fed9e7f0e301960f67d88efc7d7ee7f63d5f72d + e4cb18f4777640a30a9e745d037edafc6a0e0a5c https://github.com/dotnet/windowsdesktop @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 - + https://github.com/dotnet/runtime - 2767f4466bd3fe4e3678510aba636b66f02b11b4 + 3700448468a1fec24f50e6713910a01569a2edc4 https://github.com/dotnet/runtime - 2767f4466bd3fe4e3678510aba636b66f02b11b4 + 3700448468a1fec24f50e6713910a01569a2edc4 https://github.com/dotnet/runtime - 2767f4466bd3fe4e3678510aba636b66f02b11b4 + 3700448468a1fec24f50e6713910a01569a2edc4 https://github.com/dotnet/runtime - 2767f4466bd3fe4e3678510aba636b66f02b11b4 + 3700448468a1fec24f50e6713910a01569a2edc4 @@ -91,22 +91,22 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - a2a4ceea90cc9af723ca59409d62917441dfd900 + d7ffd4120a6db78ce9dac0da0cce796f203daaf7 - + https://github.com/dotnet/sdk - a2a4ceea90cc9af723ca59409d62917441dfd900 + d7ffd4120a6db78ce9dac0da0cce796f203daaf7 - + https://github.com/dotnet/winforms - af41134ff98cf2793a2fcf40f21f95dc94f3ee79 + a5b01073ffb9c72b790e127aafcea88d1074d738 - + https://github.com/dotnet/wpf - bc5c9ff6297179457642dc5e8e5e2eaf3710f917 + 9f41262e6ce0c1fe128a2f2712bd9e674426f3b8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d2376196c..58bcc3a36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.1-servicing.20573.1 + 5.0.1-servicing.20574.1 - 5.0.1-servicing.20573.3 + 5.0.1-servicing.20574.3 @@ -56,8 +56,8 @@ - 5.0.200-preview.20574.4 - 5.0.200-preview.20574.4 + 5.0.200-preview.20574.9 + 5.0.200-preview.20574.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.1-servicing.20574.5 + 5.0.1-servicing.20574.8 5.0.1 5.0.1 5.0.0 @@ -77,7 +77,7 @@ - 5.0.1-servicing.20573.3 + 5.0.1-servicing.20574.4 5.0.1 5.0.0 5.0.0-rtm.20520.1 From 49074130f1f9b47ccff8ea90f9a8dfef40f101c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Nov 2020 08:06:53 +0000 Subject: [PATCH 29/64] Update dependencies from https://github.com/dotnet/sdk build 20201124.13 (#9149) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Internal: from 5.0.1-servicing.20574.8 to 5.0.1-servicing.20574.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index f9f3d3cd1..6dac0d19b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 099146caa..b5619a7cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 - + https://github.com/dotnet/runtime - 3700448468a1fec24f50e6713910a01569a2edc4 + ce2b7553bfbdd43bb65a028e5efb9d91763f7620 https://github.com/dotnet/runtime - 3700448468a1fec24f50e6713910a01569a2edc4 + ce2b7553bfbdd43bb65a028e5efb9d91763f7620 https://github.com/dotnet/runtime - 3700448468a1fec24f50e6713910a01569a2edc4 + ce2b7553bfbdd43bb65a028e5efb9d91763f7620 https://github.com/dotnet/runtime - 3700448468a1fec24f50e6713910a01569a2edc4 + ce2b7553bfbdd43bb65a028e5efb9d91763f7620 @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - d7ffd4120a6db78ce9dac0da0cce796f203daaf7 + de36002b63ae87765b43e84384b5e13b082cf168 - + https://github.com/dotnet/sdk - d7ffd4120a6db78ce9dac0da0cce796f203daaf7 + de36002b63ae87765b43e84384b5e13b082cf168 diff --git a/eng/Versions.props b/eng/Versions.props index 58bcc3a36..ba0e5d881 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20574.9 - 5.0.200-preview.20574.9 + 5.0.200-preview.20574.13 + 5.0.200-preview.20574.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.1-servicing.20574.8 + 5.0.1-servicing.20574.11 5.0.1 5.0.1 5.0.0 From 4f5ad1b99347753b04f4dba695517778439846c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Nov 2020 09:17:33 +0000 Subject: [PATCH 30/64] Update dependencies from https://github.com/dotnet/sdk build 20201124.15 (#9152) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.1-servicing.20573.6 to 5.0.1-servicing.20574.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.1-servicing.20573.6 to 5.0.1-servicing.20574.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.1-servicing.20573.6 to 5.0.1-servicing.20574.9 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.1-servicing.20573.6 to 5.0.1-servicing.20574.9 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6dac0d19b..2ebe6f6b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5619a7cb..84ac14e3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,7 +19,7 @@ https://github.com/dotnet/runtime - bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 + cf258a14b70ad9069470a108f13765e0e5988f51 https://github.com/dotnet/runtime @@ -45,7 +45,7 @@ https://github.com/dotnet/runtime - bfc49945c0bedeffe01bb5d6f3c217dad207d0d8 + cf258a14b70ad9069470a108f13765e0e5988f51 https://github.com/dotnet/aspnetcore @@ -57,27 +57,27 @@ https://github.com/dotnet/aspnetcore - af907cdea52e9c1fca03e3300664490566d1bbe1 + 5c1f6ffc8c204efb326b140d39eb1b8d73f0faa0 - + https://github.com/dotnet/aspnetcore - af907cdea52e9c1fca03e3300664490566d1bbe1 + 5c1f6ffc8c204efb326b140d39eb1b8d73f0faa0 https://github.com/dotnet/efcore 240223ef37a9bb44688f93ebab203c2c8f3c3e95 - + https://github.com/dotnet/aspnetcore - af907cdea52e9c1fca03e3300664490566d1bbe1 + 5c1f6ffc8c204efb326b140d39eb1b8d73f0faa0 - + https://github.com/dotnet/aspnetcore - af907cdea52e9c1fca03e3300664490566d1bbe1 + 5c1f6ffc8c204efb326b140d39eb1b8d73f0faa0 - + https://github.com/dotnet/aspnetcore - af907cdea52e9c1fca03e3300664490566d1bbe1 + 5c1f6ffc8c204efb326b140d39eb1b8d73f0faa0 https://github.com/dotnet/test-templates @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - de36002b63ae87765b43e84384b5e13b082cf168 + ca668eeaa0082e21f5f435bb5d833ad297c8c777 - + https://github.com/dotnet/sdk - de36002b63ae87765b43e84384b5e13b082cf168 + ca668eeaa0082e21f5f435bb5d833ad297c8c777 diff --git a/eng/Versions.props b/eng/Versions.props index ba0e5d881..c33207650 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 5.0.1 5.0.0 5.0.0-rtm.20526.5 - 5.0.1-servicing.20573.6 - 5.0.1-servicing.20573.6 - 5.0.1-servicing.20573.6 - 5.0.1-servicing.20573.6 + 5.0.1-servicing.20574.9 + 5.0.1-servicing.20574.9 + 5.0.1-servicing.20574.9 + 5.0.1-servicing.20574.9 0.2.0 - 5.0.200-preview.20574.13 - 5.0.200-preview.20574.13 + 5.0.200-preview.20574.15 + 5.0.200-preview.20574.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0095ef1d00299aec2a04a7e3eed88dcabfb09b86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Nov 2020 19:39:14 +0000 Subject: [PATCH 31/64] Update dependencies from https://github.com/dotnet/sdk build 20201125.3 (#9155) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Internal: from 5.0.1-servicing.20574.11 to 5.0.1-servicing.20574.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2ebe6f6b7..5badad54c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84ac14e3e..5d59d59cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://github.com/dotnet/runtime - ce2b7553bfbdd43bb65a028e5efb9d91763f7620 + 65a4f7139fd0450cdcb3a714b3cdb3d35b0c47f5 https://github.com/dotnet/runtime - ce2b7553bfbdd43bb65a028e5efb9d91763f7620 + 65a4f7139fd0450cdcb3a714b3cdb3d35b0c47f5 https://github.com/dotnet/runtime - ce2b7553bfbdd43bb65a028e5efb9d91763f7620 + 65a4f7139fd0450cdcb3a714b3cdb3d35b0c47f5 https://github.com/dotnet/runtime - ce2b7553bfbdd43bb65a028e5efb9d91763f7620 + 65a4f7139fd0450cdcb3a714b3cdb3d35b0c47f5 @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - ca668eeaa0082e21f5f435bb5d833ad297c8c777 + 41fd0e41e93009d987f226c0849ccd71adb0320e - + https://github.com/dotnet/sdk - ca668eeaa0082e21f5f435bb5d833ad297c8c777 + 41fd0e41e93009d987f226c0849ccd71adb0320e diff --git a/eng/Versions.props b/eng/Versions.props index c33207650..06591e88a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20574.15 - 5.0.200-preview.20574.15 + 5.0.200-preview.20575.3 + 5.0.200-preview.20575.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.1-servicing.20574.11 + 5.0.1-servicing.20574.14 5.0.1 5.0.1 5.0.0 From 76671a877703d291e2ccd742b2a595d072d311dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Nov 2020 21:50:56 +0000 Subject: [PATCH 32/64] Update dependencies from https://github.com/dotnet/sdk build 20201125.7 (#9159) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Internal: from 5.0.1-servicing.20574.14 to 5.0.1-servicing.20575.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5badad54c..0d373e4bf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d59d59cb..af351650e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://github.com/dotnet/runtime - 65a4f7139fd0450cdcb3a714b3cdb3d35b0c47f5 + 5660c4a8b121680f6965416fb5f37a6fd49e0976 https://github.com/dotnet/runtime - 65a4f7139fd0450cdcb3a714b3cdb3d35b0c47f5 + 5660c4a8b121680f6965416fb5f37a6fd49e0976 https://github.com/dotnet/runtime - 65a4f7139fd0450cdcb3a714b3cdb3d35b0c47f5 + 5660c4a8b121680f6965416fb5f37a6fd49e0976 https://github.com/dotnet/runtime - 65a4f7139fd0450cdcb3a714b3cdb3d35b0c47f5 + 5660c4a8b121680f6965416fb5f37a6fd49e0976 @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - 41fd0e41e93009d987f226c0849ccd71adb0320e + 5b180d9149d3870f61d5aeda1208f45fc6640a07 - + https://github.com/dotnet/sdk - 41fd0e41e93009d987f226c0849ccd71adb0320e + 5b180d9149d3870f61d5aeda1208f45fc6640a07 diff --git a/eng/Versions.props b/eng/Versions.props index 06591e88a..8120f885b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20575.3 - 5.0.200-preview.20575.3 + 5.0.200-preview.20575.7 + 5.0.200-preview.20575.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.1-servicing.20574.14 + 5.0.1-servicing.20575.2 5.0.1 5.0.1 5.0.0 From 6e38a4e36d5f7cf0523347e958f28cb35b56549b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Nov 2020 01:39:50 +0000 Subject: [PATCH 33/64] Update dependencies from https://github.com/dotnet/sdk build 20201125.12 (#9162) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Internal: from 5.0.1-servicing.20575.2 to 5.0.1-servicing.20575.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0d373e4bf..898da9a96 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af351650e..ef13dacfa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://github.com/dotnet/runtime - 5660c4a8b121680f6965416fb5f37a6fd49e0976 + 4cfc831bf802bee7daca3b01e0ce5ed1b09b4574 https://github.com/dotnet/runtime - 5660c4a8b121680f6965416fb5f37a6fd49e0976 + 4cfc831bf802bee7daca3b01e0ce5ed1b09b4574 https://github.com/dotnet/runtime - 5660c4a8b121680f6965416fb5f37a6fd49e0976 + 4cfc831bf802bee7daca3b01e0ce5ed1b09b4574 https://github.com/dotnet/runtime - 5660c4a8b121680f6965416fb5f37a6fd49e0976 + 4cfc831bf802bee7daca3b01e0ce5ed1b09b4574 @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - 5b180d9149d3870f61d5aeda1208f45fc6640a07 + bc80e636c5d8e8f7347bde3d1637d9cf91fed830 - + https://github.com/dotnet/sdk - 5b180d9149d3870f61d5aeda1208f45fc6640a07 + bc80e636c5d8e8f7347bde3d1637d9cf91fed830 diff --git a/eng/Versions.props b/eng/Versions.props index 8120f885b..0ca35a566 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20575.7 - 5.0.200-preview.20575.7 + 5.0.200-preview.20575.12 + 5.0.200-preview.20575.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.1-servicing.20575.2 + 5.0.1-servicing.20575.9 5.0.1 5.0.1 5.0.0 From 91ad93eb87b69a6b906d623d8fd1079b664ef114 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Nov 2020 04:20:04 +0000 Subject: [PATCH 34/64] Update dependencies from https://github.com/dotnet/sdk build 20201125.14 (#9163) [release/5.0.2xx] Update dependencies from dotnet/sdk --- 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 ef13dacfa..9c244a2b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 2e5658aebcab8b0c4f499ec77c7263625938e125 - + https://github.com/dotnet/sdk - bc80e636c5d8e8f7347bde3d1637d9cf91fed830 + f28579c63d7bf113175637b11ff83f8a7d07ed7e - + https://github.com/dotnet/sdk - bc80e636c5d8e8f7347bde3d1637d9cf91fed830 + f28579c63d7bf113175637b11ff83f8a7d07ed7e diff --git a/eng/Versions.props b/eng/Versions.props index 0ca35a566..a77fc38cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20575.12 - 5.0.200-preview.20575.12 + 5.0.200-preview.20575.14 + 5.0.200-preview.20575.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bede8d21ae0e8441fb230b20aa01f15d45e215ad Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Fri, 27 Nov 2020 13:46:33 -0800 Subject: [PATCH 35/64] Update to Windows SDK projection (#9157) Update to Windows SDK projection --- eng/ManualVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index a5b100458..5da7e39ab 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,8 +9,8 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.10 - 10.0.18362.10 - 10.0.19041.10 + 10.0.17763.12 + 10.0.18362.12 + 10.0.19041.12 From 9de319e6768bd9457b62d04ba466aa9f377fa3fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 15:45:17 +0000 Subject: [PATCH 36/64] [release/5.0.2xx] Update dependencies from dotnet/sdk (#9171) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.1-servicing.20574.4 to 5.0.1-servicing.20575.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.1-servicing.20575.9 to 5.0.1-servicing.20575.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.1-servicing.20574.9 to 5.0.1-servicing.20579.2 (parent: Microsoft.NET.Sdk) - Microsoft.EntityFrameworkCore: from 5.0.1 to 5.0.1 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.1-servicing.20574.9 to 5.0.1-servicing.20579.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.1-servicing.20574.9 to 5.0.1-servicing.20579.2 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.1-servicing.20574.9 to 5.0.1-servicing.20579.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.1-servicing.20574.1 to 5.0.1-servicing.20575.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.1-servicing.20574.3 to 5.0.1-servicing.20575.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Net.Compilers.Toolset: from 3.8.0-5.20519.18 to 3.9.0-2.20574.26 (parent: Microsoft.NET.Sdk) --- NuGet.config | 10 +++---- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 898da9a96..7ba4b0cdf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,19 @@ - + - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c244a2b6..c99504c22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://github.com/dotnet/windowsdesktop - e4cb18f4777640a30a9e745d037edafc6a0e0a5c + b2c05c1b195a8e1a7229b2e1d195e4376656ab42 https://github.com/dotnet/windowsdesktop - e4cb18f4777640a30a9e745d037edafc6a0e0a5c + b2c05c1b195a8e1a7229b2e1d195e4376656ab42 https://github.com/dotnet/windowsdesktop @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://github.com/dotnet/runtime - 4cfc831bf802bee7daca3b01e0ce5ed1b09b4574 + b02e13abab3d6f499751af2ad1ae6333fb4e633d https://github.com/dotnet/runtime - 4cfc831bf802bee7daca3b01e0ce5ed1b09b4574 + b02e13abab3d6f499751af2ad1ae6333fb4e633d https://github.com/dotnet/runtime - 4cfc831bf802bee7daca3b01e0ce5ed1b09b4574 + b02e13abab3d6f499751af2ad1ae6333fb4e633d https://github.com/dotnet/runtime - 4cfc831bf802bee7daca3b01e0ce5ed1b09b4574 + b02e13abab3d6f499751af2ad1ae6333fb4e633d @@ -57,27 +57,27 @@ https://github.com/dotnet/aspnetcore - 5c1f6ffc8c204efb326b140d39eb1b8d73f0faa0 + d0f09018c0527fe87c45e1b3253acaf33d2a3212 - + https://github.com/dotnet/aspnetcore - 5c1f6ffc8c204efb326b140d39eb1b8d73f0faa0 + d0f09018c0527fe87c45e1b3253acaf33d2a3212 https://github.com/dotnet/efcore - 240223ef37a9bb44688f93ebab203c2c8f3c3e95 + e08026a638e684e6d3eabbd65702251e8c0febea - + https://github.com/dotnet/aspnetcore - 5c1f6ffc8c204efb326b140d39eb1b8d73f0faa0 + d0f09018c0527fe87c45e1b3253acaf33d2a3212 - + https://github.com/dotnet/aspnetcore - 5c1f6ffc8c204efb326b140d39eb1b8d73f0faa0 + d0f09018c0527fe87c45e1b3253acaf33d2a3212 - + https://github.com/dotnet/aspnetcore - 5c1f6ffc8c204efb326b140d39eb1b8d73f0faa0 + d0f09018c0527fe87c45e1b3253acaf33d2a3212 https://github.com/dotnet/test-templates @@ -89,24 +89,24 @@ https://github.com/dotnet/templating - 2e5658aebcab8b0c4f499ec77c7263625938e125 + 9d3065efbe93ec1daaa4d59115b2887f6b36766a - + https://github.com/dotnet/sdk - f28579c63d7bf113175637b11ff83f8a7d07ed7e + d39246bd5c21349b9b928808e25605163de28f5e - + https://github.com/dotnet/sdk - f28579c63d7bf113175637b11ff83f8a7d07ed7e + d39246bd5c21349b9b928808e25605163de28f5e - + https://github.com/dotnet/winforms - a5b01073ffb9c72b790e127aafcea88d1074d738 + 660239b5f335cf41ddbb12ff040adbc5d355378f - + https://github.com/dotnet/wpf - 9f41262e6ce0c1fe128a2f2712bd9e674426f3b8 + a7dfd0b518129bb1d504b4a4408a3a4947cd0b1d https://github.com/dotnet/fsharp @@ -121,9 +121,9 @@ e792d61a0ead2f6422b4c9af651c1128d978d454 linker - + https://github.com/dotnet/roslyn - 4c195c3ac1974edcefa76774d7a59a2350ec55fa + e9fd4dc7d74932c0d4b042251bc5a88bb5b3c437 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index a77fc38cd..eb41ffe3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.1-servicing.20574.1 + 5.0.1-servicing.20575.3 - 5.0.1-servicing.20574.3 + 5.0.1-servicing.20575.8 @@ -46,18 +46,18 @@ 5.0.1 5.0.0 5.0.0-rtm.20526.5 - 5.0.1-servicing.20574.9 - 5.0.1-servicing.20574.9 - 5.0.1-servicing.20574.9 - 5.0.1-servicing.20574.9 + 5.0.1-servicing.20579.2 + 5.0.1-servicing.20579.2 + 5.0.1-servicing.20579.2 + 5.0.1-servicing.20579.2 0.2.0 - 5.0.200-preview.20575.14 - 5.0.200-preview.20575.14 + 5.0.200-preview.20579.1 + 5.0.200-preview.20579.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.1-servicing.20575.9 + 5.0.1-servicing.20575.16 5.0.1 5.0.1 5.0.0 @@ -77,7 +77,7 @@ - 5.0.1-servicing.20574.4 + 5.0.1-servicing.20575.4 5.0.1 5.0.0 5.0.0-rtm.20520.1 From a265383a04fff230319d45ca643d5e0d0fc1fe34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 00:36:40 +0000 Subject: [PATCH 37/64] Update dependencies from https://github.com/dotnet/sdk build 20201130.14 (#9175) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 16.8.0-release-20201022-02 to 16.9.0-release-20201130-02 (parent: Microsoft.NET.Sdk) --- 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 c99504c22..7c2c0fff8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 9d3065efbe93ec1daaa4d59115b2887f6b36766a - + https://github.com/dotnet/sdk - d39246bd5c21349b9b928808e25605163de28f5e + e5033ed79160566104ddcc32751e5ea3ae946cc9 - + https://github.com/dotnet/sdk - d39246bd5c21349b9b928808e25605163de28f5e + e5033ed79160566104ddcc32751e5ea3ae946cc9 @@ -112,9 +112,9 @@ https://github.com/dotnet/fsharp da6be68280c89131cdba2045525b80890401defd - + https://github.com/microsoft/vstest - b195e2589980861425b331e73a859252c3f2b71a + 0a56da68da5f466d32606bba8b7d8260ad9d2a43 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index eb41ffe3b..8cc3bbadc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20579.1 - 5.0.200-preview.20579.1 + 5.0.200-preview.20580.14 + 5.0.200-preview.20580.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -130,7 +130,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.8.0-release-20201022-02 + 16.9.0-release-20201130-02 From 231e155d0c983139be2fba0ffcc794c10d85d0ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 01:46:45 +0000 Subject: [PATCH 38/64] Update dependencies from https://github.com/dotnet/sdk build 20201130.18 (#9178) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.1-servicing.20575.4 to 5.0.1-servicing.20580.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.1-servicing.20575.3 to 5.0.1-servicing.20575.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.1 to 5.0.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.1-servicing.20575.8 to 5.0.1-servicing.20580.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7ba4b0cdf..a51d5f607 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c2c0fff8..7ce34272c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://github.com/dotnet/windowsdesktop - b2c05c1b195a8e1a7229b2e1d195e4376656ab42 + cc1f119dc6ed7ca15c5d395cf7bdaa5c472f00e9 https://github.com/dotnet/windowsdesktop - b2c05c1b195a8e1a7229b2e1d195e4376656ab42 + cc1f119dc6ed7ca15c5d395cf7bdaa5c472f00e9 https://github.com/dotnet/windowsdesktop @@ -91,22 +91,22 @@ https://github.com/dotnet/templating 9d3065efbe93ec1daaa4d59115b2887f6b36766a - + https://github.com/dotnet/sdk - e5033ed79160566104ddcc32751e5ea3ae946cc9 + 0059b6a447dbc0a5498e7296231cc1d214bc7e97 - + https://github.com/dotnet/sdk - e5033ed79160566104ddcc32751e5ea3ae946cc9 + 0059b6a447dbc0a5498e7296231cc1d214bc7e97 - + https://github.com/dotnet/winforms - 660239b5f335cf41ddbb12ff040adbc5d355378f + 200d7409fd9078764eb840e431bc3649caf3ad56 - + https://github.com/dotnet/wpf - a7dfd0b518129bb1d504b4a4408a3a4947cd0b1d + f336060dde15d0aecaf37f3493f699134451fa8c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8cc3bbadc..cc0bae7f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.1-servicing.20575.3 + 5.0.1-servicing.20575.6 - 5.0.1-servicing.20575.8 + 5.0.1-servicing.20580.1 @@ -56,8 +56,8 @@ - 5.0.200-preview.20580.14 - 5.0.200-preview.20580.14 + 5.0.200-preview.20580.18 + 5.0.200-preview.20580.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,7 +77,7 @@ - 5.0.1-servicing.20575.4 + 5.0.1-servicing.20580.3 5.0.1 5.0.0 5.0.0-rtm.20520.1 From 81f16dfb28ad49b3458b093165205aeee75769bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 19:37:51 -0800 Subject: [PATCH 39/64] Update dependencies from https://github.com/dotnet/sdk build 20201130.21 (#9181) Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20580.18 -> To Version 5.0.200-preview.20580.21 Dependency coherency updates VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.EntityFrameworkCore,Microsoft.AspNetCore.App.Runtime.win-x64,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch From Version 5.0.1-servicing.20579.2 -> To Version 5.0.1-servicing.20580.10 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index a51d5f607..37fa4c5d9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ce34272c..6a1c4f57e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,27 +57,27 @@ https://github.com/dotnet/aspnetcore - d0f09018c0527fe87c45e1b3253acaf33d2a3212 + f255fad9426fc8877111fb434cc4b8ded125e9a7 - + https://github.com/dotnet/aspnetcore - d0f09018c0527fe87c45e1b3253acaf33d2a3212 + f255fad9426fc8877111fb434cc4b8ded125e9a7 https://github.com/dotnet/efcore - e08026a638e684e6d3eabbd65702251e8c0febea + 494e218127bfb7afee3c9b10a30bcd32d6cd80db - + https://github.com/dotnet/aspnetcore - d0f09018c0527fe87c45e1b3253acaf33d2a3212 + f255fad9426fc8877111fb434cc4b8ded125e9a7 - + https://github.com/dotnet/aspnetcore - d0f09018c0527fe87c45e1b3253acaf33d2a3212 + f255fad9426fc8877111fb434cc4b8ded125e9a7 - + https://github.com/dotnet/aspnetcore - d0f09018c0527fe87c45e1b3253acaf33d2a3212 + f255fad9426fc8877111fb434cc4b8ded125e9a7 https://github.com/dotnet/test-templates @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 9d3065efbe93ec1daaa4d59115b2887f6b36766a - + https://github.com/dotnet/sdk - 0059b6a447dbc0a5498e7296231cc1d214bc7e97 + dfc2b05c3f51851a75d24ee9001d6b97ece35c6f - + https://github.com/dotnet/sdk - 0059b6a447dbc0a5498e7296231cc1d214bc7e97 + dfc2b05c3f51851a75d24ee9001d6b97ece35c6f diff --git a/eng/Versions.props b/eng/Versions.props index cc0bae7f4..74d9c203a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 5.0.1 5.0.0 5.0.0-rtm.20526.5 - 5.0.1-servicing.20579.2 - 5.0.1-servicing.20579.2 - 5.0.1-servicing.20579.2 - 5.0.1-servicing.20579.2 + 5.0.1-servicing.20580.10 + 5.0.1-servicing.20580.10 + 5.0.1-servicing.20580.10 + 5.0.1-servicing.20580.10 0.2.0 - 5.0.200-preview.20580.18 - 5.0.200-preview.20580.18 + 5.0.200-preview.20580.21 + 5.0.200-preview.20580.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bf6e7210e68bf965d20f880dd98c87cc7d988857 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 1 Dec 2020 15:14:55 -0800 Subject: [PATCH 40/64] Update aspnetcore bundled 2.1 version (#9183) Looks like this branch was forked before the bundled version was updated - 2.1.23 is the latest --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 74d9c203a..4c219de81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 1.0.2-beta4.20420.1 - 2.1.22 + 2.1.23 From 1f500876256d3c106e79d00d42d1a99f3702ebc3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 18:22:33 -0800 Subject: [PATCH 41/64] Update dependencies from https://github.com/dotnet/sdk build 20201201.9 (#9185) Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20580.21 -> To Version 5.0.200-preview.20601.9 Dependency coherency updates Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.EntityFrameworkCore,Microsoft.AspNetCore.App.Runtime.win-x64,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.1-servicing.20580.3 -> To Version 5.0.0-rtm.20520.1 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 17 ----------- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 50 insertions(+), 67 deletions(-) diff --git a/NuGet.config b/NuGet.config index 37fa4c5d9..9e48ae7d9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,23 +5,6 @@ - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a1c4f57e..38af27f66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://github.com/dotnet/windowsdesktop - cc1f119dc6ed7ca15c5d395cf7bdaa5c472f00e9 + ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://github.com/dotnet/windowsdesktop - cc1f119dc6ed7ca15c5d395cf7bdaa5c472f00e9 + ec2af60c1eb8b2665745750f6445b3ff133178fb https://github.com/dotnet/windowsdesktop @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://github.com/dotnet/runtime - b02e13abab3d6f499751af2ad1ae6333fb4e633d + cf258a14b70ad9069470a108f13765e0e5988f51 - + https://github.com/dotnet/runtime - b02e13abab3d6f499751af2ad1ae6333fb4e633d + cf258a14b70ad9069470a108f13765e0e5988f51 - + https://github.com/dotnet/runtime - b02e13abab3d6f499751af2ad1ae6333fb4e633d + cf258a14b70ad9069470a108f13765e0e5988f51 - + https://github.com/dotnet/runtime - b02e13abab3d6f499751af2ad1ae6333fb4e633d + cf258a14b70ad9069470a108f13765e0e5988f51 @@ -55,29 +55,29 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://github.com/dotnet/aspnetcore - f255fad9426fc8877111fb434cc4b8ded125e9a7 + 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://github.com/dotnet/aspnetcore - f255fad9426fc8877111fb434cc4b8ded125e9a7 + 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + 33570d0337f76208fa3a814f7f6d3a506bd9c0be - + https://github.com/dotnet/aspnetcore - f255fad9426fc8877111fb434cc4b8ded125e9a7 + 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://github.com/dotnet/aspnetcore - f255fad9426fc8877111fb434cc4b8ded125e9a7 + 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://github.com/dotnet/aspnetcore - f255fad9426fc8877111fb434cc4b8ded125e9a7 + 371a26f07b23ad77c636332c2dfc0cbd1d8137ba https://github.com/dotnet/test-templates @@ -87,26 +87,26 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - 9d3065efbe93ec1daaa4d59115b2887f6b36766a + 31980633108a1bef00c798136fcd30a873c90fa3 - + https://github.com/dotnet/sdk - dfc2b05c3f51851a75d24ee9001d6b97ece35c6f + 98d062ec7a06b4aa166d89e9b2c6905aba83eae7 - + https://github.com/dotnet/sdk - dfc2b05c3f51851a75d24ee9001d6b97ece35c6f + 98d062ec7a06b4aa166d89e9b2c6905aba83eae7 - + https://github.com/dotnet/winforms - 200d7409fd9078764eb840e431bc3649caf3ad56 + 30738f0987bdccb72f705af705521051fe141a46 - + https://github.com/dotnet/wpf - f336060dde15d0aecaf37f3493f699134451fa8c + 9e81b0885121e9958e48895ae48be9639a396528 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4c219de81..d5a8c331e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 5.0.1-servicing.20575.6 + 5.0.0-rtm.20520.1 - 5.0.1-servicing.20580.1 + 5.0.0-rtm.20520.3 - 5.0.1 + 5.0.0 @@ -43,21 +43,21 @@ - 5.0.1 + 5.0.0 5.0.0 5.0.0-rtm.20526.5 - 5.0.1-servicing.20580.10 - 5.0.1-servicing.20580.10 - 5.0.1-servicing.20580.10 - 5.0.1-servicing.20580.10 + 5.0.0-rtm.20526.5 + 5.0.0-rtm.20526.5 + 5.0.0-rtm.20526.5 + 5.0.0-rtm.20526.5 0.2.0 - 5.0.200-preview.20580.21 - 5.0.200-preview.20580.21 + 5.0.200-preview.20601.9 + 5.0.200-preview.20601.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,17 +68,17 @@ - 5.0.1-servicing.20575.16 - 5.0.1 - 5.0.1 + 5.0.0-rtm.20519.4 + 5.0.0 + 5.0.0 5.0.0 - 5.0.1 + 5.0.0 2.1.0 - 5.0.1-servicing.20580.3 - 5.0.1 + 5.0.0-rtm.20520.1 + 5.0.0 5.0.0 5.0.0-rtm.20520.1 From b3b934bbf25c567385c5d19a3475e2359417e835 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 04:49:07 +0000 Subject: [PATCH 42/64] Update dependencies from https://github.com/dotnet/sdk build 20201201.11 (#9186) [release/5.0.2xx] Update dependencies from dotnet/sdk --- 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 38af27f66..662fcd311 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 31980633108a1bef00c798136fcd30a873c90fa3 - + https://github.com/dotnet/sdk - 98d062ec7a06b4aa166d89e9b2c6905aba83eae7 + e2669aa5f6df92006367ead42434da79e0706a2b - + https://github.com/dotnet/sdk - 98d062ec7a06b4aa166d89e9b2c6905aba83eae7 + e2669aa5f6df92006367ead42434da79e0706a2b diff --git a/eng/Versions.props b/eng/Versions.props index d5a8c331e..bb9d0eeed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20601.9 - 5.0.200-preview.20601.9 + 5.0.200-preview.20601.11 + 5.0.200-preview.20601.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 652ea37586d85aae3ff851493e851533ca336a23 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 7 Dec 2020 11:28:06 -0800 Subject: [PATCH 43/64] Reorder the table to match runtime where macOS is before Linux. --- README.md | 4 ++-- .../TableGenerator.Tests/DomainTests.fs | 4 ++-- tools/sdk-readme-table-generator/TableGenerator/Table.fs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 21a245c38..d47833b6e 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,8 @@ Please do not directly edit the table below. Use https://github.com/dotnet/insta | **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-5.0.2XX]][win-x86-version-5.0.2XX]
[Installer][win-x86-installer-5.0.2XX] - [Checksum][win-x86-installer-checksum-5.0.2XX]
[zip][win-x86-zip-5.0.2XX] - [Checksum][win-x86-zip-checksum-5.0.2XX] | [![][win-x86-badge-5.0.1XX-rtm]][win-x86-version-5.0.1XX-rtm]
[Installer][win-x86-installer-5.0.1XX-rtm] - [Checksum][win-x86-installer-checksum-5.0.1XX-rtm]
[zip][win-x86-zip-5.0.1XX-rtm] - [Checksum][win-x86-zip-checksum-5.0.1XX-rtm] | [![][win-x86-badge-3.1.4XX]][win-x86-version-3.1.4XX]
[Installer][win-x86-installer-3.1.4XX] - [Checksum][win-x86-installer-checksum-3.1.4XX]
[zip][win-x86-zip-3.1.4XX] - [Checksum][win-x86-zip-checksum-3.1.4XX] | [![][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] | | **Windows arm** | **N/A** | **N/A** | **N/A** | [![][win-arm-badge-3.1.4XX]][win-arm-version-3.1.4XX]
[zip][win-arm-zip-3.1.4XX] - [Checksum][win-arm-zip-checksum-3.1.4XX] | [![][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] | | **Windows arm64** | [![][win-arm64-badge-master]][win-arm64-version-master]
[zip][win-arm64-zip-master] | [![][win-arm64-badge-5.0.2XX]][win-arm64-version-5.0.2XX]
[Installer][win-arm64-installer-5.0.2XX] - [Checksum][win-arm64-installer-checksum-5.0.2XX]
[zip][win-arm64-zip-5.0.2XX] | [![][win-arm64-badge-5.0.1XX-rtm]][win-arm64-version-5.0.1XX-rtm]
[Installer][win-arm64-installer-5.0.1XX-rtm] - [Checksum][win-arm64-installer-checksum-5.0.1XX-rtm]
[zip][win-arm64-zip-5.0.1XX-rtm] | **N/A** | **N/A** | +| **macOS x64** | [![][osx-x64-badge-master]][osx-x64-version-master]
[Installer][osx-x64-installer-master] - [Checksum][osx-x64-installer-checksum-master]
[tar.gz][osx-x64-targz-master] - [Checksum][osx-x64-targz-checksum-master] | [![][osx-x64-badge-5.0.2XX]][osx-x64-version-5.0.2XX]
[Installer][osx-x64-installer-5.0.2XX] - [Checksum][osx-x64-installer-checksum-5.0.2XX]
[tar.gz][osx-x64-targz-5.0.2XX] - [Checksum][osx-x64-targz-checksum-5.0.2XX] | [![][osx-x64-badge-5.0.1XX-rtm]][osx-x64-version-5.0.1XX-rtm]
[Installer][osx-x64-installer-5.0.1XX-rtm] - [Checksum][osx-x64-installer-checksum-5.0.1XX-rtm]
[tar.gz][osx-x64-targz-5.0.1XX-rtm] - [Checksum][osx-x64-targz-checksum-5.0.1XX-rtm] | [![][osx-x64-badge-3.1.4XX]][osx-x64-version-3.1.4XX]
[Installer][osx-x64-installer-3.1.4XX] - [Checksum][osx-x64-installer-checksum-3.1.4XX]
[tar.gz][osx-x64-targz-3.1.4XX] - [Checksum][osx-x64-targz-checksum-3.1.4XX] | [![][osx-x64-badge-3.1.1XX]][osx-x64-version-3.1.1XX]
[Installer][osx-x64-installer-3.1.1XX] - [Checksum][osx-x64-installer-checksum-3.1.1XX]
[tar.gz][osx-x64-targz-3.1.1XX] - [Checksum][osx-x64-targz-checksum-3.1.1XX] | +| **macOS arm64** | [![][osx-arm64-badge-master]][osx-arm64-version-master]
[Installer][osx-arm64-installer-master] - [Checksum][osx-arm64-installer-checksum-master]
[tar.gz][osx-arm64-targz-master] - [Checksum][osx-arm64-targz-checksum-master] | **N/A** | **N/A** | **N/A** | **N/A** | | **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-5.0.2XX]][linux-version-5.0.2XX]
[DEB Installer][linux-DEB-installer-5.0.2XX] - [Checksum][linux-DEB-installer-checksum-5.0.2XX]
[RPM Installer][linux-RPM-installer-5.0.2XX] - [Checksum][linux-RPM-installer-checksum-5.0.2XX]
_see installer note below_1
[tar.gz][linux-targz-5.0.2XX] - [Checksum][linux-targz-checksum-5.0.2XX] | [![][linux-badge-5.0.1XX-rtm]][linux-version-5.0.1XX-rtm]
[DEB Installer][linux-DEB-installer-5.0.1XX-rtm] - [Checksum][linux-DEB-installer-checksum-5.0.1XX-rtm]
[RPM Installer][linux-RPM-installer-5.0.1XX-rtm] - [Checksum][linux-RPM-installer-checksum-5.0.1XX-rtm]
_see installer note below_1
[tar.gz][linux-targz-5.0.1XX-rtm] - [Checksum][linux-targz-checksum-5.0.1XX-rtm] | [![][linux-badge-3.1.4XX]][linux-version-3.1.4XX]
[DEB Installer][linux-DEB-installer-3.1.4XX] - [Checksum][linux-DEB-installer-checksum-3.1.4XX]
[RPM Installer][linux-RPM-installer-3.1.4XX] - [Checksum][linux-RPM-installer-checksum-3.1.4XX]
_see installer note below_1
[tar.gz][linux-targz-3.1.4XX] - [Checksum][linux-targz-checksum-3.1.4XX] | [![][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 arm** | [![][linux-arm-badge-master]][linux-arm-version-master]
[tar.gz][linux-arm-targz-master] - [Checksum][linux-arm-targz-checksum-master] | [![][linux-arm-badge-5.0.2XX]][linux-arm-version-5.0.2XX]
[tar.gz][linux-arm-targz-5.0.2XX] - [Checksum][linux-arm-targz-checksum-5.0.2XX] | [![][linux-arm-badge-5.0.1XX-rtm]][linux-arm-version-5.0.1XX-rtm]
[tar.gz][linux-arm-targz-5.0.1XX-rtm] - [Checksum][linux-arm-targz-checksum-5.0.1XX-rtm] | [![][linux-arm-badge-3.1.4XX]][linux-arm-version-3.1.4XX]
[tar.gz][linux-arm-targz-3.1.4XX] - [Checksum][linux-arm-targz-checksum-3.1.4XX] | [![][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 arm64** | [![][linux-arm64-badge-master]][linux-arm64-version-master]
[tar.gz][linux-arm64-targz-master] - [Checksum][linux-arm64-targz-checksum-master] | [![][linux-arm64-badge-5.0.2XX]][linux-arm64-version-5.0.2XX]
[tar.gz][linux-arm64-targz-5.0.2XX] - [Checksum][linux-arm64-targz-checksum-5.0.2XX] | [![][linux-arm64-badge-5.0.1XX-rtm]][linux-arm64-version-5.0.1XX-rtm]
[tar.gz][linux-arm64-targz-5.0.1XX-rtm] - [Checksum][linux-arm64-targz-checksum-5.0.1XX-rtm] | [![][linux-arm64-badge-3.1.4XX]][linux-arm64-version-3.1.4XX]
[tar.gz][linux-arm64-targz-3.1.4XX] - [Checksum][linux-arm64-targz-checksum-3.1.4XX] | [![][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] | @@ -82,8 +84,6 @@ Please do not directly edit the table below. Use https://github.com/dotnet/insta | **Linux-musl-arm** | [![][linux-musl-arm-badge-master]][linux-musl-arm-version-master]
[tar.gz][linux-musl-arm-targz-master] - [Checksum][linux-musl-arm-targz-checksum-master] | **N/A** | **N/A** | **N/A** | **N/A** | | **Linux-musl-arm64** | [![][linux-musl-arm64-badge-master]][linux-musl-arm64-version-master]
[tar.gz][linux-musl-arm64-targz-master] - [Checksum][linux-musl-arm64-targz-checksum-master] | **N/A** | **N/A** | **N/A** | **N/A** | | **RHEL 6** | **N/A** | **N/A** | **N/A** | [![][rhel-6-badge-3.1.4XX]][rhel-6-version-3.1.4XX]
[tar.gz][rhel-6-targz-3.1.4XX] - [Checksum][rhel-6-targz-checksum-3.1.4XX] | [![][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] | -| **macOS x64** | [![][osx-x64-badge-master]][osx-x64-version-master]
[Installer][osx-x64-installer-master] - [Checksum][osx-x64-installer-checksum-master]
[tar.gz][osx-x64-targz-master] - [Checksum][osx-x64-targz-checksum-master] | [![][osx-x64-badge-5.0.2XX]][osx-x64-version-5.0.2XX]
[Installer][osx-x64-installer-5.0.2XX] - [Checksum][osx-x64-installer-checksum-5.0.2XX]
[tar.gz][osx-x64-targz-5.0.2XX] - [Checksum][osx-x64-targz-checksum-5.0.2XX] | [![][osx-x64-badge-5.0.1XX-rtm]][osx-x64-version-5.0.1XX-rtm]
[Installer][osx-x64-installer-5.0.1XX-rtm] - [Checksum][osx-x64-installer-checksum-5.0.1XX-rtm]
[tar.gz][osx-x64-targz-5.0.1XX-rtm] - [Checksum][osx-x64-targz-checksum-5.0.1XX-rtm] | [![][osx-x64-badge-3.1.4XX]][osx-x64-version-3.1.4XX]
[Installer][osx-x64-installer-3.1.4XX] - [Checksum][osx-x64-installer-checksum-3.1.4XX]
[tar.gz][osx-x64-targz-3.1.4XX] - [Checksum][osx-x64-targz-checksum-3.1.4XX] | [![][osx-x64-badge-3.1.1XX]][osx-x64-version-3.1.1XX]
[Installer][osx-x64-installer-3.1.1XX] - [Checksum][osx-x64-installer-checksum-3.1.1XX]
[tar.gz][osx-x64-targz-3.1.1XX] - [Checksum][osx-x64-targz-checksum-3.1.1XX] | -| **macOS arm64** | [![][osx-arm64-badge-master]][osx-arm64-version-master]
[Installer][osx-arm64-installer-master] - [Checksum][osx-arm64-installer-checksum-master]
[tar.gz][osx-arm64-targz-master] - [Checksum][osx-arm64-targz-checksum-master] | **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: diff --git a/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs b/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs index fe2981fa8..9ed7515d0 100644 --- a/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs +++ b/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs @@ -230,6 +230,8 @@ let ``pinning tests for readme in master 11/02/2020``() = | **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-5.0.1XX-rtm]][win-x86-version-5.0.1XX-rtm]
[Installer][win-x86-installer-5.0.1XX-rtm] - [Checksum][win-x86-installer-checksum-5.0.1XX-rtm]
[zip][win-x86-zip-5.0.1XX-rtm] - [Checksum][win-x86-zip-checksum-5.0.1XX-rtm] | [![][win-x86-badge-5.0.1XX-rc2]][win-x86-version-5.0.1XX-rc2]
[Installer][win-x86-installer-5.0.1XX-rc2] - [Checksum][win-x86-installer-checksum-5.0.1XX-rc2]
[zip][win-x86-zip-5.0.1XX-rc2] - [Checksum][win-x86-zip-checksum-5.0.1XX-rc2] | [![][win-x86-badge-3.1.4XX]][win-x86-version-3.1.4XX]
[Installer][win-x86-installer-3.1.4XX] - [Checksum][win-x86-installer-checksum-3.1.4XX]
[zip][win-x86-zip-3.1.4XX] - [Checksum][win-x86-zip-checksum-3.1.4XX] | [![][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] | | **Windows arm** | **N/A** | **N/A** | **N/A** | [![][win-arm-badge-3.1.4XX]][win-arm-version-3.1.4XX]
[zip][win-arm-zip-3.1.4XX] - [Checksum][win-arm-zip-checksum-3.1.4XX] | [![][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] | | **Windows arm64** | [![][win-arm64-badge-master]][win-arm64-version-master]
[zip][win-arm64-zip-master] | [![][win-arm64-badge-5.0.1XX-rtm]][win-arm64-version-5.0.1XX-rtm]
[Installer][win-arm64-installer-5.0.1XX-rtm] - [Checksum][win-arm64-installer-checksum-5.0.1XX-rtm]
[zip][win-arm64-zip-5.0.1XX-rtm] | [![][win-arm64-badge-5.0.1XX-rc2]][win-arm64-version-5.0.1XX-rc2]
[Installer][win-arm64-installer-5.0.1XX-rc2] - [Checksum][win-arm64-installer-checksum-5.0.1XX-rc2]
[zip][win-arm64-zip-5.0.1XX-rc2] | **N/A** | **N/A** | +| **macOS x64** | [![][osx-x64-badge-master]][osx-x64-version-master]
[Installer][osx-x64-installer-master] - [Checksum][osx-x64-installer-checksum-master]
[tar.gz][osx-x64-targz-master] - [Checksum][osx-x64-targz-checksum-master] | [![][osx-x64-badge-5.0.1XX-rtm]][osx-x64-version-5.0.1XX-rtm]
[Installer][osx-x64-installer-5.0.1XX-rtm] - [Checksum][osx-x64-installer-checksum-5.0.1XX-rtm]
[tar.gz][osx-x64-targz-5.0.1XX-rtm] - [Checksum][osx-x64-targz-checksum-5.0.1XX-rtm] | [![][osx-x64-badge-5.0.1XX-rc2]][osx-x64-version-5.0.1XX-rc2]
[Installer][osx-x64-installer-5.0.1XX-rc2] - [Checksum][osx-x64-installer-checksum-5.0.1XX-rc2]
[tar.gz][osx-x64-targz-5.0.1XX-rc2] - [Checksum][osx-x64-targz-checksum-5.0.1XX-rc2] | [![][osx-x64-badge-3.1.4XX]][osx-x64-version-3.1.4XX]
[Installer][osx-x64-installer-3.1.4XX] - [Checksum][osx-x64-installer-checksum-3.1.4XX]
[tar.gz][osx-x64-targz-3.1.4XX] - [Checksum][osx-x64-targz-checksum-3.1.4XX] | [![][osx-x64-badge-3.1.1XX]][osx-x64-version-3.1.1XX]
[Installer][osx-x64-installer-3.1.1XX] - [Checksum][osx-x64-installer-checksum-3.1.1XX]
[tar.gz][osx-x64-targz-3.1.1XX] - [Checksum][osx-x64-targz-checksum-3.1.1XX] | +| **macOS arm64** | [![][osx-arm64-badge-master]][osx-arm64-version-master]
[Installer][osx-arm64-installer-master] - [Checksum][osx-arm64-installer-checksum-master]
[tar.gz][osx-arm64-targz-master] - [Checksum][osx-arm64-targz-checksum-master] | **N/A** | **N/A** | **N/A** | **N/A** | | **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-5.0.1XX-rtm]][linux-version-5.0.1XX-rtm]
[DEB Installer][linux-DEB-installer-5.0.1XX-rtm] - [Checksum][linux-DEB-installer-checksum-5.0.1XX-rtm]
[RPM Installer][linux-RPM-installer-5.0.1XX-rtm] - [Checksum][linux-RPM-installer-checksum-5.0.1XX-rtm]
_see installer note below_1
[tar.gz][linux-targz-5.0.1XX-rtm] - [Checksum][linux-targz-checksum-5.0.1XX-rtm] | [![][linux-badge-5.0.1XX-rc2]][linux-version-5.0.1XX-rc2]
[DEB Installer][linux-DEB-installer-5.0.1XX-rc2] - [Checksum][linux-DEB-installer-checksum-5.0.1XX-rc2]
[RPM Installer][linux-RPM-installer-5.0.1XX-rc2] - [Checksum][linux-RPM-installer-checksum-5.0.1XX-rc2]
_see installer note below_1
[tar.gz][linux-targz-5.0.1XX-rc2] - [Checksum][linux-targz-checksum-5.0.1XX-rc2] | [![][linux-badge-3.1.4XX]][linux-version-3.1.4XX]
[DEB Installer][linux-DEB-installer-3.1.4XX] - [Checksum][linux-DEB-installer-checksum-3.1.4XX]
[RPM Installer][linux-RPM-installer-3.1.4XX] - [Checksum][linux-RPM-installer-checksum-3.1.4XX]
_see installer note below_1
[tar.gz][linux-targz-3.1.4XX] - [Checksum][linux-targz-checksum-3.1.4XX] | [![][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 arm** | [![][linux-arm-badge-master]][linux-arm-version-master]
[tar.gz][linux-arm-targz-master] - [Checksum][linux-arm-targz-checksum-master] | [![][linux-arm-badge-5.0.1XX-rtm]][linux-arm-version-5.0.1XX-rtm]
[tar.gz][linux-arm-targz-5.0.1XX-rtm] - [Checksum][linux-arm-targz-checksum-5.0.1XX-rtm] | [![][linux-arm-badge-5.0.1XX-rc2]][linux-arm-version-5.0.1XX-rc2]
[tar.gz][linux-arm-targz-5.0.1XX-rc2] - [Checksum][linux-arm-targz-checksum-5.0.1XX-rc2] | [![][linux-arm-badge-3.1.4XX]][linux-arm-version-3.1.4XX]
[tar.gz][linux-arm-targz-3.1.4XX] - [Checksum][linux-arm-targz-checksum-3.1.4XX] | [![][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 arm64** | [![][linux-arm64-badge-master]][linux-arm64-version-master]
[tar.gz][linux-arm64-targz-master] - [Checksum][linux-arm64-targz-checksum-master] | [![][linux-arm64-badge-5.0.1XX-rtm]][linux-arm64-version-5.0.1XX-rtm]
[tar.gz][linux-arm64-targz-5.0.1XX-rtm] - [Checksum][linux-arm64-targz-checksum-5.0.1XX-rtm] | [![][linux-arm64-badge-5.0.1XX-rc2]][linux-arm64-version-5.0.1XX-rc2]
[tar.gz][linux-arm64-targz-5.0.1XX-rc2] - [Checksum][linux-arm64-targz-checksum-5.0.1XX-rc2] | [![][linux-arm64-badge-3.1.4XX]][linux-arm64-version-3.1.4XX]
[tar.gz][linux-arm64-targz-3.1.4XX] - [Checksum][linux-arm64-targz-checksum-3.1.4XX] | [![][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] | @@ -237,8 +239,6 @@ let ``pinning tests for readme in master 11/02/2020``() = | **Linux-musl-arm** | [![][linux-musl-arm-badge-master]][linux-musl-arm-version-master]
[tar.gz][linux-musl-arm-targz-master] - [Checksum][linux-musl-arm-targz-checksum-master] | **N/A** | **N/A** | **N/A** | **N/A** | | **Linux-musl-arm64** | [![][linux-musl-arm64-badge-master]][linux-musl-arm64-version-master]
[tar.gz][linux-musl-arm64-targz-master] - [Checksum][linux-musl-arm64-targz-checksum-master] | **N/A** | **N/A** | **N/A** | **N/A** | | **RHEL 6** | **N/A** | **N/A** | **N/A** | [![][rhel-6-badge-3.1.4XX]][rhel-6-version-3.1.4XX]
[tar.gz][rhel-6-targz-3.1.4XX] - [Checksum][rhel-6-targz-checksum-3.1.4XX] | [![][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] | -| **macOS x64** | [![][osx-x64-badge-master]][osx-x64-version-master]
[Installer][osx-x64-installer-master] - [Checksum][osx-x64-installer-checksum-master]
[tar.gz][osx-x64-targz-master] - [Checksum][osx-x64-targz-checksum-master] | [![][osx-x64-badge-5.0.1XX-rtm]][osx-x64-version-5.0.1XX-rtm]
[Installer][osx-x64-installer-5.0.1XX-rtm] - [Checksum][osx-x64-installer-checksum-5.0.1XX-rtm]
[tar.gz][osx-x64-targz-5.0.1XX-rtm] - [Checksum][osx-x64-targz-checksum-5.0.1XX-rtm] | [![][osx-x64-badge-5.0.1XX-rc2]][osx-x64-version-5.0.1XX-rc2]
[Installer][osx-x64-installer-5.0.1XX-rc2] - [Checksum][osx-x64-installer-checksum-5.0.1XX-rc2]
[tar.gz][osx-x64-targz-5.0.1XX-rc2] - [Checksum][osx-x64-targz-checksum-5.0.1XX-rc2] | [![][osx-x64-badge-3.1.4XX]][osx-x64-version-3.1.4XX]
[Installer][osx-x64-installer-3.1.4XX] - [Checksum][osx-x64-installer-checksum-3.1.4XX]
[tar.gz][osx-x64-targz-3.1.4XX] - [Checksum][osx-x64-targz-checksum-3.1.4XX] | [![][osx-x64-badge-3.1.1XX]][osx-x64-version-3.1.1XX]
[Installer][osx-x64-installer-3.1.1XX] - [Checksum][osx-x64-installer-checksum-3.1.1XX]
[tar.gz][osx-x64-targz-3.1.1XX] - [Checksum][osx-x64-targz-checksum-3.1.1XX] | -| **macOS arm64** | [![][osx-arm64-badge-master]][osx-arm64-version-master]
[Installer][osx-arm64-installer-master] - [Checksum][osx-arm64-installer-checksum-master]
[tar.gz][osx-arm64-targz-master] - [Checksum][osx-arm64-targz-checksum-master] | **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: diff --git a/tools/sdk-readme-table-generator/TableGenerator/Table.fs b/tools/sdk-readme-table-generator/TableGenerator/Table.fs index 52d1c9374..fa47f9a2e 100644 --- a/tools/sdk-readme-table-generator/TableGenerator/Table.fs +++ b/tools/sdk-readme-table-generator/TableGenerator/Table.fs @@ -130,6 +130,8 @@ let rows = windowsX86Row windowsArmRow windowsArm64Row + osxX64Row + osxArm64Row linuxDesktopArchRow linuxArmRow linuxArm64Row @@ -137,8 +139,6 @@ let rows = linuxMuslRowArm linuxMuslRowArm64 rhel6Row - osxX64Row - osxArm64Row ] let table branches = String.Join(Environment.NewLine, rows |> List.map (fun row -> row branches)) From e5876e7119cc9fc27bf9b9e6ebcce263c0d565db Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 8 Dec 2020 10:50:54 -0800 Subject: [PATCH 44/64] Update AspnetCore template/runtime versions to 5.0.1 --- eng/Versions.props | 2 +- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 983742343..5c8094cf1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -114,7 +114,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - $(MicrosoftAspNetCoreAppRuntime50PackageVersion) + 5.0.1 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index a9f8a9b4c..0a547abb3 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -34,8 +34,8 @@ <_WindowsDesktop50DefaultRuntimeFrameworkVersion>5.0.0 <_WindowsDesktop50RuntimePackVersion>5.0.0 <_WindowsDesktop50TargetingPackVersion>5.0.0 - <_AspNet50DefaultRuntimeFrameworkVersion>5.0.0 - <_AspNet50RuntimePackVersion>5.0.0 + <_AspNet50DefaultRuntimeFrameworkVersion>5.0.1 + <_AspNet50RuntimePackVersion>5.0.1 <_AspNet50TargetingPackVersion>5.0.0 <_NETCoreApp31RuntimePackVersion>3.1.9 From 8d0a196da7e86288ba94aa6bae8d2b3a538b87a4 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 8 Dec 2020 15:34:37 -0800 Subject: [PATCH 45/64] Update GenerateBundledVersions.targets --- src/redist/targets/GenerateBundledVersions.targets | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 0a547abb3..e7eec8398 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -334,7 +334,7 @@ Copyright (c) .NET Foundation. All rights reserved. Date: Tue, 8 Dec 2020 15:35:20 -0800 Subject: [PATCH 46/64] Update GenerateBundledVersions.targets --- src/redist/targets/GenerateBundledVersions.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index e7eec8398..1eb957839 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -409,7 +409,7 @@ Copyright (c) .NET Foundation. All rights reserved. Date: Thu, 10 Dec 2020 15:28:00 -0800 Subject: [PATCH 47/64] [release/5.0.2xx] Update dependencies from dotnet/sdk (#9188) * Update dependencies from https://github.com/dotnet/sdk build 20201202.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20601.11 -> To Version 5.0.200-preview.20602.3 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 3.9.0-2.20574.26 -> To Version 3.9.0-2.20602.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20201204.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20601.11 -> To Version 5.0.200-preview.20604.5 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 3.9.0-2.20574.26 -> To Version 3.9.0-2.20602.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20201207.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20601.11 -> To Version 5.0.200-preview.20607.7 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 3.9.0-2.20574.26 -> To Version 3.9.0-2.20602.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20201207.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20601.11 -> To Version 5.0.200-preview.20607.11 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 3.9.0-2.20574.26 -> To Version 3.9.0-2.20607.24 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20201207.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20601.11 -> To Version 5.0.200-preview.20607.13 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 3.9.0-2.20574.26 -> To Version 3.9.0-2.20608.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20201208.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20601.11 -> To Version 5.0.200-preview.20608.4 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 3.9.0-2.20574.26 -> To Version 3.9.0-2.20608.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20201208.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20601.11 -> To Version 5.0.200-preview.20608.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 11.0.0-beta.20507.4 -> To Version 11.0.0-beta.20607.10 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20201209.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20601.11 -> To Version 5.0.200-preview.20609.14 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 11.0.0-beta.20507.4 -> To Version 11.0.0-beta.20609.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20201209.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20601.11 -> To Version 5.0.200-preview.20609.15 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 11.0.0-beta.20507.4 -> To Version 11.0.0-beta.20609.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20201210.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20601.11 -> To Version 5.0.200-preview.20610.2 Dependency coherency updates Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.EntityFrameworkCore,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,Microsoft.DotNet.Cli.CommandLine From Version 5.0.0-rtm.20520.1 -> To Version 5.0.1-servicing.20580.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20201210.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-preview.20601.11 -> To Version 5.0.200-preview.20610.4 Dependency coherency updates Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.EntityFrameworkCore,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,Microsoft.DotNet.Cli.CommandLine From Version 5.0.0-rtm.20520.1 -> To Version 5.0.1-servicing.20580.3 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++-------- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 662fcd311..926df6e8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://github.com/dotnet/windowsdesktop - ec2af60c1eb8b2665745750f6445b3ff133178fb + cc1f119dc6ed7ca15c5d395cf7bdaa5c472f00e9 - + https://github.com/dotnet/windowsdesktop - ec2af60c1eb8b2665745750f6445b3ff133178fb + cc1f119dc6ed7ca15c5d395cf7bdaa5c472f00e9 https://github.com/dotnet/windowsdesktop @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + b02e13abab3d6f499751af2ad1ae6333fb4e633d - + https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + b02e13abab3d6f499751af2ad1ae6333fb4e633d - + https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + b02e13abab3d6f499751af2ad1ae6333fb4e633d - + https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + b02e13abab3d6f499751af2ad1ae6333fb4e633d @@ -55,29 +55,29 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://github.com/dotnet/aspnetcore - 371a26f07b23ad77c636332c2dfc0cbd1d8137ba + fc93e595ceffbb1e3e85532bf454e92a6a80dd6b - + https://github.com/dotnet/aspnetcore - 371a26f07b23ad77c636332c2dfc0cbd1d8137ba + fc93e595ceffbb1e3e85532bf454e92a6a80dd6b - + https://github.com/dotnet/efcore - 33570d0337f76208fa3a814f7f6d3a506bd9c0be + 494e218127bfb7afee3c9b10a30bcd32d6cd80db - + https://github.com/dotnet/aspnetcore - 371a26f07b23ad77c636332c2dfc0cbd1d8137ba + fc93e595ceffbb1e3e85532bf454e92a6a80dd6b - + https://github.com/dotnet/aspnetcore - 371a26f07b23ad77c636332c2dfc0cbd1d8137ba + fc93e595ceffbb1e3e85532bf454e92a6a80dd6b - + https://github.com/dotnet/aspnetcore - 371a26f07b23ad77c636332c2dfc0cbd1d8137ba + fc93e595ceffbb1e3e85532bf454e92a6a80dd6b https://github.com/dotnet/test-templates @@ -87,54 +87,54 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - 31980633108a1bef00c798136fcd30a873c90fa3 + 9d3065efbe93ec1daaa4d59115b2887f6b36766a - + https://github.com/dotnet/sdk - e2669aa5f6df92006367ead42434da79e0706a2b + 14eef7c48bbedac9d7269f7861fdd4e2e4b9d7a9 - + https://github.com/dotnet/sdk - e2669aa5f6df92006367ead42434da79e0706a2b + 14eef7c48bbedac9d7269f7861fdd4e2e4b9d7a9 - + https://github.com/dotnet/winforms - 30738f0987bdccb72f705af705521051fe141a46 + 200d7409fd9078764eb840e431bc3649caf3ad56 - + https://github.com/dotnet/wpf - 9e81b0885121e9958e48895ae48be9639a396528 + f336060dde15d0aecaf37f3493f699134451fa8c - + https://github.com/dotnet/fsharp - da6be68280c89131cdba2045525b80890401defd + 726b10446fe0032a9e8e871fe146e46c4051596e https://github.com/microsoft/vstest 0a56da68da5f466d32606bba8b7d8260ad9d2a43 - + https://github.com/mono/linker - e792d61a0ead2f6422b4c9af651c1128d978d454 + a7d9e15fa91952dd0f706f32908694a5110fe764 linker - + https://github.com/dotnet/roslyn - e9fd4dc7d74932c0d4b042251bc5a88bb5b3c437 + 2267a84dab5a58db7d82e12741d6f444a6abf0c1 https://github.com/dotnet/msbuild 126527ff107ae93fed10af675506c56d046aa5a3 - + https://github.com/NuGet/NuGet.Client - a4c9d63bf942f1df1ba9486a87bad2e4b6888488 + 8e3cdf1b3475a0cb68a65dd2ffd51a2135f1fb67 - https://github.com/dotnet/cliCommandLineParser + https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 diff --git a/eng/Versions.props b/eng/Versions.props index bb9d0eeed..d90b20d52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 5.0.0-rtm.20520.1 + 5.0.1-servicing.20575.6 - 5.0.0-rtm.20520.3 + 5.0.1-servicing.20580.1 - 5.0.0 + 5.0.1 @@ -43,21 +43,21 @@ - 5.0.0 + 5.0.1 5.0.0 5.0.0-rtm.20526.5 - 5.0.0-rtm.20526.5 - 5.0.0-rtm.20526.5 - 5.0.0-rtm.20526.5 - 5.0.0-rtm.20526.5 + 5.0.1-servicing.20601.7 + 5.0.1-servicing.20601.7 + 5.0.1-servicing.20601.7 + 5.0.1-servicing.20601.7 0.2.0 - 5.0.200-preview.20601.11 - 5.0.200-preview.20601.11 + 5.0.200-preview.20610.4 + 5.0.200-preview.20610.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,17 +68,17 @@ - 5.0.0-rtm.20519.4 - 5.0.0 - 5.0.0 + 5.0.1-servicing.20575.16 + 5.0.1 + 5.0.1 5.0.0 - 5.0.0 + 5.0.1 2.1.0 - 5.0.0-rtm.20520.1 - 5.0.0 + 5.0.1-servicing.20580.3 + 5.0.1 5.0.0 5.0.0-rtm.20520.1 From ee10024d1d3ec7648ebe22b2f6f9c816a72d492d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Dec 2020 04:36:37 +0000 Subject: [PATCH 48/64] Update dependencies from https://github.com/dotnet/sdk build 20201210.17 (#9209) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20609.6 to 11.0.0-beta.20610.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 926df6e8b..7875a337e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 9d3065efbe93ec1daaa4d59115b2887f6b36766a - + https://github.com/dotnet/sdk - 14eef7c48bbedac9d7269f7861fdd4e2e4b9d7a9 + 5c7ff2a1604ab42d4b2f97c2ed2fdd846346c19f - + https://github.com/dotnet/sdk - 14eef7c48bbedac9d7269f7861fdd4e2e4b9d7a9 + 5c7ff2a1604ab42d4b2f97c2ed2fdd846346c19f @@ -108,9 +108,9 @@ https://github.com/dotnet/wpf f336060dde15d0aecaf37f3493f699134451fa8c - + https://github.com/dotnet/fsharp - 726b10446fe0032a9e8e871fe146e46c4051596e + fac3391bcf8b046ed48dc0e3df1e22052679b673 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index d90b20d52..76107e648 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20610.4 - 5.0.200-preview.20610.4 + 5.0.200-preview.20610.17 + 5.0.200-preview.20610.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a867c4c04f4592a6679ad610bcaaaab541dab7d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Dec 2020 13:35:32 +0000 Subject: [PATCH 49/64] Update dependencies from https://github.com/dotnet/sdk build 20201211.1 (#9210) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-rtm.20573.4 to 5.0.0-rtm.20604.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7875a337e..8123e46d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 9d3065efbe93ec1daaa4d59115b2887f6b36766a - + https://github.com/dotnet/sdk - 5c7ff2a1604ab42d4b2f97c2ed2fdd846346c19f + f92a3e06904f56cfb4151c8e83e4d8c912bf063c - + https://github.com/dotnet/sdk - 5c7ff2a1604ab42d4b2f97c2ed2fdd846346c19f + f92a3e06904f56cfb4151c8e83e4d8c912bf063c @@ -116,9 +116,9 @@ https://github.com/microsoft/vstest 0a56da68da5f466d32606bba8b7d8260ad9d2a43 - + https://github.com/mono/linker - a7d9e15fa91952dd0f706f32908694a5110fe764 + 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker diff --git a/eng/Versions.props b/eng/Versions.props index 76107e648..8f18c4806 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20610.17 - 5.0.200-preview.20610.17 + 5.0.200-preview.20611.1 + 5.0.200-preview.20611.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fe01e66a2749581b8f2d8d178b29d2c25de96a3c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Dec 2020 13:54:05 +0000 Subject: [PATCH 50/64] Update dependencies from https://github.com/dotnet/arcade build 20201209.9 (#9211) [master] Update dependencies from dotnet/arcade - Coherency Updates: - XliffTasks: from 1.0.0-beta.20605.1 to 1.0.0-beta.20608.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/post-build/post-build-utils.ps1 | 6 +++--- global.json | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa20beb8a..17889d1ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -148,13 +148,13 @@ - + https://github.com/dotnet/arcade - b984ce874f048ec28e1067e9f47bdb183682df46 + 66c6b1b53965afd8ee5695a36b1909d006ae98af - + https://github.com/dotnet/arcade - b984ce874f048ec28e1067e9f47bdb183682df46 + 66c6b1b53965afd8ee5695a36b1909d006ae98af https://github.com/dotnet/source-build-reference-packages @@ -164,9 +164,9 @@ https://github.com/dotnet/sourcelink f3182c5db7acd80fab1e8ce3332b327886692951 - + https://github.com/dotnet/xliff-tasks - e3a45fddee008a25d4dfc1c5222d93636ecf009b + 2737d94d136f96dc6d0e5b08c4ed0791477fac25 diff --git a/eng/Versions.props b/eng/Versions.props index 8f61a3a42..11288fc54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.20608.21 + 6.0.0-beta.20609.9 diff --git a/eng/common/post-build/post-build-utils.ps1 b/eng/common/post-build/post-build-utils.ps1 index 7d4974479..534f6988d 100644 --- a/eng/common/post-build/post-build-utils.ps1 +++ b/eng/common/post-build/post-build-utils.ps1 @@ -69,9 +69,9 @@ function Trigger-Subscription([string]$SubscriptionId) { function Validate-MaestroVars { try { - Get-Variable MaestroApiEndPoint -Scope Global | Out-Null - Get-Variable MaestroApiVersion -Scope Global | Out-Null - Get-Variable MaestroApiAccessToken -Scope Global | Out-Null + Get-Variable MaestroApiEndPoint | Out-Null + Get-Variable MaestroApiVersion | Out-Null + Get-Variable MaestroApiAccessToken | Out-Null if (!($MaestroApiEndPoint -Match '^http[s]?://maestro-(int|prod).westus2.cloudapp.azure.com$')) { Write-PipelineTelemetryError -Category 'MaestroVars' -Message "MaestroApiEndPoint is not a valid Maestro URL. '$MaestroApiEndPoint'" diff --git a/global.json b/global.json index 2c17d237a..f5c66bafa 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20608.21" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20609.9" } } From 6554f1a345c0996ca4c09ca91145a1e2c73c0523 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Dec 2020 16:21:58 +0000 Subject: [PATCH 51/64] Update dependencies from https://github.com/dotnet/arcade build 20201130.4 (#9213) [release/5.0.2xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 5 +++-- eng/common/SetupNugetSources.sh | 4 ++-- global.json | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8123e46d0..53d07a2db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -148,13 +148,13 @@ - + https://github.com/dotnet/arcade - 6f54e001de0c52e52578e5252cb279f5bc9a2eb6 + 79333c52da3f213509ab79bd92924660e04e668c - + https://github.com/dotnet/arcade - 6f54e001de0c52e52578e5252cb279f5bc9a2eb6 + 79333c52da3f213509ab79bd92924660e04e668c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 8f18c4806..ba0f5930c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.20560.3 + 5.0.0-beta.20580.4 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index bb3617133..a0b5fc37f 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -99,8 +99,9 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw function EnablePrivatePackageSources($DisabledPackageSources) { $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") ForEach ($DisabledPackageSource in $maestroPrivateSources) { - Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled" - $DisabledPackageSource.SetAttribute("value", "false") + Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource" + # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries + $DisabledPackageSources.RemoveChild($DisabledPackageSource) } } diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index ef3338295..2734601c1 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -158,8 +158,8 @@ if [ "$?" == "0" ]; then for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do if [[ $DisabledSourceName == darc-int* ]] then - OldDisableValue="add key=\"$DisabledSourceName\" value=\"true\"" - NewDisableValue="add key=\"$DisabledSourceName\" value=\"false\"" + OldDisableValue="" + NewDisableValue="" sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile echo "Neutralized disablePackageSources entry for '$DisabledSourceName'" fi diff --git a/global.json b/global.json index 6f7250607..041b260a3 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20560.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20580.4" } } From 42a530b3a881a45080bf7c5ced9e8e70afd4ee12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Dec 2020 18:50:55 +0000 Subject: [PATCH 52/64] Update dependencies from https://github.com/dotnet/sdk build 20201211.4 (#9214) [release/5.0.2xx] Update dependencies from dotnet/sdk --- 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 53d07a2db..c9fea9b52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 9d3065efbe93ec1daaa4d59115b2887f6b36766a - + https://github.com/dotnet/sdk - f92a3e06904f56cfb4151c8e83e4d8c912bf063c + af12a81a443ffd0c6f0a18d28029a39d3870bc69 - + https://github.com/dotnet/sdk - f92a3e06904f56cfb4151c8e83e4d8c912bf063c + af12a81a443ffd0c6f0a18d28029a39d3870bc69 diff --git a/eng/Versions.props b/eng/Versions.props index ba0f5930c..35ea45025 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20611.1 - 5.0.200-preview.20611.1 + 5.0.200-preview.20611.4 + 5.0.200-preview.20611.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 68dd013b56d6edcbac348c42b9400138ae55d839 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Dec 2020 22:56:18 +0000 Subject: [PATCH 53/64] Update dependencies from https://github.com/dotnet/sdk build 20201211.8 (#9216) [release/5.0.2xx] Update dependencies from dotnet/sdk --- 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 c9fea9b52..a403cb340 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 9d3065efbe93ec1daaa4d59115b2887f6b36766a - + https://github.com/dotnet/sdk - af12a81a443ffd0c6f0a18d28029a39d3870bc69 + 6fc9cd74ea84149b8051c36c2a19365cc092952b - + https://github.com/dotnet/sdk - af12a81a443ffd0c6f0a18d28029a39d3870bc69 + 6fc9cd74ea84149b8051c36c2a19365cc092952b diff --git a/eng/Versions.props b/eng/Versions.props index 35ea45025..ede4e1eda 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20611.4 - 5.0.200-preview.20611.4 + 5.0.200-preview.20611.8 + 5.0.200-preview.20611.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 53d313443f0e77006b08d4e7e818d8128bb0b6ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Dec 2020 23:59:16 +0000 Subject: [PATCH 54/64] Update dependencies from https://github.com/dotnet/sdk build 20201211.15 (#9217) [release/5.0.2xx] Update dependencies from dotnet/sdk --- 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 a403cb340..114df15dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 9d3065efbe93ec1daaa4d59115b2887f6b36766a - + https://github.com/dotnet/sdk - 6fc9cd74ea84149b8051c36c2a19365cc092952b + 28716b75223b2df4af40b89706eec20ab5721cc6 - + https://github.com/dotnet/sdk - 6fc9cd74ea84149b8051c36c2a19365cc092952b + 28716b75223b2df4af40b89706eec20ab5721cc6 diff --git a/eng/Versions.props b/eng/Versions.props index ede4e1eda..aafbfd6ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20611.8 - 5.0.200-preview.20611.8 + 5.0.200-preview.20611.15 + 5.0.200-preview.20611.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5c82df1ac57f767d54ac43cf5b2b478293d0c9ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 12 Dec 2020 00:54:22 +0000 Subject: [PATCH 55/64] Update dependencies from https://github.com/dotnet/sdk build 20201211.22 (#9218) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20610.2 to 11.0.0-beta.20610.5 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.8.0 to 16.8.2 (parent: Microsoft.NET.Sdk) --- NuGet.config | 5 +++++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9e48ae7d9..4c51b6d01 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 114df15dd..ae65f6d13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 9d3065efbe93ec1daaa4d59115b2887f6b36766a - + https://github.com/dotnet/sdk - 28716b75223b2df4af40b89706eec20ab5721cc6 + dcca8487a5720f56278e795987813bea50378ef8 - + https://github.com/dotnet/sdk - 28716b75223b2df4af40b89706eec20ab5721cc6 + dcca8487a5720f56278e795987813bea50378ef8 @@ -108,9 +108,9 @@ https://github.com/dotnet/wpf f336060dde15d0aecaf37f3493f699134451fa8c - + https://github.com/dotnet/fsharp - fac3391bcf8b046ed48dc0e3df1e22052679b673 + c1aa4d783c0ce4472c3d4715856ebc1face66ac6 https://github.com/microsoft/vstest @@ -125,9 +125,9 @@ https://github.com/dotnet/roslyn 2267a84dab5a58db7d82e12741d6f444a6abf0c1 - + https://github.com/dotnet/msbuild - 126527ff107ae93fed10af675506c56d046aa5a3 + 25e4d540bb58fd6d61aec1c33bc88c081e0c2299 https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index aafbfd6ed..e417140e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20611.15 - 5.0.200-preview.20611.15 + 5.0.200-preview.20611.22 + 5.0.200-preview.20611.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4a3f4d656304f1e1dcaf7f9ea9e8145b032f2fc7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 12 Dec 2020 01:39:22 +0000 Subject: [PATCH 56/64] Update dependencies from https://github.com/dotnet/sdk build 20201211.28 (#9219) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20610.5 to 11.0.0-beta.20611.5 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae65f6d13..0508e64cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 9d3065efbe93ec1daaa4d59115b2887f6b36766a - + https://github.com/dotnet/sdk - dcca8487a5720f56278e795987813bea50378ef8 + 70ef6d8670ffe75d89b6375fda9fca131bc3d461 - + https://github.com/dotnet/sdk - dcca8487a5720f56278e795987813bea50378ef8 + 70ef6d8670ffe75d89b6375fda9fca131bc3d461 @@ -108,9 +108,9 @@ https://github.com/dotnet/wpf f336060dde15d0aecaf37f3493f699134451fa8c - + https://github.com/dotnet/fsharp - c1aa4d783c0ce4472c3d4715856ebc1face66ac6 + 0175996d4c4549a18b51a45ccb4c510fd8481a5b https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index e417140e0..c216f6490 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20611.22 - 5.0.200-preview.20611.22 + 5.0.200-preview.20611.28 + 5.0.200-preview.20611.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fcd978bcc099960123652c5bd0078ec44e77588f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 12 Dec 2020 02:25:35 +0000 Subject: [PATCH 57/64] Update dependencies from https://github.com/dotnet/sdk build 20201211.31 (#9220) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.8.2 to 16.9.0-preview-20611-06 (parent: Microsoft.NET.Sdk) --- NuGet.config | 5 ----- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4c51b6d01..9e48ae7d9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,11 +5,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0508e64cf..5bd69633e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 9d3065efbe93ec1daaa4d59115b2887f6b36766a - + https://github.com/dotnet/sdk - 70ef6d8670ffe75d89b6375fda9fca131bc3d461 + 8a58b94da93cec07816afed64a83ccb069c45182 - + https://github.com/dotnet/sdk - 70ef6d8670ffe75d89b6375fda9fca131bc3d461 + 8a58b94da93cec07816afed64a83ccb069c45182 @@ -125,9 +125,9 @@ https://github.com/dotnet/roslyn 2267a84dab5a58db7d82e12741d6f444a6abf0c1 - + https://github.com/dotnet/msbuild - 25e4d540bb58fd6d61aec1c33bc88c081e0c2299 + 5abf1ff7bc05ef47a7680f6a5ea87f3c6f32812c https://github.com/NuGet/NuGet.Client diff --git a/eng/Versions.props b/eng/Versions.props index c216f6490..2ff1232e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20611.28 - 5.0.200-preview.20611.28 + 5.0.200-preview.20611.31 + 5.0.200-preview.20611.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f442630c2ccf9858163aaaadc2db3b55d91fff34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 12 Dec 2020 13:54:40 +0000 Subject: [PATCH 58/64] Update dependencies from https://github.com/dotnet/arcade build 20201210.4 (#9221) [master] Update dependencies from dotnet/arcade - Coherency Updates: - XliffTasks: from 1.0.0-beta.20608.1 to 1.0.0-beta.20609.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17889d1ee..8d79b947d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -148,13 +148,13 @@ - + https://github.com/dotnet/arcade - 66c6b1b53965afd8ee5695a36b1909d006ae98af + 3346d7b4ff047c854913fb2ded6e3aa726da6d11 - + https://github.com/dotnet/arcade - 66c6b1b53965afd8ee5695a36b1909d006ae98af + 3346d7b4ff047c854913fb2ded6e3aa726da6d11 https://github.com/dotnet/source-build-reference-packages @@ -164,9 +164,9 @@ https://github.com/dotnet/sourcelink f3182c5db7acd80fab1e8ce3332b327886692951 - + https://github.com/dotnet/xliff-tasks - 2737d94d136f96dc6d0e5b08c4ed0791477fac25 + a23212cca46ae31bda5641976c457c29ae76f137 diff --git a/eng/Versions.props b/eng/Versions.props index 11288fc54..f080db939 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.20609.9 + 6.0.0-beta.20610.4 diff --git a/global.json b/global.json index f5c66bafa..3b8f38f68 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20609.9" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20610.4" } } From 3f100132de2a04b8e562a8c2d65e0e5a0eba9909 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 14 Dec 2020 16:22:37 -0800 Subject: [PATCH 59/64] Update README.md --- tools/sdk-readme-table-generator/README.md | Bin 1106 -> 948 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tools/sdk-readme-table-generator/README.md b/tools/sdk-readme-table-generator/README.md index 28f53a88d9d609ae4ce6f018cbd4f5780239e137..9ce5ad6e7dc86c5329535dfedc5b6b2a0e87d693 100644 GIT binary patch literal 948 zcma)4OKRLe5Zw>V9SVDsz#x&&#@@wv0z+_O9PdKFEp=(sjMOE%OBQpsEOMk=A+IEb zc#%bfw2)M<`u%?W_<2cRZ$Ht){=@Cvp43$x(~%=5r;@gt?dDPbyfbNwXC9G;z8P-d zM0Lyci9)1m44o%0Q|!d~W%B#0R&~hNWqAzRj#W`hUwYBVT85a_bseYIg`M=KpuG<| zpYjyqFzQWm5!>^VZNE=)Os+4QOjFCz#u8J=(<31F9VR42d+aCY6{AICP}zG1fFH2$wj5y$`s;}#sP%i7W6RAG-z0;?Es`H zbltxkn;;)RZ|qjG1s&7`M1g1#%Dqdvqbz?}+FytpI;V}Ko}BmWcQi3RV^1$o0eOp% z*}0WVK{q3o&-=3)r;1e}MxlB3#eP<2!mEdxcTmGPrhb_+T(`)3mkkMLeb3YcROCNG zEvrtda>15Mzlz>(H-zi+m&g4zJz}?vil9*%#9%(87bG}pfWG-am|`)s?s*X`!?_%c z7s>OiifIU3TbQj=vUJxP!=|YXb!$$~YJ&GrfCjff+w$$^{hB3b)CGpDLCy1OAFZDU znvwtl-(Y#iE=BryiM&FDYm3#c>m@H0zPP%gN>rD#D&}-SC#SBUdtfv8NRf Y4^$(Y&?7>qL{m+%DZw1N4zZThZ;k0ldjJ3c literal 1106 zcma)*%}c{T5XI*#_&+T5qTt6_Z;BN}1W|7yH2uyTy_sH${yCNEU^~i0M z!sfg@ZTLz@3^sA!iM{cePSC{X|5e!;4cyZlL}kbJf%TOv zSG@G|a*eh1ZU`gsNSQ!|>SE=1SGL!wqZyxU`KD>ey+-BM*E6tFmb#(&Z5%Oh);~#^ zE9(L0H`g-rS-IpF From 0f985b1947ef457d2593e9a37d2ae8570b600bc1 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 14 Dec 2020 22:10:08 -0800 Subject: [PATCH 60/64] Restore the changes to the files in the eng/ foler and global.json --- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 2 +- eng/common/post-build/post-build-utils.ps1 | 6 +++--- global.json | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b1c35b5e..aa20beb8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -129,12 +129,12 @@ https://github.com/dotnet/msbuild 56ab6340935d039999a588621733fa2384dae2a3 - + https://github.com/NuGet/NuGet.Client - 8e3cdf1b3475a0cb68a65dd2ffd51a2135f1fb67 + a4c9d63bf942f1df1ba9486a87bad2e4b6888488 - https://github.com/dotnet/CliCommandLineParser + https://github.com/dotnet/cliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 @@ -148,13 +148,13 @@ - + https://github.com/dotnet/arcade - 3346d7b4ff047c854913fb2ded6e3aa726da6d11 + b984ce874f048ec28e1067e9f47bdb183682df46 - + https://github.com/dotnet/arcade - 3346d7b4ff047c854913fb2ded6e3aa726da6d11 + b984ce874f048ec28e1067e9f47bdb183682df46 https://github.com/dotnet/source-build-reference-packages @@ -164,9 +164,9 @@ https://github.com/dotnet/sourcelink f3182c5db7acd80fab1e8ce3332b327886692951 - + https://github.com/dotnet/xliff-tasks - a23212cca46ae31bda5641976c457c29ae76f137 + e3a45fddee008a25d4dfc1c5222d93636ecf009b diff --git a/eng/Versions.props b/eng/Versions.props index f080db939..8f61a3a42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.20610.4 + 6.0.0-beta.20608.21 diff --git a/eng/common/post-build/post-build-utils.ps1 b/eng/common/post-build/post-build-utils.ps1 index 534f6988d..7d4974479 100644 --- a/eng/common/post-build/post-build-utils.ps1 +++ b/eng/common/post-build/post-build-utils.ps1 @@ -69,9 +69,9 @@ function Trigger-Subscription([string]$SubscriptionId) { function Validate-MaestroVars { try { - Get-Variable MaestroApiEndPoint | Out-Null - Get-Variable MaestroApiVersion | Out-Null - Get-Variable MaestroApiAccessToken | Out-Null + Get-Variable MaestroApiEndPoint -Scope Global | Out-Null + Get-Variable MaestroApiVersion -Scope Global | Out-Null + Get-Variable MaestroApiAccessToken -Scope Global | Out-Null if (!($MaestroApiEndPoint -Match '^http[s]?://maestro-(int|prod).westus2.cloudapp.azure.com$')) { Write-PipelineTelemetryError -Category 'MaestroVars' -Message "MaestroApiEndPoint is not a valid Maestro URL. '$MaestroApiEndPoint'" diff --git a/global.json b/global.json index 3b8f38f68..2c17d237a 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20610.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20608.21" } } From 72b2e440abceb8974e73b89a9f5e4d4c4e0b6cfe Mon Sep 17 00:00:00 2001 From: Jan Vorlicek Date: Tue, 15 Dec 2020 12:57:44 +0100 Subject: [PATCH 61/64] Update README.md and table generator for linux-musl-arm --- README.md | 14 ++++++++++++-- .../TableGenerator.Tests/DomainTests.fs | 2 ++ .../TableGenerator/Reference.fs | 4 ++-- .../TableGenerator/Shared.fs | 2 ++ .../TableGenerator/Table.fs | 4 ++-- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d47833b6e..84540aa04 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,8 @@ Please do not directly edit the table below. Use https://github.com/dotnet/insta | **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-5.0.2XX]][linux-arm-version-5.0.2XX]
[tar.gz][linux-arm-targz-5.0.2XX] - [Checksum][linux-arm-targz-checksum-5.0.2XX] | [![][linux-arm-badge-5.0.1XX-rtm]][linux-arm-version-5.0.1XX-rtm]
[tar.gz][linux-arm-targz-5.0.1XX-rtm] - [Checksum][linux-arm-targz-checksum-5.0.1XX-rtm] | [![][linux-arm-badge-3.1.4XX]][linux-arm-version-3.1.4XX]
[tar.gz][linux-arm-targz-3.1.4XX] - [Checksum][linux-arm-targz-checksum-3.1.4XX] | [![][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 arm64** | [![][linux-arm64-badge-master]][linux-arm64-version-master]
[tar.gz][linux-arm64-targz-master] - [Checksum][linux-arm64-targz-checksum-master] | [![][linux-arm64-badge-5.0.2XX]][linux-arm64-version-5.0.2XX]
[tar.gz][linux-arm64-targz-5.0.2XX] - [Checksum][linux-arm64-targz-checksum-5.0.2XX] | [![][linux-arm64-badge-5.0.1XX-rtm]][linux-arm64-version-5.0.1XX-rtm]
[tar.gz][linux-arm64-targz-5.0.1XX-rtm] - [Checksum][linux-arm64-targz-checksum-5.0.1XX-rtm] | [![][linux-arm64-badge-3.1.4XX]][linux-arm64-version-3.1.4XX]
[tar.gz][linux-arm64-targz-3.1.4XX] - [Checksum][linux-arm64-targz-checksum-3.1.4XX] | [![][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-musl-x64** | [![][linux-musl-x64-badge-master]][linux-musl-x64-version-master]
[tar.gz][linux-musl-x64-targz-master] - [Checksum][linux-musl-x64-targz-checksum-master] | [![][linux-musl-x64-badge-5.0.2XX]][linux-musl-x64-version-5.0.2XX]
[tar.gz][linux-musl-x64-targz-5.0.2XX] - [Checksum][linux-musl-x64-targz-checksum-5.0.2XX] | [![][linux-musl-x64-badge-5.0.1XX-rtm]][linux-musl-x64-version-5.0.1XX-rtm]
[tar.gz][linux-musl-x64-targz-5.0.1XX-rtm] - [Checksum][linux-musl-x64-targz-checksum-5.0.1XX-rtm] | [![][linux-musl-x64-badge-3.1.4XX]][linux-musl-x64-version-3.1.4XX]
[tar.gz][linux-musl-x64-targz-3.1.4XX] - [Checksum][linux-musl-x64-targz-checksum-3.1.4XX] | [![][linux-musl-x64-badge-3.1.1XX]][linux-musl-x64-version-3.1.1XX]
[tar.gz][linux-musl-x64-targz-3.1.1XX] - [Checksum][linux-musl-x64-targz-checksum-3.1.1XX] | -| **Linux-musl-arm** | [![][linux-musl-arm-badge-master]][linux-musl-arm-version-master]
[tar.gz][linux-musl-arm-targz-master] - [Checksum][linux-musl-arm-targz-checksum-master] | **N/A** | **N/A** | **N/A** | **N/A** | -| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-master]][linux-musl-arm64-version-master]
[tar.gz][linux-musl-arm64-targz-master] - [Checksum][linux-musl-arm64-targz-checksum-master] | **N/A** | **N/A** | **N/A** | **N/A** | +| **Linux-musl-arm** | [![][linux-musl-arm-badge-master]][linux-musl-arm-version-master]
[tar.gz][linux-musl-arm-targz-master] - [Checksum][linux-musl-arm-targz-checksum-master] | [![][linux-musl-arm-badge-5.0.2XX]][linux-musl-arm-version-5.0.2XX]
[tar.gz][linux-musl-arm-targz-5.0.2XX] - [Checksum][linux-musl-arm-targz-checksum-5.0.2XX] | **N/A** | **N/A** | **N/A** | +| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-master]][linux-musl-arm64-version-master]
[tar.gz][linux-musl-arm64-targz-master] - [Checksum][linux-musl-arm64-targz-checksum-master] | [![][linux-musl-arm64-badge-5.0.2XX]][linux-musl-arm64-version-5.0.2XX]
[tar.gz][linux-musl-arm64-targz-5.0.2XX] - [Checksum][linux-musl-arm64-targz-checksum-5.0.2XX] | **N/A** | **N/A** | **N/A** | | **RHEL 6** | **N/A** | **N/A** | **N/A** | [![][rhel-6-badge-3.1.4XX]][rhel-6-version-3.1.4XX]
[tar.gz][rhel-6-targz-3.1.4XX] - [Checksum][rhel-6-targz-checksum-3.1.4XX] | [![][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] | Reference notes: @@ -354,11 +354,21 @@ Reference notes: [linux-musl-arm-targz-master]: https://aka.ms/dotnet/net6/dev/Sdk/dotnet-sdk-linux-musl-arm.tar.gz [linux-musl-arm-targz-checksum-master]: https://aka.ms/dotnet/net6/dev/Sdk/dotnet-sdk-linux-musl-arm.tar.gz.sha +[linux-musl-arm-badge-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/linux_musl_arm_Release_version_badge.svg +[linux-musl-arm-version-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/productCommit-linux-musl-arm.txt +[linux-musl-arm-targz-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/dotnet-sdk-linux-musl-arm.tar.gz +[linux-musl-arm-targz-checksum-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/dotnet-sdk-linux-musl-arm.tar.gz.sha + [linux-musl-arm64-badge-master]: https://aka.ms/dotnet/net6/dev/Sdk/linux_musl_arm64_Release_version_badge.svg [linux-musl-arm64-version-master]: https://aka.ms/dotnet/net6/dev/Sdk/productCommit-linux-musl-arm64.txt [linux-musl-arm64-targz-master]: https://aka.ms/dotnet/net6/dev/Sdk/dotnet-sdk-linux-musl-arm64.tar.gz [linux-musl-arm64-targz-checksum-master]: https://aka.ms/dotnet/net6/dev/Sdk/dotnet-sdk-linux-musl-arm64.tar.gz.sha +[linux-musl-arm64-badge-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/linux_musl_arm64_Release_version_badge.svg +[linux-musl-arm64-version-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/productCommit-linux-musl-arm64.txt +[linux-musl-arm64-targz-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/dotnet-sdk-linux-musl-arm64.tar.gz +[linux-musl-arm64-targz-checksum-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/dotnet-sdk-linux-musl-arm64.tar.gz.sha + [win-arm-badge-master]: https://aka.ms/dotnet/net6/dev/Sdk/win_arm_Release_version_badge.svg [win-arm-version-master]: https://aka.ms/dotnet/net6/dev/Sdk/productCommit-win-arm.txt [win-arm-zip-master]: https://aka.ms/dotnet/net6/dev/Sdk/dotnet-sdk-win-arm.zip diff --git a/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs b/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs index 9ed7515d0..317470222 100644 --- a/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs +++ b/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs @@ -36,6 +36,7 @@ let ``it can get major and minor version of a branch``() = (MajorMinor ({ Major = 3 Minor = 1 + Patch = 199 Release = ""})) [] @@ -49,6 +50,7 @@ let ``it can get major and minor version of a preview branch``() = (MajorMinor ({ Major = 5 Minor = 0 + Patch = 199 Release = "preview2"})) [] diff --git a/tools/sdk-readme-table-generator/TableGenerator/Reference.fs b/tools/sdk-readme-table-generator/TableGenerator/Reference.fs index 9092a70e7..3f45cf8cf 100644 --- a/tools/sdk-readme-table-generator/TableGenerator/Reference.fs +++ b/tools/sdk-readme-table-generator/TableGenerator/Reference.fs @@ -155,14 +155,14 @@ let linuxMuslArmReferenceTemplate branch = let format branch = formatTemplate "linux-musl-arm" linuxMuslReferenceTemplate branch match getMajorMinor branch with | Master -> format branch - | MajorMinor { Major = major; Minor = _minor } when major >= 6 -> format branch + | MajorMinor { Major = major; Minor = _minor; Patch = patch } when major >= 6 || (major >= 5 && patch >= 299) -> format branch | _ -> None let linuxMuslArm64ReferenceTemplate branch = let format branch = formatTemplate "linux-musl-arm64" linuxMuslReferenceTemplate branch match getMajorMinor branch with | Master -> format branch - | MajorMinor { Major = major; Minor = _minor } when major >= 6 -> format branch + | MajorMinor { Major = major; Minor = _minor; Patch = patch } when major >= 6 || (major >= 5 && patch >= 299) -> format branch | _ -> None let winArmMuslReferenceTemplate branch = diff --git a/tools/sdk-readme-table-generator/TableGenerator/Shared.fs b/tools/sdk-readme-table-generator/TableGenerator/Shared.fs index 6cbaabc67..63aec60ff 100644 --- a/tools/sdk-readme-table-generator/TableGenerator/Shared.fs +++ b/tools/sdk-readme-table-generator/TableGenerator/Shared.fs @@ -18,6 +18,7 @@ let branchNameShorten (branch: Branch): string = type BranchMajorMinorVersion = { Major: int Minor: int + Patch: int Release: string} type BranchMajorMinorVersionOrMaster = @@ -38,5 +39,6 @@ let getMajorMinor (branch: Branch): BranchMajorMinorVersionOrMaster = MajorMinor { Major = version.Major Minor = version.Minor + Patch = version.Patch Release = version.Release} | _ -> NoVersion diff --git a/tools/sdk-readme-table-generator/TableGenerator/Table.fs b/tools/sdk-readme-table-generator/TableGenerator/Table.fs index fa47f9a2e..3be2d34ab 100644 --- a/tools/sdk-readme-table-generator/TableGenerator/Table.fs +++ b/tools/sdk-readme-table-generator/TableGenerator/Table.fs @@ -79,7 +79,7 @@ let linuxMuslRowArm branches = let tableTemplateForThisArch branch = match getMajorMinor branch with | Master -> format branch - | MajorMinor { Major = major; Minor = _minor } when major >= 6 -> format branch + | MajorMinor { Major = major; Minor = _minor; Patch = patch } when major >= 6 || (major >= 5 && patch >= 299) -> format branch | _ -> notAvailable formRow "**Linux-musl-arm**" tableTemplateForThisArch branches @@ -88,7 +88,7 @@ let linuxMuslRowArm64 branches = let tableTemplateForThisArch branch = match getMajorMinor branch with | Master -> format branch - | MajorMinor { Major = major; Minor = _minor } when major >= 6 -> format branch + | MajorMinor { Major = major; Minor = _minor; Patch = patch } when major >= 6 || (major >= 5 && patch >= 299) -> format branch | _ -> notAvailable formRow "**Linux-musl-arm64**" tableTemplateForThisArch branches From 6b9e921aadef039041a66c98c7a93e7f0aabfd56 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Dec 2020 16:48:30 +0000 Subject: [PATCH 62/64] Update dependencies from https://github.com/dotnet/arcade build 20201214.8 (#9237) [master] Update dependencies from dotnet/arcade - Coherency Updates: - XliffTasks: from 1.0.0-beta.20605.1 to 1.0.0-beta.20610.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/CommonLibrary.psm1 | 2 +- eng/common/post-build/post-build-utils.ps1 | 6 +++--- global.json | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa20beb8a..3ee3db82c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -148,13 +148,13 @@ - + https://github.com/dotnet/arcade - b984ce874f048ec28e1067e9f47bdb183682df46 + b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 - + https://github.com/dotnet/arcade - b984ce874f048ec28e1067e9f47bdb183682df46 + b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 https://github.com/dotnet/source-build-reference-packages @@ -164,9 +164,9 @@ https://github.com/dotnet/sourcelink f3182c5db7acd80fab1e8ce3332b327886692951 - + https://github.com/dotnet/xliff-tasks - e3a45fddee008a25d4dfc1c5222d93636ecf009b + 686f15821486dd41b31b11380e86a2e616134b72 diff --git a/eng/Versions.props b/eng/Versions.props index 8f61a3a42..25135e13d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.20608.21 + 6.0.0-beta.20614.8 diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1 index d7d1a6510..adf707c8f 100644 --- a/eng/common/native/CommonLibrary.psm1 +++ b/eng/common/native/CommonLibrary.psm1 @@ -48,7 +48,7 @@ function DownloadAndExtract { -Verbose:$Verbose if ($DownloadStatus -Eq $False) { - Write-Error "Download failed" + Write-Error "Download failed from $Uri" return $False } diff --git a/eng/common/post-build/post-build-utils.ps1 b/eng/common/post-build/post-build-utils.ps1 index 7d4974479..534f6988d 100644 --- a/eng/common/post-build/post-build-utils.ps1 +++ b/eng/common/post-build/post-build-utils.ps1 @@ -69,9 +69,9 @@ function Trigger-Subscription([string]$SubscriptionId) { function Validate-MaestroVars { try { - Get-Variable MaestroApiEndPoint -Scope Global | Out-Null - Get-Variable MaestroApiVersion -Scope Global | Out-Null - Get-Variable MaestroApiAccessToken -Scope Global | Out-Null + Get-Variable MaestroApiEndPoint | Out-Null + Get-Variable MaestroApiVersion | Out-Null + Get-Variable MaestroApiAccessToken | Out-Null if (!($MaestroApiEndPoint -Match '^http[s]?://maestro-(int|prod).westus2.cloudapp.azure.com$')) { Write-PipelineTelemetryError -Category 'MaestroVars' -Message "MaestroApiEndPoint is not a valid Maestro URL. '$MaestroApiEndPoint'" diff --git a/global.json b/global.json index 2c17d237a..e69c52fff 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20608.21" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20614.8" } } From 489b5caeee1bc7989868feb782ecc781befb8536 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 16 Dec 2020 14:38:51 -0800 Subject: [PATCH 63/64] Apply feedback --- src/redist/targets/GenerateBundledVersions.targets | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 1eb957839..7fdd0440b 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -28,13 +28,10 @@ <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) - <_NET50DefaultRuntimeFrameworkVersion>5.0.0 <_NET50RuntimePackVersion>5.0.0 <_NET50TargetingPackVersion>5.0.0 - <_WindowsDesktop50DefaultRuntimeFrameworkVersion>5.0.0 <_WindowsDesktop50RuntimePackVersion>5.0.0 <_WindowsDesktop50TargetingPackVersion>5.0.0 - <_AspNet50DefaultRuntimeFrameworkVersion>5.0.1 <_AspNet50RuntimePackVersion>5.0.1 <_AspNet50TargetingPackVersion>5.0.0 @@ -409,7 +406,7 @@ Copyright (c) .NET Foundation. All rights reserved. Date: Thu, 17 Dec 2020 13:55:46 +0000 Subject: [PATCH 64/64] Update dependencies from https://github.com/dotnet/arcade build 20201215.4 (#9241) [master] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.1.0-beta-20607-02 to 1.1.0-beta-20614-02 (parent: Microsoft.DotNet.Arcade.Sdk) - XliffTasks: from 1.0.0-beta.20610.1 to 1.0.0-beta.20612.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/performance/microbenchmarks.proj | 2 +- global.json | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ee3db82c..fb10a9543 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -148,25 +148,25 @@ - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 https://github.com/dotnet/source-build-reference-packages 639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1 - + https://github.com/dotnet/sourcelink - f3182c5db7acd80fab1e8ce3332b327886692951 + 0811fcd5406f22b086eb64b554514231a17766fd - + https://github.com/dotnet/xliff-tasks - 686f15821486dd41b31b11380e86a2e616134b72 + 9249d6a64e04e6ab113d4ffac14cc1b8329d78d3 diff --git a/eng/Versions.props b/eng/Versions.props index 25135e13d..c62adfc53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.20614.8 + 6.0.0-beta.20615.4 diff --git a/eng/common/performance/microbenchmarks.proj b/eng/common/performance/microbenchmarks.proj index 94b6efbc9..318ca5f1b 100644 --- a/eng/common/performance/microbenchmarks.proj +++ b/eng/common/performance/microbenchmarks.proj @@ -141,4 +141,4 @@ 4:00 - \ No newline at end of file + diff --git a/global.json b/global.json index e69c52fff..a6b359ab6 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20614.8" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20615.4" } }