From 5bef1839b6b4a882df7813165abc368f070659f0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 28 Sep 2023 00:08:17 +0000 Subject: [PATCH 1/3] Merged PR 33982: [internal/release/frameshift/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.21-servicing.23363.11 to 6.0.23-servicing.23475.15 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.21-servicing.23363.11 to 6.0.23-servicing.23475.15 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.21 to 6.0.23 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.21 to 6.0.23 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.21-servicing.23363.11 to 6.0.23-servicing.23475.15 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:15230ce7-27e5-40cc-f450-08dbbf39d6ab) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: 15230ce7-27e5-40cc-f450-08dbbf39d6ab - **Build**: 20230927.14 - **Date Produced**: September 27, 2023 11:42:28 PM UTC - **Commit**: 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 - **Branch**: refs/heads/internal/release/frameshift/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.21-servicing.23364.6 to 6.0.23-servicing.23477.14][1] - **Microsoft.Private.Winforms**: [from 6.0.21-servicing.23364.6 to 6.0.23-servicing.23477.14][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.21-servicing.23363.11 to 6.0.23-servicing.23475.15][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.21-servicing.23363.11 to 6.0.23-servicing.23475.15][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.21 to 6.0.23][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.21 to 6.0.23][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.21-servicing.23363.11 to 6.0.23-servicing.23475.15][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC052009561f&targetVersion=GC8b4c9d0ea0&_a=files [2]: https://github.com/dotnet/runtime/compare/e40b3abf1b...301ba1ee5d [DependencyUpdate]: <> (End) [marker]: <> (End:15230ce7-27e5-40cc-f450-08dbbf39d6ab) --- NuGet.config | 2 ++ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..5db0b60a83c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34a38ffdb71..9a6d5efb89c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 diff --git a/eng/Versions.props b/eng/Versions.props index 59ebc2ee98b..4d93cb39f60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.21-servicing.23364.6 + 6.0.23-servicing.23477.14 5.0.0-alpha1.19562.1 - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 + 6.0.23-servicing.23475.15 + 6.0.23-servicing.23475.15 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23475.15 + 6.0.23 + 6.0.23 6.0.11 6.0.0 6.0.1 From 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 30 Sep 2023 02:51:12 +0000 Subject: [PATCH 2/3] Merged PR 34090: [internal/release/frameshift/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.23-servicing.23475.15 to 6.0.23-servicing.23479.5 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.23-servicing.23475.15 to 6.0.23-servicing.23479.5 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23475.15 to 6.0.23-servicing.23479.5 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:15230ce7-27e5-40cc-f450-08dbbf39d6ab) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: 15230ce7-27e5-40cc-f450-08dbbf39d6ab - **Build**: 20230929.10 - **Date Produced**: September 30, 2023 2:06:06 AM UTC - **Commit**: 5589f30c2c75e37b50934791b7f98e26973b03c4 - **Branch**: refs/heads/internal/release/frameshift/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.23-servicing.23477.14 to 6.0.23-servicing.23479.10][1] - **Microsoft.Private.Winforms**: [from 6.0.23-servicing.23477.14 to 6.0.23-servicing.23479.10][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.23-servicing.23475.15 to 6.0.23-servicing.23479.5][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.23-servicing.23475.15 to 6.0.23-servicing.23479.5][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.23-servicing.23475.15 to 6.0.23-servicing.23479.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC8b4c9d0ea0&targetVersion=GC5589f30c2c&_a=files [2]: https://github.com/dotnet/runtime/compare/301ba1ee5d...301ba1ee5d [DependencyUpdate]: <> (End) [marker]: <> (End:15230ce7-27e5-40cc-f450-08dbbf39d6ab) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5db0b60a83c..e3504a75150 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a6d5efb89c..20875660962 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 + 5589f30c2c75e37b50934791b7f98e26973b03c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 + 5589f30c2c75e37b50934791b7f98e26973b03c4 https://github.com/dotnet/runtime @@ -57,11 +57,11 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -77,7 +77,7 @@ https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 diff --git a/eng/Versions.props b/eng/Versions.props index 4d93cb39f60..a5af547baf5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.23-servicing.23477.14 + 6.0.23-servicing.23479.10 5.0.0-alpha1.19562.1 - 6.0.23-servicing.23475.15 - 6.0.23-servicing.23475.15 + 6.0.23-servicing.23479.5 + 6.0.23-servicing.23479.5 - 6.0.23-servicing.23475.15 + 6.0.23-servicing.23479.5 6.0.23 6.0.23 6.0.11 From ce541c62f9292d6fcc63750f4e584136c8fa0465 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 15:07:04 +0000 Subject: [PATCH 3/3] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230930.3 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.23-servicing.23479.10 -> To Version 6.0.23-servicing.23480.3 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.23-servicing.23479.5 -> To Version 6.0.23-servicing.23480.2 (parent: Microsoft.Private.Winforms --- NuGet.config | 4 ++-- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 8 ++++---- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3504a75150..d6b9869a728 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20875660962..121a7cd9988 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5589f30c2c75e37b50934791b7f98e26973b03c4 + a8ba4b39b59ca421254550010de48b33d7c7b57d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5589f30c2c75e37b50934791b7f98e26973b03c4 + a8ba4b39b59ca421254550010de48b33d7c7b57d https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 diff --git a/eng/Versions.props b/eng/Versions.props index a5af547baf5..0343c9b0011 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.23-servicing.23479.10 + 6.0.23-servicing.23480.3 5.0.0-alpha1.19562.1 - 6.0.23-servicing.23479.5 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 6.0.11