From a4751af1c2c437a0525972189e1046f6782d6305 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Mar 2021 04:25:52 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/sdk build 20210310.8 (#9916) [release/5.0.3xx] 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 adad29668..a2a89824f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating c83d98dbae2262798e804236fb3edabe517d50f5 - + https://github.com/dotnet/sdk - e5edab6f6c519bbb2a16eef49d27ec36f50de57a + 6a6b8b6a37b81cedae2cfba0a6b37ff290427966 - + https://github.com/dotnet/sdk - e5edab6f6c519bbb2a16eef49d27ec36f50de57a + 6a6b8b6a37b81cedae2cfba0a6b37ff290427966 diff --git a/eng/Versions.props b/eng/Versions.props index 80c602c07..b1d801168 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21159.10 - 5.0.300-preview.21159.10 + 5.0.300-preview.21160.8 + 5.0.300-preview.21160.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9f6d8c9febea495bd8501b7fdc421d48ce08b5a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Mar 2021 12:55:47 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/sdk build 20210311.3 (#9927) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.10.0-preview-21126-01 to 16.10.0-preview-21161-01 (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 a2a89824f..9d0e85a5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating c83d98dbae2262798e804236fb3edabe517d50f5 - + https://github.com/dotnet/sdk - 6a6b8b6a37b81cedae2cfba0a6b37ff290427966 + d63318e0018bb4a55cbd2863d8a446d4a12a418d - + https://github.com/dotnet/sdk - 6a6b8b6a37b81cedae2cfba0a6b37ff290427966 + d63318e0018bb4a55cbd2863d8a446d4a12a418d @@ -121,9 +121,9 @@ https://github.com/dotnet/roslyn 3f54551d64817ec41c571b60cd512bd4e5902431 - + https://github.com/dotnet/msbuild - 6819f7ab06c3f43e83ff4059d417395e0af06c01 + 38da84d453b14008b148c7eea28df24ab4443bb7 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index b1d801168..f05d09076 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21160.8 - 5.0.300-preview.21160.8 + 5.0.300-preview.21161.3 + 5.0.300-preview.21161.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 11b5ea0c1397105f8ae85025b09be02b15db31de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Mar 2021 16:09:14 +0000 Subject: [PATCH 3/6] [release/5.0.3xx] Update dependencies from dotnet/sdk (#9939) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.2-servicing.20613.4 to 5.0.4-servicing.21117.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.2-servicing.20611.20 to 5.0.4-servicing.21116.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.2 to 5.0.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.2 to 5.0.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.2 to 5.0.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0 to 5.0.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.2-servicing.20613.2 to 5.0.4-servicing.21118.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.2 to 5.0.4 (parent: Microsoft.NET.Sdk) - Microsoft.EntityFrameworkCore: from 5.0.2 to 5.0.4 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - dotnet-dev-certs: from 5.0.2-servicing.20613.2 to 5.0.4-servicing.21118.15 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.2-servicing.20613.2 to 5.0.4-servicing.21118.15 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.2 to 5.0.4 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.2-servicing.20613.1 to 5.0.4-servicing.21117.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.2 to 5.0.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.2-servicing.20613.2 to 5.0.4-servicing.21117.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 11.2.0-beta.21067.2 to 11.3.2-beta.21102.9 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 16.9.0-release-20201130-02 to 16.9.1-release-20210308-01 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 3.9.0-4.21080.10 to 3.9.0-6.21160.10 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.10.0-preview-21161-01 to 16.10.0-preview-21162-01 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 5.9.0-rc.7046 to 5.9.0-rc.7122 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++-------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d0e85a5c..86dcbd870 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0f71846fb6ea631ffd2b4f6d3a9974c0897b901 + e708867037ec6edbe7965b8f0f1193999785037e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0f71846fb6ea631ffd2b4f6d3a9974c0897b901 + e708867037ec6edbe7965b8f0f1193999785037e https://github.com/dotnet/windowsdesktop @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + f27d33729518f5aa478aa818b7b4f54a4d50bef1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + f27d33729518f5aa478aa818b7b4f54a4d50bef1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + f27d33729518f5aa478aa818b7b4f54a4d50bef1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + f27d33729518f5aa478aa818b7b4f54a4d50bef1 @@ -43,9 +43,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb https://github.com/dotnet/aspnetcore @@ -55,25 +55,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2670c128d522473e146ff9f8159bfffdfe694cd9 + e882394a7bb38930da748291fe2c2ceaa6a80588 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2670c128d522473e146ff9f8159bfffdfe694cd9 + e882394a7bb38930da748291fe2c2ceaa6a80588 - - https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + + https://github.com/dotnet/efcore + cfd206aa4bc7c878dbbd91959f1c9edada70da93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2670c128d522473e146ff9f8159bfffdfe694cd9 + e882394a7bb38930da748291fe2c2ceaa6a80588 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2670c128d522473e146ff9f8159bfffdfe694cd9 + e882394a7bb38930da748291fe2c2ceaa6a80588 https://github.com/dotnet/test-templates @@ -87,47 +87,47 @@ https://github.com/dotnet/templating c83d98dbae2262798e804236fb3edabe517d50f5 - + https://github.com/dotnet/sdk - d63318e0018bb4a55cbd2863d8a446d4a12a418d + b60750d43c9222821e925f74d20ad2743989ca2f - + https://github.com/dotnet/sdk - d63318e0018bb4a55cbd2863d8a446d4a12a418d + b60750d43c9222821e925f74d20ad2743989ca2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1a7d925a270d4eaca6e801de8b88b34b535091de + 3991c2606be14a6faf29eeafe824bd4444e85ea1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 89936f5f8d7ac99e04123f8f48754f252dfd9973 + 5d6364723197e917e11c0d442545287c27754aa5 - + https://github.com/dotnet/fsharp - 9904179c94c41d5d7f9008975d523d807b2a19c6 + 7ce7132f1459095e635194d09d6f73265352029a - + https://github.com/microsoft/vstest - 0a56da68da5f466d32606bba8b7d8260ad9d2a43 + 6a858a323caa439115e9e3cf1c958b04f4ff9993 https://github.com/mono/linker 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 3f54551d64817ec41c571b60cd512bd4e5902431 + 59eedc33d35754759994155ea2f4e1012a9951e3 - + https://github.com/dotnet/msbuild - 38da84d453b14008b148c7eea28df24ab4443bb7 + a13e20027d528310364bc40cbe2e079408ad82fe - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - e90588d4ec63e966360eec817c80d0758ff05b30 + abf0ba0638070af16427cea69bd47a9945fd5d7a https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index f05d09076..95997411c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.2-servicing.20613.1 + 5.0.4-servicing.21117.2 - 5.0.2-servicing.20613.2 + 5.0.4-servicing.21117.5 @@ -43,41 +43,41 @@ - 5.0.2 + 5.0.4 5.0.0 5.0.0-rtm.20526.5 - 5.0.2-servicing.20613.2 - 5.0.2-servicing.20613.2 - 5.0.2-servicing.20613.2 + 5.0.4-servicing.21118.15 + 5.0.4-servicing.21118.15 + 5.0.4-servicing.21118.15 0.2.0 - 5.0.300-preview.21161.3 - 5.0.300-preview.21161.3 + 5.0.300-preview.21162.4 + 5.0.300-preview.21162.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0 + 5.0.1 - 5.0.2-servicing.20611.20 - 5.0.2 - 5.0.2 + 5.0.4-servicing.21116.14 + 5.0.4 + 5.0.4 5.0.0 - 5.0.2 + 5.0.4 2.1.0 - 5.0.2-servicing.20613.4 - 5.0.2 + 5.0.4-servicing.21117.9 + 5.0.4 5.0.0 5.0.0-rtm.20520.1 @@ -129,7 +129,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.9.0-release-20201130-02 + 16.9.1-release-20210308-01 From 30206602236c61479652d5168acd65e60e002d4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Mar 2021 22:32:43 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/sdk build 20210312.12 (#9953) [release/5.0.3xx] 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 86dcbd870..5723788b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating c83d98dbae2262798e804236fb3edabe517d50f5 - + https://github.com/dotnet/sdk - b60750d43c9222821e925f74d20ad2743989ca2f + d5f7e4d4d723c3db549241f028397bc1242ea7de - + https://github.com/dotnet/sdk - b60750d43c9222821e925f74d20ad2743989ca2f + d5f7e4d4d723c3db549241f028397bc1242ea7de diff --git a/eng/Versions.props b/eng/Versions.props index 95997411c..ddaf628fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21162.4 - 5.0.300-preview.21162.4 + 5.0.300-preview.21162.12 + 5.0.300-preview.21162.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c07d3f96da22d363d761dfb1a76a37242776c242 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Mar 2021 16:58:28 +0000 Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/sdk build 20210317.5 (#9985) [release/5.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.10.0-preview-21162-01 to 16.10.0-preview-21166-07 (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 5723788b7..0d5332f09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating c83d98dbae2262798e804236fb3edabe517d50f5 - + https://github.com/dotnet/sdk - d5f7e4d4d723c3db549241f028397bc1242ea7de + 7dfeb2c31cce58aa7e536b14cf8846a561153c87 - + https://github.com/dotnet/sdk - d5f7e4d4d723c3db549241f028397bc1242ea7de + 7dfeb2c31cce58aa7e536b14cf8846a561153c87 @@ -121,9 +121,9 @@ https://github.com/dotnet/roslyn 59eedc33d35754759994155ea2f4e1012a9951e3 - + https://github.com/dotnet/msbuild - a13e20027d528310364bc40cbe2e079408ad82fe + 17677364d656a98ce4c6eff73b49eddf24f0fd72 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index ddaf628fa..5e1885c0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.300-preview.21162.12 - 5.0.300-preview.21162.12 + 5.0.300-preview.21167.5 + 5.0.300-preview.21167.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b122b51da8306cd989ad4211e4ed798bc11360fb Mon Sep 17 00:00:00 2001 From: Joshua Larkin <70237359+j0shuams@users.noreply.github.com> Date: Wed, 17 Mar 2021 12:43:56 -0700 Subject: [PATCH 6/6] Update 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 e89f3da42..7225dae04 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.14 - 10.0.18362.14 - 10.0.19041.14 + 10.0.17763.15 + 10.0.18362.15 + 10.0.19041.15