From 9b8d6158a943e2d7d3f48b274a314b2d60fb1335 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 10 Mar 2024 05:36:54 +0000 Subject: [PATCH 1/7] [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-winforms --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 808140d1be4..b51e62e0ae4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,9 +6,11 @@ + + - + @@ -22,10 +24,12 @@ + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4021bf75aec..e27c2b6b2d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd280bbb5c9699bb93097206f076ad2f330ea8e1 + b376f387d33bbfe5fda9da6077ea1b9105c732d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd280bbb5c9699bb93097206f076ad2f330ea8e1 + b376f387d33bbfe5fda9da6077ea1b9105c732d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd280bbb5c9699bb93097206f076ad2f330ea8e1 + b376f387d33bbfe5fda9da6077ea1b9105c732d8 diff --git a/eng/Versions.props b/eng/Versions.props index e3852306ae8..fe23672c45b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,7 +22,7 @@ - 8.0.3-servicing.24116.3 + 8.0.4-servicing.24157.9 @@ -33,7 +33,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.3 + 8.0.4 8.0.0 8.0.0 8.0.0 From c15b5c68cd74ae28bc99af539d05880658c45024 Mon Sep 17 00:00:00 2001 From: dipeshmsft Date: Mon, 11 Mar 2024 16:43:41 +0530 Subject: [PATCH 2/7] Fixes PenIMC UAF MSRC .NET 8 --- .../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 e4c631a86ee4d5903db8534e46c682d38b20bf7b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Mar 2024 03:18:38 +0000 Subject: [PATCH 3/7] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240311.12 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common From Version 8.0.4-servicing.24157.9 -> To Version 8.0.4-servicing.24161.12 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index b51e62e0ae4..09ac961cbd4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e27c2b6b2d7..72f64d62408 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b376f387d33bbfe5fda9da6077ea1b9105c732d8 + d526838634165c6f0ea3e464519dceb9ba95446e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b376f387d33bbfe5fda9da6077ea1b9105c732d8 + d526838634165c6f0ea3e464519dceb9ba95446e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -152,7 +152,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b376f387d33bbfe5fda9da6077ea1b9105c732d8 + d526838634165c6f0ea3e464519dceb9ba95446e diff --git a/eng/Versions.props b/eng/Versions.props index fe23672c45b..e3b95f22b00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,7 +22,7 @@ - 8.0.4-servicing.24157.9 + 8.0.4-servicing.24161.12 From fa1c16bed016499d154cd0e2e4746c9a914cd890 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 18 Mar 2024 11:54:41 -0700 Subject: [PATCH 4/7] Local dependencies updated based on build with BAR id 217426 (20240314.3 from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms@refs/heads/internal/release/8.0) --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 09ac961cbd4..ee297183c1b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,12 +5,10 @@ - - - + - + @@ -24,12 +22,10 @@ - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72f64d62408..478a4109262 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d526838634165c6f0ea3e464519dceb9ba95446e + f37bd9d71f3baa2b2f47389aa2d2fa17324d714b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d526838634165c6f0ea3e464519dceb9ba95446e + f37bd9d71f3baa2b2f47389aa2d2fa17324d714b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -17,9 +17,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 38f2042434044be9a09065b23b7ef342a313a498 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -29,17 +29,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 38f2042434044be9a09065b23b7ef342a313a498 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 38f2042434044be9a09065b23b7ef342a313a498 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 38f2042434044be9a09065b23b7ef342a313a498 @@ -152,7 +152,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d526838634165c6f0ea3e464519dceb9ba95446e + f37bd9d71f3baa2b2f47389aa2d2fa17324d714b diff --git a/eng/Versions.props b/eng/Versions.props index e3b95f22b00..ba9376b0994 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,14 +22,14 @@ - 8.0.4-servicing.24161.12 + 8.0.4-servicing.24164.3 - 8.0.3-servicing.24114.23 - 8.0.3 - 8.0.3 - 8.0.3-servicing.24114.23 + 8.0.4-servicing.24163.26 + 8.0.4 + 8.0.4 + 8.0.4-servicing.24163.26 8.0.0 8.0.0 8.0.0 From 98cf51b0da3a060fd77c04128d4fcb6ba82076f0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 19 Mar 2024 20:07:10 +0000 Subject: [PATCH 5/7] Merged PR 38220: [internal/release/8.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 8.0.4-servicing.24163.26 to 8.0.4-servicing.24168.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 8.0.4 to 8.0.4 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.4 to 8.0.4 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.4-servicing.24163.26 to 8.0.4-servicing.24168.10 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: 0ce99e90-7dcb-4849-5aa3-08dbd5a5c716 - **Build**: - **Date Produced**: March 19, 2024 12:25:21 AM UTC - **Commit**: fbf1a1e892c2c37066093d856d8c23f7adff536f - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 8.0.4-servicing.24164.3 to 8.0.4-servicing.24168.13][1] - **Microsoft.Private.Winforms**: [from 8.0.4-servicing.24164.3 to 8.0.4-servicing.24168.13][1] - **System.Drawing.Common**: [from 8.0.4 to 8.0.4][1] - **Microsoft.NETCore.Platforms**: [from 8.0.4-servicing.24163.26 to 8.0.4-servicing.24168.10][2] - **Microsoft.NETCore.App.Ref**: [from 8.0.4 to 8.0.4][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.4 to 8.0.4][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.4-servicing.24163.26 to 8.0.4-servicing.24168.10][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCf37bd9d71f3baa2b2f47389aa2d2fa17324d714b&targetVersion=GCfbf1a1e892c2c37066093d856d8c23f7adff536f&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC38f2042434044be9a09065b23b7ef342a313a498&targetVersion=GCa1a9440b48374c6d400287abbb56a4ac54d9b02f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716) --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index ee297183c1b..2d75cb1536c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,10 +5,10 @@ - + - + @@ -22,10 +22,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 478a4109262..07bed0e53c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f37bd9d71f3baa2b2f47389aa2d2fa17324d714b + fbf1a1e892c2c37066093d856d8c23f7adff536f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f37bd9d71f3baa2b2f47389aa2d2fa17324d714b + fbf1a1e892c2c37066093d856d8c23f7adff536f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -17,9 +17,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -31,15 +31,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 38f2042434044be9a09065b23b7ef342a313a498 + a1a9440b48374c6d400287abbb56a4ac54d9b02f @@ -152,7 +152,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f37bd9d71f3baa2b2f47389aa2d2fa17324d714b + fbf1a1e892c2c37066093d856d8c23f7adff536f diff --git a/eng/Versions.props b/eng/Versions.props index ba9376b0994..690e8b718f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,14 +22,14 @@ - 8.0.4-servicing.24164.3 + 8.0.4-servicing.24168.13 - 8.0.4-servicing.24163.26 + 8.0.4-servicing.24168.10 8.0.4 8.0.4 - 8.0.4-servicing.24163.26 + 8.0.4-servicing.24168.10 8.0.0 8.0.0 8.0.0 From cb0cdd81d7cb92d6ba28ec2cdaf488c18631ab9d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 20:48:43 +0000 Subject: [PATCH 6/7] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common From Version 8.0.4-servicing.24168.13 -> To Version 8.0.4-servicing.24169.7 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2d75cb1536c..3c35a757dc6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07bed0e53c4..7d8545fc197 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fbf1a1e892c2c37066093d856d8c23f7adff536f + 1575d7056e8952d90f592553e9f00661bc94e81a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fbf1a1e892c2c37066093d856d8c23f7adff536f + 1575d7056e8952d90f592553e9f00661bc94e81a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -152,7 +152,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fbf1a1e892c2c37066093d856d8c23f7adff536f + 1575d7056e8952d90f592553e9f00661bc94e81a diff --git a/eng/Versions.props b/eng/Versions.props index 690e8b718f4..d101da38680 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,7 +22,7 @@ - 8.0.4-servicing.24168.13 + 8.0.4-servicing.24169.7 From b18e956175886e86553ec1a6eab3a06e08183c83 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 00:17:20 +0000 Subject: [PATCH 7/7] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common From Version 8.0.4-servicing.24169.7 -> To Version 8.0.4-servicing.24169.11 Dependency coherency updates Microsoft.NETCore.Platforms,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.4-servicing.24168.10 -> To Version 8.0.4-servicing.24169.9 (parent: Microsoft.Private.Winforms --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3c35a757dc6..3b5a8795819 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,10 +5,10 @@ - + - + @@ -22,10 +22,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d8545fc197..bc9931f9abb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1575d7056e8952d90f592553e9f00661bc94e81a + 41a4bd690229661e3ec74276ce3f93863b22435b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1575d7056e8952d90f592553e9f00661bc94e81a + 41a4bd690229661e3ec74276ce3f93863b22435b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -17,9 +17,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -31,15 +31,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 @@ -152,7 +152,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1575d7056e8952d90f592553e9f00661bc94e81a + 41a4bd690229661e3ec74276ce3f93863b22435b diff --git a/eng/Versions.props b/eng/Versions.props index d101da38680..e0886d291c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,14 +22,14 @@ - 8.0.4-servicing.24169.7 + 8.0.4-servicing.24169.11 - 8.0.4-servicing.24168.10 + 8.0.4-servicing.24169.9 8.0.4 8.0.4 - 8.0.4-servicing.24168.10 + 8.0.4-servicing.24169.9 8.0.0 8.0.0 8.0.0