From aa904b787bfe758c3a97365518e4c42bb7085dc2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Dec 2020 15:28:00 -0800 Subject: [PATCH 01/11] [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 02/11] 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 03/11] 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 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 04/11] 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 05/11] 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 06/11] 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 07/11] 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 08/11] 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 09/11] 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 10/11] 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 0f985b1947ef457d2593e9a37d2ae8570b600bc1 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 14 Dec 2020 22:10:08 -0800 Subject: [PATCH 11/11] 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" } }