From 0c1b8bc1d70d0503f35637f632d11330964cee2d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 4 May 2021 23:44:05 +0000 Subject: [PATCH 1/3] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 20 +++++++++++++++++++- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index be7ee6a60..ffb8742a3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,12 +7,18 @@ + + + + + + @@ -20,6 +26,8 @@ + + @@ -28,6 +36,8 @@ + + @@ -47,20 +57,28 @@ + + + + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc8272844..69aa71cdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9 + b88b667c267847eaa9adca5c4ea4336e428e5545 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9 + b88b667c267847eaa9adca5c4ea4336e428e5545 diff --git a/eng/Versions.props b/eng/Versions.props index 65a57890f..c1eacc14a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.203-servicing.21223.17 - 5.0.203-servicing.21223.17 + 5.0.204-servicing.21254.16 + 5.0.204-servicing.21254.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f9399e79adec387e7641b3131d58adb677502cf0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 12 May 2021 03:19:24 +0000 Subject: [PATCH 2/3] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.203 to 5.0.204 (parent: Microsoft.NET.Sdk) --- NuGet.config | 9 +-------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index ffb8742a3..fd1a511db 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,14 +26,7 @@ - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69aa71cdf..686c178b7 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 - 50e1aa014b0b35cb9aa2c5157d054ee654949dff + 3cdb1866b853838a7881187b994836b98d240d0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b88b667c267847eaa9adca5c4ea4336e428e5545 + c218ec378010c8ebca98d41cecb7b1b17e73c851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b88b667c267847eaa9adca5c4ea4336e428e5545 + c218ec378010c8ebca98d41cecb7b1b17e73c851 diff --git a/eng/Versions.props b/eng/Versions.props index c1eacc14a..b73172200 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.203 + 5.0.204 @@ -55,8 +55,8 @@ - 5.0.204-servicing.21254.16 - 5.0.204-servicing.21254.16 + 5.0.204-servicing.21261.22 + 5.0.204-servicing.21261.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 14 May 2021 03:05:16 +0000 Subject: [PATCH 3/3] Merged PR 14981: [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App**: from 5.0.6-servicing.21221.6 to 5.0.7-servicing.21263.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Internal**: from 5.0.6-servicing.21220.11 to 5.0.7-servicing.21255.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: from 5.0.6-servicing.21223.5 to 5.0.7-servicing.21263.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.EntityFrameworkCore**: from 5.0.6 to 5.0.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - **dotnet-dev-certs**: from 5.0.6-servicing.21223.5 to 5.0.7-servicing.21263.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 5.0.6-servicing.21223.5 to 5.0.7-servicing.21263.9 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 5.0.6-servicing.21221.3 to 5.0.7-servicing.21263.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 5.0.6-servicing.21221.8 to 5.0.6-servicing.21263.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a - **Build**: 20210513.30 - **Date Produced**: 5/14/2021 2:39 AM - **Commit**: b4ddf0facd49caab999e4accd6cb82d5e599bf5e - **Branch**: refs/heads/internal/release/5.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.204-servicing.21261.22 to 5.0.204-servicing.21263.30][1] - **Microsoft.NET.Sdk**: [from 5.0.204-servicing.21261.22 to 5.0.204-servicing.21263.30][1] - **Microsoft.WindowsDesktop.App**: [from 5.0.6-servicing.21221.6 to 5.0.7-servicing.21263.4][2] - **Microsoft.NETCore.App.Internal**: [from 5.0.6-servicing.... --- NuGet.config | 9 +++++++ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 53 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index daf02ec43..64d79b4b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,21 @@ + + + + + @@ -31,14 +36,18 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 686c178b7..fca76c552 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 - 297185fc6039237591fb28a8a09fc01d2ea69ae6 + f87455227b7f349e26043daa2e1b5b86fb381627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 297185fc6039237591fb28a8a09fc01d2ea69ae6 + f87455227b7f349e26043daa2e1b5b86fb381627 https://github.com/dotnet/windowsdesktop @@ -25,21 +25,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e @@ -59,25 +59,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 https://github.com/dotnet/test-templates @@ -91,22 +91,22 @@ https://github.com/dotnet/templating 3cdb1866b853838a7881187b994836b98d240d0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c218ec378010c8ebca98d41cecb7b1b17e73c851 + b4ddf0facd49caab999e4accd6cb82d5e599bf5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c218ec378010c8ebca98d41cecb7b1b17e73c851 + b4ddf0facd49caab999e4accd6cb82d5e599bf5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3b86fe34ae2ef405a49c19997f9f01ed63a2ad70 + 3e5e4f7ca852c8b85899a18efcd114e7ed4ea163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fe9dd395134709b5a53883b71c01447b5f132a06 + 36ec7266b65ec578b5524c998a80e6a8848efb41 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5b31e66c0..63fa2a4ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.6-servicing.21221.3 + 5.0.7-servicing.21263.7 - 5.0.6-servicing.21221.8 + 5.0.6-servicing.21263.3 @@ -43,39 +43,39 @@ - 5.0.6 + 5.0.7 5.0.0 5.0.0-rtm.20526.5 - 5.0.6-servicing.21223.5 - 5.0.6-servicing.21223.5 - 5.0.6-servicing.21223.5 + 5.0.7-servicing.21263.9 + 5.0.7-servicing.21263.9 + 5.0.7-servicing.21263.9 0.2.0 - 5.0.204-servicing.21261.22 - 5.0.204-servicing.21261.22 + 5.0.204-servicing.21263.30 + 5.0.204-servicing.21263.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.6-servicing.21220.11 - 5.0.6 - 5.0.6 + 5.0.7-servicing.21255.8 + 5.0.7 + 5.0.7 5.0.0 - 5.0.6 + 5.0.7 5.0.2 2.1.0 5.0.0-rtm.20519.4 - 5.0.6-servicing.21221.6 - 5.0.6 + 5.0.7-servicing.21263.4 + 5.0.7 5.0.0 5.0.0-rtm.20520.1