From 2eefe1f1b51097378c58cf8a4d27c41ca5c31043 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 10 Mar 2024 05:36:12 +0000 Subject: [PATCH 01/17] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms --- NuGet.config | 4 ++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index a8ec26c27c8..72a8e42bc0c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,8 @@ + + @@ -19,6 +21,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf77f75d724..5b904cb0cb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 9de94bff9795bb0644835098b91e81edccfaa367 + bf4b84dfe89000c252e2c287da991a522f62157e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 9de94bff9795bb0644835098b91e81edccfaa367 + bf4b84dfe89000c252e2c287da991a522f62157e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index fe130b667b7..748924510b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.28-servicing.24120.4 + 6.0.29-servicing.24158.7 From 5305ab1be9a52a6a29fb12c7ab267040672b879f Mon Sep 17 00:00:00 2001 From: dipeshmsft Date: Mon, 11 Mar 2024 16:44:56 +0530 Subject: [PATCH 02/17] Fixes PenIMC UAF MSRC .NET 6 --- .../src/PenImc/dll/ComLockableWrapper.hpp | 5 ++ .../src/PenImc/dll/PimcManager.cpp | 88 +++++++++++++++++++ 2 files changed, 93 insertions(+) diff --git a/src/Microsoft.DotNet.Wpf/src/PenImc/dll/ComLockableWrapper.hpp b/src/Microsoft.DotNet.Wpf/src/PenImc/dll/ComLockableWrapper.hpp index b16aae55806..0d3f01befc0 100644 --- a/src/Microsoft.DotNet.Wpf/src/PenImc/dll/ComLockableWrapper.hpp +++ b/src/Microsoft.DotNet.Wpf/src/PenImc/dll/ComLockableWrapper.hpp @@ -40,6 +40,11 @@ namespace ComUtils // The apartment is verified during this call. HRESULT Unlock(); + // Unlocking a wrapper permanently nulls out the server object pointer, so a + // wrapper contains a non-null server object pointer if and only if it is + // bound to a server object which has never been unlocked. + bool HasNotBeenUnlocked() { return (m_serverObject != nullptr); } + private: IUnknown *m_serverObject; diff --git a/src/Microsoft.DotNet.Wpf/src/PenImc/dll/PimcManager.cpp b/src/Microsoft.DotNet.Wpf/src/PenImc/dll/PimcManager.cpp index 0c8b10a8af4..40aba9f1a24 100644 --- a/src/Microsoft.DotNet.Wpf/src/PenImc/dll/PimcManager.cpp +++ b/src/Microsoft.DotNet.Wpf/src/PenImc/dll/PimcManager.cpp @@ -396,6 +396,94 @@ void CPimcManager::TerminateHookThread(__inout CHookThreadItem * pThread) void CPimcManager::FinalRelease() { m_wispManagerLock.RevokeIfValid(); + + // + // The CComObject destructor is the only function which calls into this + // FinalRelease code. + // + // In all successful usage of CPimcManager: 1) Managed WPF code uses CoCreateInstance + // to acquire an IPimcManager2 interface to a brand-new CPimcManager instance (created by + // the ATL CComCreator::CreateInstance machinery), meaning FinalConstruct by-definition + // completes successfully, meaning "m_managerLock" is therefore guaranteed to be locked; + // 2) Managed WPF code then runs through its full end-to-end usage of the CPimcManager + // object (generally managed by the code in PenThreadWorker.cs); 3) When/if the managed WPF + // code determines that the CPimcManager object is no longer needed, it sends a + // RELEASE_MANAGER_EXT message (see UnsafeNativeMethods.ReleaseManagerExternalLock()) which + // unlocks "m_managerLock"; 4) Now that it is unlocked, the CComObject object + // can be destroyed when/if its refcount drops to zero, and this FinalRelease function will + // run at that time. + // + // So in all successful usage cases, it is guaranteed that "m_managerLock" is already + // unlocked when this code runs (because if it was still locked, the lock itself would have + // prevented the refcount from reaching zero, and would have prevented this function from + // ever running). + // + // That said, in unsuccessful usage cases, the ATL CComCreator::CreateInstance machinery + // can fail, meaning it will destroy the brand-new CPimcManager instance before returning + // an error back to the CreateInstance caller. Destroying the brand-new instance triggers + // the CComObject destructor and therefore calls into this function during + // the CComCreator::CreateInstance operation itself. + // + // The final step in CComCreator::CreateInstance is a QI which queries the newly-created + // object for whatever interface has been requested by the caller. This operation is the + // main way that CComCreator::CreateInstance can fail. For example, this QI is + // guaranteed to fail whenever the CoCreateInstance caller targets the CPimcManager CLSID + // but passes in a "random" IID that has nothing to do with IPimcManager2 or anything else + // that CPimcManager implements. + // + // (In CPimcManager construction, outside of pathological cases (e.g., where a small heap + // allocation in OS code fails due to out-of-memory), there are no other known ways that + // the CComCreator::CreateInstance sequence can fail; so the QI failure is the only + // failure mode that is known to be of general interest.) + // + // The QI failure can only occur after the preceding FinalConstruct call has completed + // successfully (since any FinalConstruct failure would have caused + // CComCreator::CreateInstance to abort without ever trying the QI); since + // CPimcManager::FinalConstruct always locks the "m_managerLock", this implies that the + // "m_managerLock" is guaranteed to be locked when this code runs (which is exactly + // opposite to what happens in all successful usage cases as discussed above). + // + // In this case, it is crucial to unlock "m_managerLock" before allowing this CPimcManager + // object to be destroyed. Without the unlock, this CPimcManager object would be destroyed + // while the associated CStdIdentity in the OS code still holds a reference to it; during + // any future apartment unload, the OS code would release this reference, and the release + // would be a use-after-free at that point. + // + // Note that the crucial unlock causes overactive ATL debug asserts to fire if a chk build + // of this DLL is used; specifically: + // + // - The code in the CComObject destructor always stomps the refcount to + // 0xc0000001 (i.e., "-(LONG_MAX/2)"), meaning this CPimcManager object's refcount is + // always 0xc0000001 when this code runs; unlocking "m_managerLock" will cause the refcount + // to drop by one (because, as discussed above, the crucial operation which prevents + // use-after-free problems will release the associated CStdIdentity's reference to this + // CPimcManager object, and in this way releases the reference that was added when + // "managerLock" was locked during FinalConstruct); as a result, unlocking "m_managerLock" + // will move this CPimcManager object's refcount through a "0xc0000001 -> 0xc0000000" + // transition. + // + // - Both of the CComObjectRootEx::InternalRelease specializations contain debug asserts + // which will fire whenever the refcount drops below 0xc0000001, so this transition always + // triggers a debug assert when using a chk build of this DLL. + // + // - That said, all evidence strongly suggests that this is just an overactive assert in + // the ATL code (probably just indicating that it is rare for FinalConstruct to add + // "self-references" like it does for CPimcManager (since these self-references generally + // prevent the server object from being destroyed unless a manual action like the + // RELEASE_MANAGER_EXT message is taken later on), meaning it is rare to have a situation + // where FinalRelease needs to release self-references that were acquired in + // FinalConstruct, meaning this is a rare enough case that the ATL authors either didn't + // test it or didn't think it was common enough to warrant adjusting the assert). + // + // Since this change is being made in servicing, attempt to change behavior as little as + // possible in the "successful usage" cases where "m_managerLock" is already unlocked, + // while still ensuring that FinalRelease will always run the crucial unlock in all + // "unsuccessful usage" cases. + // + if (m_managerLock.HasNotBeenUnlocked()) + { + m_managerLock.Unlock(); + } } ///////////////////////////////////////////////////////////////////////////// From 045f0a7d03e149615c720c302faec78bcfd522bf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Mar 2024 03:12:21 +0000 Subject: [PATCH 03/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240311.13 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.29-servicing.24158.7 -> To Version 6.0.29-servicing.24161.13 --- 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 5b904cb0cb5..3b64d51f043 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bf4b84dfe89000c252e2c287da991a522f62157e + 6b0a596f8d4e67bf768ddd181887746423c9ac4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bf4b84dfe89000c252e2c287da991a522f62157e + 6b0a596f8d4e67bf768ddd181887746423c9ac4e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 748924510b7..529ec463caf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.29-servicing.24158.7 + 6.0.29-servicing.24161.13 From 428120d6dbf3fd95c1bd577b3020d8a99d099055 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Mar 2024 19:53:19 +0000 Subject: [PATCH 04/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240312.6 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.29-servicing.24158.7 -> To Version 6.0.29-servicing.24162.6 --- 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 3b64d51f043..90cb0b74072 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6b0a596f8d4e67bf768ddd181887746423c9ac4e + 35909961ec1d7903b2786d80d89a56cf17b9db7b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6b0a596f8d4e67bf768ddd181887746423c9ac4e + 35909961ec1d7903b2786d80d89a56cf17b9db7b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 529ec463caf..01ef7890c86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.29-servicing.24161.13 + 6.0.29-servicing.24162.6 From 8592ccb3654e3bc12039c9d249bb0bcdaa17d11b Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 18 Mar 2024 11:41:50 -0700 Subject: [PATCH 05/17] Local dependencies updated based on build with BAR id 217668 (20240315.6 from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms@refs/heads/internal/release/6.0) --- NuGet.config | 8 ++------ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 3 files changed, 25 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 72a8e42bc0c..48f3ece180e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,7 @@ - - - + @@ -21,9 +19,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7d411ddcc4..9dfd408ca15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 35909961ec1d7903b2786d80d89a56cf17b9db7b + 5ac05029bbfe9dc7b578ca44456fd1edc2f4507d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 35909961ec1d7903b2786d80d89a56cf17b9db7b + 5ac05029bbfe9dc7b578ca44456fd1edc2f4507d https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 diff --git a/eng/Versions.props b/eng/Versions.props index 5f79ddadb7c..86af2366e38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.29-servicing.24162.6 + 6.0.29-servicing.24165.6 5.0.0-alpha1.19562.1 - 6.0.28-servicing.24120.7 - 6.0.28-servicing.24120.7 + 6.0.29-servicing.24164.14 + 6.0.29-servicing.24164.14 - 6.0.28-servicing.24120.7 - 6.0.28 - 6.0.28 - 6.0.12 + 6.0.29-servicing.24164.14 + 6.0.29 + 6.0.29 + 6.0.13 6.0.0 6.0.1 6.0.0 From 60270cad7db5be50b75b64af51ad4c08b56ddba1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 03:17:35 +0000 Subject: [PATCH 06/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.29-servicing.24165.6 -> To Version 6.0.29-servicing.24169.15 Dependency coherency updates Microsoft.NETCore.Platforms,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.13 -> To Version 6.0.13 (parent: Microsoft.Private.Winforms --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 48f3ece180e..eed0b27d2cf 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 0a61bf2cf1d..4b99043fdbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5ac05029bbfe9dc7b578ca44456fd1edc2f4507d + 8b4de777b2ddf7e0f4a06dec30bbc152315fdef8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5ac05029bbfe9dc7b578ca44456fd1edc2f4507d + 8b4de777b2ddf7e0f4a06dec30bbc152315fdef8 https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 diff --git a/eng/Versions.props b/eng/Versions.props index 04b41df3577..97bf24692e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.29-servicing.24165.6 + 6.0.29-servicing.24169.15 5.0.0-alpha1.19562.1 - 6.0.29-servicing.24164.14 - 6.0.29-servicing.24164.14 + 6.0.29-servicing.24169.13 + 6.0.29-servicing.24169.13 - 6.0.29-servicing.24164.14 + 6.0.29-servicing.24169.13 6.0.29 6.0.29 6.0.13 From f882a671197caabaffaf94ae87a5bc0cf43b5258 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 21 Mar 2024 21:35:54 +0000 Subject: [PATCH 07/17] Merged PR 38439: [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.Platforms**: from 6.0.13 to 6.0.13 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.29 to 6.0.29 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (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**: - **Date Produced**: March 21, 2024 8:50:10 PM UTC - **Commit**: 6525c5174ef1b8ee5b29c397e8a4b76e76487927 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6][1] - **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6][1] - **Microsoft.NETCore.Platforms**: [from 6.0.13 to 6.0.13][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.29][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC8b4de777b2ddf7e0f4a06dec30bbc152315fdef8&targetVersion=GC6525c5174ef1b8ee5b29c397e8a4b76e76487927&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc95b68327d40062beb0c9d4cd08295a85d86bd27&targetVersion=GC189fbbd88d97dd6d65515ba2da05b62eab4e5039&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index eed0b27d2cf..228058c58a7 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 4b99043fdbb..7d728275b1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4de777b2ddf7e0f4a06dec30bbc152315fdef8 + 6525c5174ef1b8ee5b29c397e8a4b76e76487927 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4de777b2ddf7e0f4a06dec30bbc152315fdef8 + 6525c5174ef1b8ee5b29c397e8a4b76e76487927 https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 diff --git a/eng/Versions.props b/eng/Versions.props index 97bf24692e8..638264614b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.29-servicing.24169.15 + 6.0.29-servicing.24171.6 5.0.0-alpha1.19562.1 - 6.0.29-servicing.24169.13 - 6.0.29-servicing.24169.13 + 6.0.29-servicing.24171.5 + 6.0.29-servicing.24171.5 - 6.0.29-servicing.24169.13 + 6.0.29-servicing.24171.5 6.0.29 6.0.29 6.0.13 From 6aec9b95d59f97bae95b5a5814e3e53de7a0ccfc Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Fri, 22 Mar 2024 00:59:08 +0000 Subject: [PATCH 08/17] Merged PR 38452: [internal/release/6.0] Merge from public Merge from public release/6.0 to internal/release/6.0 and resolve conflicts if necessary --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d728275b1f..94748846b6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 4e9fd815d72fa267bfa5fb21e1304501df1d2f50 diff --git a/eng/Versions.props b/eng/Versions.props index 638264614b1..7bd2aa8b4af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.23572.3 + 6.0.0-rtm.24171.2 From dee47a1e2958aa9b97d3c5edf9433312cc5a4634 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Apr 2024 23:44:14 +0000 Subject: [PATCH 09/17] Merged PR 38997: [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.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (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**: 20240416.19 - **Date Produced**: April 16, 2024 11:16:24 PM UTC - **Commit**: 431a1dcb7d4eafa215951499ad374ffde8622e61 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.29-servicing.24171.6 to 6.0.30-servicing.24216.19][1] - **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24171.6 to 6.0.30-servicing.24216.19][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.30][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.30][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC6525c5174ef1b8ee5b29c397e8a4b76e76487927&targetVersion=GC431a1dcb7d4eafa215951499ad374ffde8622e61&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC189fbbd88d97dd6d65515ba2da05b62eab4e5039&targetVersion=GC97d8f4cade971b93794a3805e7d72ee388f14c9b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..f86ebb2a709 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 dc106f52ef2..7efb20bfd5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6525c5174ef1b8ee5b29c397e8a4b76e76487927 + 431a1dcb7d4eafa215951499ad374ffde8622e61 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6525c5174ef1b8ee5b29c397e8a4b76e76487927 + 431a1dcb7d4eafa215951499ad374ffde8622e61 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b diff --git a/eng/Versions.props b/eng/Versions.props index 977f43a0139..a317fd593c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.29-servicing.24171.6 + 6.0.30-servicing.24216.19 5.0.0-alpha1.19562.1 - 6.0.29-servicing.24171.5 - 6.0.29-servicing.24171.5 + 6.0.30-servicing.24215.25 + 6.0.30-servicing.24215.25 - 6.0.29-servicing.24171.5 - 6.0.29 - 6.0.29 + 6.0.30-servicing.24215.25 + 6.0.30 + 6.0.30 6.0.13 6.0.0 6.0.1 From 4d4489f02ac201acfbbd4677585aad96f4408084 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 16 May 2024 19:49:11 +0000 Subject: [PATCH 10/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240516.3 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.30-servicing.24216.19 -> To Version 6.0.31-servicing.24266.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.30-servicing.24215.25 -> To Version 6.0.31-servicing.24251.12 (parent: Microsoft.Private.Winforms --- 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 f86ebb2a709..b0f0d83ba94 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 7efb20bfd5a..ef7c065415b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 431a1dcb7d4eafa215951499ad374ffde8622e61 + cc6b27b00d494617f99060eb9e4ab4b362d06806 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 431a1dcb7d4eafa215951499ad374ffde8622e61 + cc6b27b00d494617f99060eb9e4ab4b362d06806 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97d8f4cade971b93794a3805e7d72ee388f14c9b + 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97d8f4cade971b93794a3805e7d72ee388f14c9b + 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97d8f4cade971b93794a3805e7d72ee388f14c9b + 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97d8f4cade971b93794a3805e7d72ee388f14c9b + 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 97d8f4cade971b93794a3805e7d72ee388f14c9b + 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 diff --git a/eng/Versions.props b/eng/Versions.props index e8d963f990e..42f0656f2cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.30-servicing.24216.19 + 6.0.31-servicing.24266.3 5.0.0-alpha1.19562.1 - 6.0.30-servicing.24215.25 - 6.0.30-servicing.24215.25 + 6.0.31-servicing.24251.12 + 6.0.31-servicing.24251.12 - 6.0.30-servicing.24215.25 - 6.0.30 - 6.0.30 + 6.0.31-servicing.24251.12 + 6.0.31 + 6.0.31 6.0.13 6.0.0 6.0.1 From 66bb6b2efd50110c38e22e3f3b0dc9c972e536c7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 May 2024 22:32:22 +0000 Subject: [PATCH 11/17] Merged PR 39731: [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.31-servicing.24251.12 to 6.0.32-servicing.24267.29 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.31-servicing.24251.12 to 6.0.32-servicing.24267.29 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.31 to 6.0.32 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.31 to 6.0.32 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.31-servicing.24251.12 to 6.0.32-servicing.24267.29 (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**: 20240517.12 - **Date Produced**: May 18, 2024 5:18:34 AM UTC - **Commit**: 8460a2e74768942ee0c5d081be831cf53c2e609a - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.31-servicing.24266.3 to 6.0.31-servicing.24267.12][1] - **Microsoft.Private.Winforms**: [from 6.0.31-servicing.24266.3 to 6.0.31-servicing.24267.12][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.31-servicing.24251.12 to 6.0.32-servicing.24267.29][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.31-servicing.24251.12 to 6.0.32-servicing.24267.29][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.31 to 6.0.32][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.31 to 6.0.32][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.31-servicing.24251.12 to 6.0.32-servicing.24267.29][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCcc6b27b00d494617f99060eb9e4ab4b362d06806&targetVersion=GC8460a2e74768942ee0c5d081be831cf53c2e609a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06&targetVersion=GCabb709d623326fec5088c154377059f646653af0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- 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 b0f0d83ba94..d17d16570fd 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 ef7c065415b..78ec837f4cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cc6b27b00d494617f99060eb9e4ab4b362d06806 + 8460a2e74768942ee0c5d081be831cf53c2e609a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cc6b27b00d494617f99060eb9e4ab4b362d06806 + 8460a2e74768942ee0c5d081be831cf53c2e609a https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 + abb709d623326fec5088c154377059f646653af0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 + abb709d623326fec5088c154377059f646653af0 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 + abb709d623326fec5088c154377059f646653af0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 + abb709d623326fec5088c154377059f646653af0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06 + abb709d623326fec5088c154377059f646653af0 diff --git a/eng/Versions.props b/eng/Versions.props index aeacb3a9521..40d501c7f6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.31-servicing.24266.3 + 6.0.31-servicing.24267.12 5.0.0-alpha1.19562.1 - 6.0.31-servicing.24251.12 - 6.0.31-servicing.24251.12 + 6.0.32-servicing.24267.29 + 6.0.32-servicing.24267.29 - 6.0.31-servicing.24251.12 - 6.0.31 - 6.0.31 + 6.0.32-servicing.24267.29 + 6.0.32 + 6.0.32 6.0.13 6.0.0 6.0.1 From cb471c5233c7bafc272bb2f26a1df8b922c19f06 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 May 2024 06:22:21 +0000 Subject: [PATCH 12/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240519.13 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.31-servicing.24267.12 -> To Version 6.0.31-servicing.24269.13 --- 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 78ec837f4cd..14b9b272730 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8460a2e74768942ee0c5d081be831cf53c2e609a + 73552338fd21b996523f520a6e94a44335a702b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8460a2e74768942ee0c5d081be831cf53c2e609a + 73552338fd21b996523f520a6e94a44335a702b8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 40d501c7f6f..74d9c38d3c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.31-servicing.24267.12 + 6.0.31-servicing.24269.13 From e775ef1517c3a1c5ea4d79717b05c6faba085523 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 May 2024 06:58:04 +0000 Subject: [PATCH 13/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240519.17 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.31-servicing.24267.12 -> To Version 6.0.32-servicing.24269.17 --- 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 14b9b272730..8f77e6a26c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 73552338fd21b996523f520a6e94a44335a702b8 + 8b5c0ead7c241bb1415f17e61e0f891cce85ff4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 73552338fd21b996523f520a6e94a44335a702b8 + 8b5c0ead7c241bb1415f17e61e0f891cce85ff4d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 74d9c38d3c7..dfd9a1b0846 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.31-servicing.24269.13 + 6.0.32-servicing.24269.17 From 1d682d78ec30616431895982506dd675d4b29877 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 May 2024 04:31:41 +0000 Subject: [PATCH 14/17] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.32-servicing.24267.29 to 6.0.32-servicing.24270.20 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.32-servicing.24267.29 to 6.0.32-servicing.24270.20 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.32 to 6.0.32 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.32 to 6.0.32 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.32-servicing.24267.29 to 6.0.32-servicing.24270.20 (parent: Microsoft.Private.Winforms) --- 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 d17d16570fd..b2ea4a4465d 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 60925d0e453..a164df85912 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b5c0ead7c241bb1415f17e61e0f891cce85ff4d + b7ab526075c97945087f09fbc7696c307d2fa9ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b5c0ead7c241bb1415f17e61e0f891cce85ff4d + b7ab526075c97945087f09fbc7696c307d2fa9ce https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - abb709d623326fec5088c154377059f646653af0 + a1d71935158bdc68901bd014feca5fb68c43fb7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - abb709d623326fec5088c154377059f646653af0 + a1d71935158bdc68901bd014feca5fb68c43fb7c https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - abb709d623326fec5088c154377059f646653af0 + a1d71935158bdc68901bd014feca5fb68c43fb7c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - abb709d623326fec5088c154377059f646653af0 + a1d71935158bdc68901bd014feca5fb68c43fb7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - abb709d623326fec5088c154377059f646653af0 + a1d71935158bdc68901bd014feca5fb68c43fb7c diff --git a/eng/Versions.props b/eng/Versions.props index 59a036959f0..82e88296ae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.32-servicing.24269.17 + 6.0.32-servicing.24270.7 5.0.0-alpha1.19562.1 - 6.0.32-servicing.24267.29 - 6.0.32-servicing.24267.29 + 6.0.32-servicing.24270.20 + 6.0.32-servicing.24270.20 - 6.0.32-servicing.24267.29 + 6.0.32-servicing.24270.20 6.0.32 6.0.32 6.0.13 From cc260c42ce39f3b8d0e6b6970662e6d8fac58108 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 12 Jun 2024 23:47:54 +0000 Subject: [PATCH 15/17] Merged PR 40334: [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.32-servicing.24270.20 to 6.0.32-servicing.24310.33 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.32-servicing.24270.20 to 6.0.32-servicing.24310.33 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.32 to 6.0.32 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.32 to 6.0.32 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.32-servicing.24270.20 to 6.0.32-servicing.24310.33 (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**: 20240612.1 - **Date Produced**: June 12, 2024 10:19:34 PM UTC - **Commit**: 0d0145ef1ba75ce4aaf306b233688edd3ec1ffb4 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.32-servicing.24270.7 to 6.0.32-servicing.24312.1][1] - **Microsoft.Private.Winforms**: [from 6.0.32-servicing.24270.7 to 6.0.32-servicing.24312.1][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.32-servicing.24270.20 to 6.0.32-servicing.24310.33][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.32-servicing.24270.20 to 6.0.32-servicing.24310.33][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.32 to 6.0.32][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.32 to 6.0.32][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.32-servicing.24270.20 to 6.0.32-servicing.24310.33][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCb7ab526075c97945087f09fbc7696c307d2fa9ce&targetVersion=GC0d0145ef1ba75ce4aaf306b233688edd3ec1ffb4&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCa1d71935158bdc68901bd014feca5fb68c43fb7c&targetVersion=GCc1b0b27947208969c44a51033aef7fea048f3e55&_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 b2ea4a4465d..cf41de87cb4 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 a164df85912..4227ffbc268 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7ab526075c97945087f09fbc7696c307d2fa9ce + 0d0145ef1ba75ce4aaf306b233688edd3ec1ffb4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7ab526075c97945087f09fbc7696c307d2fa9ce + 0d0145ef1ba75ce4aaf306b233688edd3ec1ffb4 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1d71935158bdc68901bd014feca5fb68c43fb7c + c1b0b27947208969c44a51033aef7fea048f3e55 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1d71935158bdc68901bd014feca5fb68c43fb7c + c1b0b27947208969c44a51033aef7fea048f3e55 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1d71935158bdc68901bd014feca5fb68c43fb7c + c1b0b27947208969c44a51033aef7fea048f3e55 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1d71935158bdc68901bd014feca5fb68c43fb7c + c1b0b27947208969c44a51033aef7fea048f3e55 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1d71935158bdc68901bd014feca5fb68c43fb7c + c1b0b27947208969c44a51033aef7fea048f3e55 diff --git a/eng/Versions.props b/eng/Versions.props index 82e88296ae8..7f2d9ce738d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.32-servicing.24270.7 + 6.0.32-servicing.24312.1 5.0.0-alpha1.19562.1 - 6.0.32-servicing.24270.20 - 6.0.32-servicing.24270.20 + 6.0.32-servicing.24310.33 + 6.0.32-servicing.24310.33 - 6.0.32-servicing.24270.20 + 6.0.32-servicing.24310.33 6.0.32 6.0.32 6.0.13 From 5c25d8b4bbc26db5db19b8050306e04b4d4c2a61 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Jun 2024 21:59:09 +0000 Subject: [PATCH 16/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240613.6 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.32-servicing.24312.1 -> To Version 6.0.32-servicing.24313.6 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.32-servicing.24310.33 -> To Version 6.0.32-servicing.24313.8 (parent: Microsoft.Private.Winforms --- 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 cf41de87cb4..379d8c5e47f 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 4227ffbc268..ac58db432cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0d0145ef1ba75ce4aaf306b233688edd3ec1ffb4 + 2e544744bf8fc5ee2ff1462531b7dd8e3c4af885 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0d0145ef1ba75ce4aaf306b233688edd3ec1ffb4 + 2e544744bf8fc5ee2ff1462531b7dd8e3c4af885 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1b0b27947208969c44a51033aef7fea048f3e55 + afb18ba908d9a6b8334c1e156ec88638932dedd1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1b0b27947208969c44a51033aef7fea048f3e55 + afb18ba908d9a6b8334c1e156ec88638932dedd1 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1b0b27947208969c44a51033aef7fea048f3e55 + afb18ba908d9a6b8334c1e156ec88638932dedd1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1b0b27947208969c44a51033aef7fea048f3e55 + afb18ba908d9a6b8334c1e156ec88638932dedd1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1b0b27947208969c44a51033aef7fea048f3e55 + afb18ba908d9a6b8334c1e156ec88638932dedd1 diff --git a/eng/Versions.props b/eng/Versions.props index 7f2d9ce738d..5708affe1b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.32-servicing.24312.1 + 6.0.32-servicing.24313.6 5.0.0-alpha1.19562.1 - 6.0.32-servicing.24310.33 - 6.0.32-servicing.24310.33 + 6.0.32-servicing.24313.8 + 6.0.32-servicing.24313.8 - 6.0.32-servicing.24310.33 + 6.0.32-servicing.24313.8 6.0.32 6.0.32 6.0.13 From a57e034fd027100edb6751a758fc2c24def8b23b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 23:00:41 +0000 Subject: [PATCH 17/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240614.5 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.32-servicing.24313.6 -> To Version 6.0.32-servicing.24314.5 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.32-servicing.24313.8 -> To Version 6.0.32-servicing.24314.7 (parent: Microsoft.Private.Winforms --- 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 379d8c5e47f..eb85871e238 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 ac58db432cc..b382a40925b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2e544744bf8fc5ee2ff1462531b7dd8e3c4af885 + 670045968593e524941ef480423796ceb50c5e2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2e544744bf8fc5ee2ff1462531b7dd8e3c4af885 + 670045968593e524941ef480423796ceb50c5e2f https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - afb18ba908d9a6b8334c1e156ec88638932dedd1 + e77011b31a3e5c47d931248a64b47f9b2d47853d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - afb18ba908d9a6b8334c1e156ec88638932dedd1 + e77011b31a3e5c47d931248a64b47f9b2d47853d https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - afb18ba908d9a6b8334c1e156ec88638932dedd1 + e77011b31a3e5c47d931248a64b47f9b2d47853d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - afb18ba908d9a6b8334c1e156ec88638932dedd1 + e77011b31a3e5c47d931248a64b47f9b2d47853d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - afb18ba908d9a6b8334c1e156ec88638932dedd1 + e77011b31a3e5c47d931248a64b47f9b2d47853d diff --git a/eng/Versions.props b/eng/Versions.props index 5708affe1b6..1606be16931 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.32-servicing.24313.6 + 6.0.32-servicing.24314.5 5.0.0-alpha1.19562.1 - 6.0.32-servicing.24313.8 - 6.0.32-servicing.24313.8 + 6.0.32-servicing.24314.7 + 6.0.32-servicing.24314.7 - 6.0.32-servicing.24313.8 + 6.0.32-servicing.24314.7 6.0.32 6.0.32 6.0.13