From 5429ff1d84d93927157f54d620a0ad9ebf1f10b9 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Thu, 15 Aug 2024 18:16:32 +0000 Subject: [PATCH 1/5] Merged PR 41540: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20240815.3 - **Date Produced**: August 15, 2024 5:39:22 PM UTC - **Commit**: 43d5519b7b6f2093342515c04b054e88df71729e - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.34-servicing.24413.5 to 6.0.34-servicing.24415.3][3] - **Microsoft.Private.Winforms**: [from 6.0.34-servicing.24413.5 to 6.0.34-servicing.24415.3][3] - **Microsoft.NETCore.ILDAsm**: [from 6.0.33-servicing.24366.10 to 6.0.34-servicing.24412.10][4] - **Microsoft.NETCore.ILAsm**: [from 6.0.33-servicing.24366.10 to 6.0.34-servicing.24412.10][4] - **Microsoft.NETCore.App.Ref**: [from 6.0.33 to 6.0.34][4] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.33 to 6.0.34][4] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.33-servicing.24366.10 to 6.0.34-servicing.24412.10][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC3d5cf4b3a664fb04848c9744c6e19a5a8d3425fb&targetVersion=GC43d5519b7b6f2093342515c04b054e88df71729e&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC6c636980f730a30c3f5352cff80ce035ae53f016&targetVersion=GC4493500184d43f2d0c60001d557433e40de1663c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) [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.33-servicing.24366.10 to 6.0.34-servicing.24412.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.33-servicing.24366.10 to 6.0.34-servicing.24412.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.33 to 6.0.34 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.33 to 6.0.34 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.33-servicing.24366.10 to 6.0.34-servicing.24412.10 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) --- 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 042ef3164be..5dbfb586037 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 274ccb8933e..417e2e60f92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6a984c48f3489b60f25deb72ede6e5051bb130d4 + 43d5519b7b6f2093342515c04b054e88df71729e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6a984c48f3489b60f25deb72ede6e5051bb130d4 + 43d5519b7b6f2093342515c04b054e88df71729e https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c diff --git a/eng/Versions.props b/eng/Versions.props index 2af15b93c69..0a8614ae709 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.33-servicing.24366.4 + 6.0.34-servicing.24415.3 5.0.0-alpha1.19562.1 - 6.0.33-servicing.24366.10 - 6.0.33-servicing.24366.10 + 6.0.34-servicing.24412.10 + 6.0.34-servicing.24412.10 - 6.0.33-servicing.24366.10 - 6.0.33 - 6.0.33 + 6.0.34-servicing.24412.10 + 6.0.34 + 6.0.34 6.0.13 6.0.0 6.0.1 From 0716b4331761db24b6c5f2f52e8bcd32b6bd065b Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Sat, 17 Aug 2024 22:12:49 +0000 Subject: [PATCH 2/5] Merged PR 41825: [internal/release/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.34-servicing.24412.10 to 6.0.34-servicing.24416.23 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.34-servicing.24412.10 to 6.0.34-servicing.24416.23 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.34 to 6.0.34 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.34 to 6.0.34 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.34-servicing.24412.10 to 6.0.34-servicing.24416.23 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20240817.1 - **Date Produced**: August 17, 2024 4:06:39 PM UTC - **Commit**: a625f79930686c2e7598d0cb0a6ba715ef176e4e - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.34-servicing.24415.3 to 6.0.34-servicing.24417.1][1] - **Microsoft.Private.Winforms**: [from 6.0.34-servicing.24415.3 to 6.0.34-servicing.24417.1][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.34-servicing.24412.10 to 6.0.34-servicing.24416.23][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.34-servicing.24412.10 to 6.0.34-servicing.24416.23][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.34 to 6.0.34][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24412.10 to 6.0.34-servicing.24416.23][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC43d5519b7b6f2093342515c04b054e88df71729e&targetVersion=GCa625f79930686c2e7598d0cb0a6ba715ef176e4e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC4493500184d43f2d0c60001d557433e40de1663c&targetVersion=GC98588b0f0d72383aca8722755d838ae1d542ce62&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5dbfb586037..39267c2d3fd 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 417e2e60f92..2ce33ac01b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 43d5519b7b6f2093342515c04b054e88df71729e + a625f79930686c2e7598d0cb0a6ba715ef176e4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 43d5519b7b6f2093342515c04b054e88df71729e + a625f79930686c2e7598d0cb0a6ba715ef176e4e https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 diff --git a/eng/Versions.props b/eng/Versions.props index 0a8614ae709..0754a22d9e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.34-servicing.24415.3 + 6.0.34-servicing.24417.1 5.0.0-alpha1.19562.1 - 6.0.34-servicing.24412.10 - 6.0.34-servicing.24412.10 + 6.0.34-servicing.24416.23 + 6.0.34-servicing.24416.23 - 6.0.34-servicing.24412.10 + 6.0.34-servicing.24416.23 6.0.34 6.0.34 6.0.13 From 76005ab71f61aa8104f0a19fb866d15127ef73ef Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 31 Aug 2024 06:40:56 +0000 Subject: [PATCH 3/5] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240830.7 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.34-servicing.24417.1 -> To Version 6.0.35-servicing.24430.7 --- NuGet.config | 2 ++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 39267c2d3fd..21a3ba1ba18 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + @@ -19,6 +20,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ce33ac01b7..6b259b0b718 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a625f79930686c2e7598d0cb0a6ba715ef176e4e + 1547140f9918168ddd39f53c9e19490def83b761 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a625f79930686c2e7598d0cb0a6ba715ef176e4e + 1547140f9918168ddd39f53c9e19490def83b761 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f1925c9f3a9..cb948765d12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.34-servicing.24417.1 + 6.0.35-servicing.24430.7 From 56e34fd44fdb4c18a365c3e1199c956957f6376b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Sep 2024 21:10:49 +0000 Subject: [PATCH 4/5] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240911.4 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.35-servicing.24430.7 -> To Version 6.0.35-servicing.24461.4 Dependency coherency updates System.IO.Packaging,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.0 -> To Version 6.0.1 (parent: Microsoft.Private.Winforms --- NuGet.config | 6 ++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 14 +++++++------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 21a3ba1ba18..05d297c599d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,8 +5,7 @@ - - + @@ -20,8 +19,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 630d503eae2..0e5b877cb66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1547140f9918168ddd39f53c9e19490def83b761 + 1e8489e39e0709c40aa5540825b5e9e2c1c5a23b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1547140f9918168ddd39f53c9e19490def83b761 + 1e8489e39e0709c40aa5540825b5e9e2c1c5a23b https://github.com/dotnet/runtime @@ -53,33 +53,33 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int c2a59ae0ff0eb57f535302776eeaa238b44a569a - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 diff --git a/eng/Versions.props b/eng/Versions.props index 9943486ac71..1d68fc75a5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,24 +21,24 @@ servicing - 6.0.0 + 6.0.1 6.0.0 - 6.0.35-servicing.24430.7 + 6.0.35-servicing.24461.4 5.0.0-alpha1.19562.1 - 6.0.34-servicing.24416.23 - 6.0.34-servicing.24416.23 + 6.0.35-servicing.24459.18 + 6.0.35-servicing.24459.18 - 6.0.34-servicing.24416.23 - 6.0.34 - 6.0.34 + 6.0.35-servicing.24459.18 + 6.0.35 + 6.0.35 6.0.13 6.0.0 6.0.1 From d973e3ed44479b60b424dd854e6689bd4e5b62dc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Sep 2024 20:40:26 +0000 Subject: [PATCH 5/5] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240912.9 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.35-servicing.24461.4 -> To Version 6.0.35-servicing.24462.9 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e5b877cb66..854999e5922 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1e8489e39e0709c40aa5540825b5e9e2c1c5a23b + 9b5f402943986a66dfca2b6f4312cfca19d75c17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1e8489e39e0709c40aa5540825b5e9e2c1c5a23b + 9b5f402943986a66dfca2b6f4312cfca19d75c17 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1d68fc75a5e..6da0a24b9cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.35-servicing.24461.4 + 6.0.35-servicing.24462.9