From 389429a6a6c2dd143c2e1fdef407f8de40c4d7f8 Mon Sep 17 00:00:00 2001 From: Ashish Singh Date: Thu, 6 Apr 2023 02:36:03 +0000 Subject: [PATCH 01/21] Merged PR 30328: WPF MSRC Fix port for CVE-2023-24895 WPF MSRC Fix port for CVE-2023-24895 --- .../AppModel/AppModelKnownContentFactory.cs | 37 ++++++++++++++++--- .../MS/Internal/AppModel/MimeObjectFactory.cs | 25 ++++++++++--- .../System/Windows/Application.cs | 24 ++++++------ .../System/Windows/Markup/ParserContext.cs | 1 + .../Markup/RestrictiveXamlXmlReader.cs | 24 ++++++++++-- .../System/Windows/Markup/WpfXamlLoader.cs | 17 +++++++++ .../System/Windows/Markup/XamlReader.cs | 8 ++-- .../Windows/Navigation/NavigationService.cs | 6 ++- .../System/Windows/ResourceDictionary.cs | 6 ++- 9 files changed, 115 insertions(+), 33 deletions(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/AppModelKnownContentFactory.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/AppModelKnownContentFactory.cs index 17faf771842..4b89168c0f6 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/AppModelKnownContentFactory.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/AppModelKnownContentFactory.cs @@ -9,7 +9,7 @@ using System; using System.IO; -using System.Security; +using System.Security; using System.Windows; using System.Windows.Markup; using System.Windows.Navigation; @@ -33,8 +33,16 @@ internal static class AppModelKnownContentFactory // internal static object BamlConverter(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter) { - asyncObjectConverter = null; + return BamlConverterCore(stream, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter, false); + } + internal static object BamlConverterCore(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe) + { + asyncObjectConverter = null; + if (isUnsafe) + { + throw new InvalidOperationException(SR.Get(SRID.BamlIsNotSupportedOutsideOfApplicationResources)); + } // If this stream comes from outside the application throw // if (!BaseUriHelper.IsPackApplicationUri(baseUri)) @@ -63,6 +71,11 @@ internal static object BamlConverter(Stream stream, Uri baseUri, bool canUseTopL // Creates an object instance from a Xaml stream and it's Uri // internal static object XamlConverter(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter) + { + return XamlConverterCore(stream, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter, false); + } + + internal static object XamlConverterCore(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe) { asyncObjectConverter = null; @@ -91,18 +104,22 @@ internal static object XamlConverter(Stream stream, Uri baseUri, bool canUseTopL XamlReader xr = new XamlReader(); asyncObjectConverter = xr; xr.LoadCompleted += new AsyncCompletedEventHandler(OnParserComplete); + if(isUnsafe) + { + pc.FromRestrictiveReader = true; + } // XamlReader.Load will close the stream. return xr.LoadAsync(stream, pc); } else { // XamlReader.Load will close the stream. - return XamlReader.Load(stream, pc); + return XamlReader.Load(stream, pc, isUnsafe); } } } - private static void OnParserComplete(object sender, AsyncCompletedEventArgs args) + private static void OnParserComplete(object sender, AsyncCompletedEventArgs args) { // We can get this event from cancellation. We do not care about the error if there is any // that happened as a result of cancellation. @@ -114,13 +131,21 @@ private static void OnParserComplete(object sender, AsyncCompletedEventArgs args internal static object HtmlXappConverter(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter) { - asyncObjectConverter = null; + return HtmlXappConverterCore(stream, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter, false); + } + internal static object HtmlXappConverterCore(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe) + { + asyncObjectConverter = null; + if (isUnsafe) + { + throw new InvalidOperationException(SR.Get(SRID.BamlIsNotSupportedOutsideOfApplicationResources)); + } if (canUseTopLevelBrowser) { return null; } - + if (SecurityHelper.AreStringTypesEqual(baseUri.Scheme, BaseUriHelper.PackAppBaseUri.Scheme)) { baseUri = BaseUriHelper.ConvertPackUriToAbsoluteExternallyVisibleUri(baseUri); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/MimeObjectFactory.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/MimeObjectFactory.cs index 0251869cd00..cdcc8aad3c9 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/MimeObjectFactory.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/MimeObjectFactory.cs @@ -20,6 +20,7 @@ namespace MS.Internal.AppModel { internal delegate object StreamToObjectFactoryDelegate(Stream s, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter); + internal delegate object StreamToObjectFactoryDelegateCore(Stream s, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe); internal static class MimeObjectFactory { @@ -33,26 +34,37 @@ internal static class MimeObjectFactory // The delegate that we are calling is responsible for closing the stream internal static object GetObjectAndCloseStream(Stream s, ContentType contentType, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter) + { + return GetObjectAndCloseStreamCore(s, contentType, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter, false); + } + + internal static object GetObjectAndCloseStreamCore(Stream s, ContentType contentType, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe) { object objToReturn = null; asyncObjectConverter = null; if (contentType != null) { - StreamToObjectFactoryDelegate d; - if (_objectConverters.TryGetValue(contentType, out d)) + StreamToObjectFactoryDelegateCore d; + if (_objectConvertersCore.TryGetValue(contentType, out d)) { - objToReturn = d(s, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter); + objToReturn = d(s, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter, isUnsafe); } } return objToReturn; } - + // The delegate registered here will be responsible for closing the stream passed to it. + internal static void RegisterCore(ContentType contentType, StreamToObjectFactoryDelegateCore method) + { + _objectConvertersCore[contentType] = method; + } + // The delegate registered here will be responsible for closing the stream passed to it. internal static void Register(ContentType contentType, StreamToObjectFactoryDelegate method) { - _objectConverters[contentType] = method; + StreamToObjectFactoryDelegateCore methodCore = new StreamToObjectFactoryDelegateCore((Stream s, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe) => method(s, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter)); + RegisterCore(contentType, methodCore); } #endregion @@ -66,7 +78,8 @@ internal static void Register(ContentType contentType, StreamToObjectFactoryDele #region private members - private static readonly Dictionary _objectConverters = new Dictionary(capacity: 9, new ContentType.WeakComparer()); + private static readonly Dictionary _objectConverters = new Dictionary(9, new ContentType.WeakComparer()); + private static readonly Dictionary _objectConvertersCore = new Dictionary(9, new ContentType.WeakComparer()); #endregion } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Application.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Application.cs index 275a575c0d7..f7de153b642 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Application.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Application.cs @@ -1979,20 +1979,22 @@ private static void ApplicationInit() // and mark it as thread-safe so PackWebResponse won't protect returned streams with a synchronizing wrapper PreloadedPackages.AddPackage(PackUriHelper.GetPackageUri(BaseUriHelper.PackAppBaseUri), new ResourceContainer(), true); - MimeObjectFactory.Register(MimeTypeMapper.BamlMime, new StreamToObjectFactoryDelegate(AppModelKnownContentFactory.BamlConverter)); - StreamToObjectFactoryDelegate xamlFactoryDelegate = new StreamToObjectFactoryDelegate(AppModelKnownContentFactory.XamlConverter); + MimeObjectFactory.RegisterCore(MimeTypeMapper.BamlMime, new StreamToObjectFactoryDelegateCore(AppModelKnownContentFactory.BamlConverterCore)); - MimeObjectFactory.Register(MimeTypeMapper.XamlMime, xamlFactoryDelegate); - MimeObjectFactory.Register(MimeTypeMapper.FixedDocumentMime, xamlFactoryDelegate); - MimeObjectFactory.Register(MimeTypeMapper.FixedDocumentSequenceMime, xamlFactoryDelegate); - MimeObjectFactory.Register(MimeTypeMapper.FixedPageMime, xamlFactoryDelegate); - MimeObjectFactory.Register(MimeTypeMapper.ResourceDictionaryMime, xamlFactoryDelegate); + StreamToObjectFactoryDelegateCore xamlFactoryDelegate = new StreamToObjectFactoryDelegateCore(AppModelKnownContentFactory.XamlConverterCore); - StreamToObjectFactoryDelegate htmlxappFactoryDelegate = new StreamToObjectFactoryDelegate(AppModelKnownContentFactory.HtmlXappConverter); - MimeObjectFactory.Register(MimeTypeMapper.HtmMime, htmlxappFactoryDelegate); - MimeObjectFactory.Register(MimeTypeMapper.HtmlMime, htmlxappFactoryDelegate); - MimeObjectFactory.Register(MimeTypeMapper.XbapMime, htmlxappFactoryDelegate); + MimeObjectFactory.RegisterCore(MimeTypeMapper.XamlMime, xamlFactoryDelegate); + MimeObjectFactory.RegisterCore(MimeTypeMapper.FixedDocumentMime, xamlFactoryDelegate); + MimeObjectFactory.RegisterCore(MimeTypeMapper.FixedDocumentSequenceMime, xamlFactoryDelegate); + MimeObjectFactory.RegisterCore(MimeTypeMapper.FixedPageMime, xamlFactoryDelegate); + MimeObjectFactory.RegisterCore(MimeTypeMapper.ResourceDictionaryMime, xamlFactoryDelegate); + + StreamToObjectFactoryDelegateCore htmlxappFactoryDelegate = new StreamToObjectFactoryDelegateCore(AppModelKnownContentFactory.HtmlXappConverterCore); + MimeObjectFactory.RegisterCore(MimeTypeMapper.HtmMime, htmlxappFactoryDelegate); + MimeObjectFactory.RegisterCore(MimeTypeMapper.HtmlMime, htmlxappFactoryDelegate); + MimeObjectFactory.RegisterCore(MimeTypeMapper.XbapMime, htmlxappFactoryDelegate); + } // This function returns the resource stream including resource and content file. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/ParserContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/ParserContext.cs index 788cd569951..863cb98e0a2 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/ParserContext.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/ParserContext.cs @@ -475,6 +475,7 @@ public static XmlParserContext ToXmlParserContext(ParserContext parserContext) #region Internal + internal bool FromRestrictiveReader { get; set; } // Reset stack to default state private void EndRepeat() diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/RestrictiveXamlXmlReader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/RestrictiveXamlXmlReader.cs index 7668a891566..2ad86375d6e 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/RestrictiveXamlXmlReader.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/RestrictiveXamlXmlReader.cs @@ -167,7 +167,8 @@ private bool IsAllowedDirective(XamlDirective directive) // The following is an exhaustive list of all allowed XAML directives. if (directive.Name == XamlLanguage.Items.Name || directive.Name == XamlLanguage.Key.Name || - directive.Name == XamlLanguage.Name.Name) + directive.Name == XamlLanguage.Name.Name || + Member == XamlLanguage.PositionalParameters) { return true; } @@ -193,7 +194,7 @@ private bool IsAllowedType(Type type) // - primitives (int, etc.); and // - any DependencyObject-derived type which exists in the System.Windows.* namespace. - bool isValidNamespace = type.Namespace != null && type.Namespace.StartsWith("System.Windows.", StringComparison.Ordinal); + bool isValidNamespace = type.Namespace != null && (type.Namespace.Equals("System.Windows", StringComparison.Ordinal) || type.Namespace.StartsWith("System.Windows.", StringComparison.Ordinal)); bool isValidSubClass = type.IsSubclassOf(DependencyObjectType); bool isValidPrimitive = type.IsPrimitive; @@ -211,6 +212,23 @@ private bool IsAllowedType(Type type) /// /// Per instance set of allow-listed types, may grow at runtime to encompass implicit allow list. /// - HashSet _safeTypesSet = new HashSet(); + HashSet _safeTypesSet = new HashSet() { + typeof(System.Windows.ResourceDictionary), + typeof(System.Windows.StaticResourceExtension), + typeof(System.Windows.Documents.DocumentStructures.FigureStructure), + typeof(System.Windows.Documents.DocumentStructures.ListItemStructure), + typeof(System.Windows.Documents.DocumentStructures.ListStructure), + typeof(System.Windows.Documents.DocumentStructures.NamedElement), + typeof(System.Windows.Documents.DocumentStructures.ParagraphStructure), + typeof(System.Windows.Documents.DocumentStructures.SectionStructure), + typeof(System.Windows.Documents.DocumentStructures.StoryBreak), + typeof(System.Windows.Documents.DocumentStructures.StoryFragment), + typeof(System.Windows.Documents.DocumentStructures.StoryFragments), + typeof(System.Windows.Documents.DocumentStructures.TableCellStructure), + typeof(System.Windows.Documents.DocumentStructures.TableRowGroupStructure), + typeof(System.Windows.Documents.DocumentStructures.TableRowStructure), + typeof(System.Windows.Documents.DocumentStructures.TableStructure), + typeof(System.Windows.Documents.LinkTarget) + }; } } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/WpfXamlLoader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/WpfXamlLoader.cs index 29cfb380eb5..493006de594 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/WpfXamlLoader.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/WpfXamlLoader.cs @@ -116,6 +116,23 @@ private static object Load(System.Xaml.XamlReader xamlReader, IXamlObjectWriterF } stack.CurrentFrame.Instance = args.Instance; + + if (xamlReader is RestrictiveXamlXmlReader && args != null) + { + if (args.Instance is System.Windows.ResourceDictionary rd) + { + rd.IsUnsafe = true; + } + else if (args.Instance is System.Windows.Controls.Frame frame) + { + frame.NavigationService.IsUnsafe = true; + } + else if (args.Instance is System.Windows.Navigation.NavigationWindow nw) + { + nw.NavigationService.IsUnsafe = true; + } + } + }; if (writerFactory != null) { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlReader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlReader.cs index a9ba35f0d2a..6c4c0feb357 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlReader.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlReader.cs @@ -183,7 +183,7 @@ public static object Load(Stream stream, ParserContext parserContext, bool useRe } XmlReader reader = XmlReader.Create(stream, null, parserContext); - object tree = Load(reader, parserContext, XamlParseMode.Synchronous, useRestrictiveXamlReader); + object tree = Load(reader, parserContext, XamlParseMode.Synchronous, useRestrictiveXamlReader || parserContext.FromRestrictiveReader); stream.Close(); return tree; } @@ -378,8 +378,8 @@ private object LoadAsync(XmlReader reader, ParserContext parserContext, bool use try { - _textReader = (useRestrictiveXamlReader) ? new RestrictiveXamlXmlReader(reader, schemaContext, settings) : - new System.Xaml.XamlXmlReader(reader, schemaContext, settings); + _textReader = (useRestrictiveXamlReader || parserContext.FromRestrictiveReader) ? new RestrictiveXamlXmlReader(reader, schemaContext, settings) : + new System.Xaml.XamlXmlReader(reader, schemaContext, settings); _stack = new XamlContextStack(() => new WpfXamlFrame()); @@ -917,7 +917,7 @@ internal static object Load( XamlSchemaContext schemaContext = parserContext.XamlTypeMapper != null ? parserContext.XamlTypeMapper.SchemaContext : GetWpfSchemaContext(); - System.Xaml.XamlXmlReader xamlXmlReader = (useRestrictiveXamlReader) ? new RestrictiveXamlXmlReader(reader, schemaContext, settings, safeTypes) : + System.Xaml.XamlXmlReader xamlXmlReader = (useRestrictiveXamlReader || parserContext.FromRestrictiveReader) ? new RestrictiveXamlXmlReader(reader, schemaContext, settings, safeTypes) : new System.Xaml.XamlXmlReader(reader, schemaContext, settings); root = Load(xamlXmlReader, parserContext); reader.Close(); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Navigation/NavigationService.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Navigation/NavigationService.cs index 291f360a38f..ee1666eafa8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Navigation/NavigationService.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Navigation/NavigationService.cs @@ -2945,7 +2945,7 @@ private void GetObjectFromResponse(WebRequest request, WebResponse response, Uri // o will be null. // We don't support browser hosting since .NET Core 3.0, so therefore canUseTopLevelBrowserForHTMLRendering = false bool canUseTopLevelBrowserForHTMLRendering = false; - Object o = MimeObjectFactory.GetObjectAndCloseStream(bindStream, contentType, destinationUri, canUseTopLevelBrowserForHTMLRendering, sandBoxContent, true /*allowAsync*/, IsJournalNavigation(navigateInfo), out _asyncObjectConverter); + Object o = MimeObjectFactory.GetObjectAndCloseStreamCore(bindStream, contentType, destinationUri, canUseTopLevelBrowserForHTMLRendering, sandBoxContent, true /*allowAsync*/, IsJournalNavigation(navigateInfo), out _asyncObjectConverter, IsUnsafe); if (o != null) { @@ -3640,7 +3640,9 @@ internal void Dispose() _parentNavigationService = null; _webBrowser = null; } - + + // This is set when the navigationservice is loaded from unsafe xps doc. + internal bool IsUnsafe { get; set; } #region Private Functions /// diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ResourceDictionary.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ResourceDictionary.cs index 46fd97441f5..e44645e55d0 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ResourceDictionary.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ResourceDictionary.cs @@ -112,6 +112,9 @@ private void CopyToWithoutLock(DictionaryEntry[] array, int arrayIndex) entry.Value = value; // refresh the entry value in case it was changed in the previous call } } + + // This is set when the RD is loaded from unsafe xps doc. This will be checked while creating reader for RD source. + internal bool IsUnsafe { get; set; } /// /// List of ResourceDictionaries merged into this Resource Dictionary @@ -226,7 +229,7 @@ public Uri Source // It can be a sync/async converter. It's the converter's responsiblity to close the stream. // If it fails to find a convert, this call will return null. System.Windows.Markup.XamlReader asyncObjectConverter; - ResourceDictionary loadedRD = MimeObjectFactory.GetObjectAndCloseStream(s, contentType, uri, false, false, false /*allowAsync*/, false /*isJournalNavigation*/, out asyncObjectConverter) + ResourceDictionary loadedRD = MimeObjectFactory.GetObjectAndCloseStreamCore(s, contentType, uri, false, false, false /*allowAsync*/, false /*isJournalNavigation*/, out asyncObjectConverter, IsUnsafe) as ResourceDictionary; if (loadedRD == null) @@ -2467,6 +2470,7 @@ private void CopyDeferredContentFrom(ResourceDictionary loadedRD) _reader = loadedRD._reader; _numDefer = loadedRD._numDefer; _deferredLocationList = loadedRD._deferredLocationList; + IsUnsafe = loadedRD.IsUnsafe; } private void MoveDeferredResourceReferencesFrom(ResourceDictionary loadedRD) From 73865fc803bdadce4565ceff9d2b1cb067e9af6a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 13 Apr 2023 18:34:23 +0000 Subject: [PATCH 02/21] Merged PR 30386: [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**: 20230412.4 - **Date Produced**: April 12, 2023 6:20:51 PM UTC - **Commit**: 80a66e5fac1dbdd9604c201212bf2a866e3705ce - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23212.4][3] - **Microsoft.Private.Winforms**: [from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23212.4][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC357cdc523d&targetVersion=GC80a66e5fac&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- 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 aa9bc95339e..9ff97a72ddb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d + 80a66e5fac1dbdd9604c201212bf2a866e3705ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d + 80a66e5fac1dbdd9604c201212bf2a866e3705ce https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a7f16f7199a..e34b3bdfbc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.16-servicing.23174.2 + 6.0.17-servicing.23212.4 From 0595f2eaaa1c0cdef5878f1989c6dc3c0110957b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 13 Apr 2023 21:11:50 +0000 Subject: [PATCH 03/21] Merged PR 30634: [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.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (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**: 20230413.3 - **Date Produced**: April 13, 2023 7:00:15 PM UTC - **Commit**: 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23212.4 to 6.0.17-servicing.23213.3][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23212.4 to 6.0.17-servicing.23213.3][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.16 to 6.0.17][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.17][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC80a66e5fac&targetVersion=GC1960d9e6b9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1e620a42e7&targetVersion=GCea0418c9be&_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, 24 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd50ad48aa4..44a04a0c44e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,8 @@ + + @@ -24,6 +26,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ff97a72ddb..70bad4dfb55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 80a66e5fac1dbdd9604c201212bf2a866e3705ce + 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 80a66e5fac1dbdd9604c201212bf2a866e3705ce + 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 diff --git a/eng/Versions.props b/eng/Versions.props index e34b3bdfbc2..a57ce58c125 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.17-servicing.23212.4 + 6.0.17-servicing.23213.3 5.0.0-alpha1.19562.1 - 6.0.16-servicing.23173.11 - 6.0.16-servicing.23173.11 + 6.0.17-servicing.23212.18 + 6.0.17-servicing.23212.18 - 6.0.16-servicing.23173.11 - 6.0.16 - 6.0.16 + 6.0.17-servicing.23212.18 + 6.0.17 + 6.0.17 6.0.9 6.0.0 6.0.1 From cf237a039147d849a16e2a278b9db9f8fce6e424 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Apr 2023 17:19:53 +0000 Subject: [PATCH 04/21] Merged PR 30768: [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.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (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**: 20230418.1 - **Date Produced**: April 18, 2023 3:25:39 PM UTC - **Commit**: 455077d161050f52799300d335ac47d53b6cfedb - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.17][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.17][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1960d9e6b9&targetVersion=GC455077d161&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCea0418c9be&targetVersion=GC6e89d2b65b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44a04a0c44e..5b840b984a8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,11 +5,7 @@ - - - - - + @@ -23,11 +19,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70bad4dfb55..ed760337c13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 + 455077d161050f52799300d335ac47d53b6cfedb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 + 455077d161050f52799300d335ac47d53b6cfedb https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 diff --git a/eng/Versions.props b/eng/Versions.props index a57ce58c125..e48060389be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.17-servicing.23213.3 + 6.0.17-servicing.23218.1 5.0.0-alpha1.19562.1 - 6.0.17-servicing.23212.18 - 6.0.17-servicing.23212.18 + 6.0.17-servicing.23217.9 + 6.0.17-servicing.23217.9 - 6.0.17-servicing.23212.18 + 6.0.17-servicing.23217.9 6.0.17 6.0.17 6.0.9 From 4bf4fd59d82399a8a5598c1f81c98c2abeaaf469 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 11 May 2023 21:48:30 +0000 Subject: [PATCH 05/21] Merged PR 31016: [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**: 20230502.5 - **Date Produced**: May 2, 2023 6:56:09 PM UTC - **Commit**: 24e38444348603b9b97149b5e3ffb73f7baddc85 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23218.1 to 6.0.18-servicing.23252.5][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23218.1 to 6.0.18-servicing.23252.5][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC455077d161&targetVersion=GC24e3844434&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- 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 ed760337c13..83758045e70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 455077d161050f52799300d335ac47d53b6cfedb + 24e38444348603b9b97149b5e3ffb73f7baddc85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 455077d161050f52799300d335ac47d53b6cfedb + 24e38444348603b9b97149b5e3ffb73f7baddc85 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 727823a1ee9..33197bcc0bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.17-servicing.23218.1 + 6.0.18-servicing.23252.5 From f82a2b2d304233b5e27a18fbc2ff65ede97e37eb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 May 2023 19:43:25 +0000 Subject: [PATCH 06/21] Merged PR 31347: [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.9 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (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**: 20230518.4 - **Date Produced**: May 18, 2023 5:31:07 PM UTC - **Commit**: bac4e66c4abaf7e2a20990556b315f015cd518ca - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23252.5 to 6.0.18-servicing.23268.4][1] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23252.5 to 6.0.18-servicing.23268.4][1] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.10][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.18][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.18][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC24e3844434&targetVersion=GCbac4e66c4a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1e620a42e7&targetVersion=GCe1d69ebd53&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC6e89d2b65b&targetVersion=GCe1d69ebd53&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5b840b984a8..35af82ab569 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 83758045e70..6e33ed10259 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24e38444348603b9b97149b5e3ffb73f7baddc85 + bac4e66c4abaf7e2a20990556b315f015cd518ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24e38444348603b9b97149b5e3ffb73f7baddc85 + bac4e66c4abaf7e2a20990556b315f015cd518ca https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 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 - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 diff --git a/eng/Versions.props b/eng/Versions.props index 33197bcc0bd..b3ab14e832f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.18-servicing.23252.5 + 6.0.18-servicing.23268.4 5.0.0-alpha1.19562.1 - 6.0.17-servicing.23217.9 - 6.0.17-servicing.23217.9 + 6.0.18-servicing.23266.17 + 6.0.18-servicing.23266.17 - 6.0.17-servicing.23217.9 - 6.0.17 - 6.0.17 - 6.0.9 + 6.0.18-servicing.23266.17 + 6.0.18 + 6.0.18 + 6.0.10 6.0.0 6.0.1 6.0.0 From 7cd35b1648ac297ea6404c1f7645aaae8a216938 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 May 2023 18:24:06 +0000 Subject: [PATCH 07/21] Merged PR 31380: [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.10 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (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**: 20230518.8 - **Date Produced**: May 19, 2023 4:46:19 PM UTC - **Commit**: 9e5f193ed61f002d5d870df9c8b0b5e880fa595c - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.NETCore.Platforms**: [from 6.0.10 to 6.0.10][4] - **Microsoft.NETCore.ILDAsm**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] - **Microsoft.NETCore.ILAsm**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][4] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][4] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCbac4e66c4a&targetVersion=GC9e5f193ed6&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe1d69ebd53&targetVersion=GC01f26a7417&_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 35af82ab569..2e3aa0ef666 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 6e33ed10259..ee749f18a6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bac4e66c4abaf7e2a20990556b315f015cd518ca + 9e5f193ed61f002d5d870df9c8b0b5e880fa595c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bac4e66c4abaf7e2a20990556b315f015cd518ca + 9e5f193ed61f002d5d870df9c8b0b5e880fa595c https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 01f26a741717461d8a311f4a1ee72e64565172aa 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 - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 01f26a741717461d8a311f4a1ee72e64565172aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 01f26a741717461d8a311f4a1ee72e64565172aa https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 01f26a741717461d8a311f4a1ee72e64565172aa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 01f26a741717461d8a311f4a1ee72e64565172aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 01f26a741717461d8a311f4a1ee72e64565172aa diff --git a/eng/Versions.props b/eng/Versions.props index b3ab14e832f..0db1e7872b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.18-servicing.23268.4 + 6.0.18-servicing.23268.8 5.0.0-alpha1.19562.1 - 6.0.18-servicing.23266.17 - 6.0.18-servicing.23266.17 + 6.0.18-servicing.23268.3 + 6.0.18-servicing.23268.3 - 6.0.18-servicing.23266.17 + 6.0.18-servicing.23268.3 6.0.18 6.0.18 6.0.10 From a29a62bc7aa91d9e7509261a138af3c27c0506ea Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 15:27:40 +0000 Subject: [PATCH 08/21] Merged PR 31444: [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.10 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (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**: 20230522.1 - **Date Produced**: May 22, 2023 2:50:17 PM UTC - **Commit**: 865895cec5e8dc357b65c98a4a7af58643d10997 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][1] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][1] - **Microsoft.NETCore.Platforms**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC9e5f193ed6&targetVersion=GC865895cec5&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC01f26a7417&targetVersion=GCc76ac56549&_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 2e3aa0ef666..06be4fb0ffd 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 ee749f18a6b..c487a450fe5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 9e5f193ed61f002d5d870df9c8b0b5e880fa595c + 865895cec5e8dc357b65c98a4a7af58643d10997 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 9e5f193ed61f002d5d870df9c8b0b5e880fa595c + 865895cec5e8dc357b65c98a4a7af58643d10997 https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f26a741717461d8a311f4a1ee72e64565172aa + c76ac565499f3e7c657126d46c00b67a0d74832c 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 - 01f26a741717461d8a311f4a1ee72e64565172aa + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f26a741717461d8a311f4a1ee72e64565172aa + c76ac565499f3e7c657126d46c00b67a0d74832c https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f26a741717461d8a311f4a1ee72e64565172aa + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f26a741717461d8a311f4a1ee72e64565172aa + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f26a741717461d8a311f4a1ee72e64565172aa + c76ac565499f3e7c657126d46c00b67a0d74832c diff --git a/eng/Versions.props b/eng/Versions.props index 0db1e7872b2..0018b6b95fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.18-servicing.23268.8 + 6.0.18-servicing.23272.1 5.0.0-alpha1.19562.1 - 6.0.18-servicing.23268.3 - 6.0.18-servicing.23268.3 + 6.0.18-servicing.23269.7 + 6.0.18-servicing.23269.7 - 6.0.18-servicing.23268.3 + 6.0.18-servicing.23269.7 6.0.18 6.0.18 6.0.10 From 321b09a7ea746a724e73e528043be39a9cc699a2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 13 Jun 2023 23:03:44 +0000 Subject: [PATCH 09/21] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230613.5 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.18-servicing.23272.1 -> To Version 6.0.19-servicing.23313.5 --- 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 06be4fb0ffd..d1e97187693 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 c487a450fe5..13ee344f702 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 865895cec5e8dc357b65c98a4a7af58643d10997 + fa4408a6fb58f06ac3db723e56bf16f3af7315d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 865895cec5e8dc357b65c98a4a7af58643d10997 + fa4408a6fb58f06ac3db723e56bf16f3af7315d5 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d2720ed04fc..cd8b3e5a38a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.18-servicing.23272.1 + 6.0.19-servicing.23313.5 From c758542e58474353d4ef53b720d13dae0748978d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Jun 2023 01:36:27 +0000 Subject: [PATCH 10/21] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230613.12 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.18-servicing.23272.1 -> To Version 6.0.19-servicing.23313.12 --- 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 13ee344f702..3bd27db2dc4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fa4408a6fb58f06ac3db723e56bf16f3af7315d5 + 7c8195afbf8f45bca27b107df1650daf9023cd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fa4408a6fb58f06ac3db723e56bf16f3af7315d5 + 7c8195afbf8f45bca27b107df1650daf9023cd7a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index cd8b3e5a38a..73621d92618 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.19-servicing.23313.5 + 6.0.19-servicing.23313.12 From c981e03be84865075f64145a69e683cb66401cc8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Jun 2023 21:02:22 +0000 Subject: [PATCH 11/21] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230614.6 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.18-servicing.23272.1 -> To Version 6.0.19-servicing.23314.6 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.10 -> To Version 6.0.11 (parent: Microsoft.Private.Winforms --- 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 d1e97187693..40c3b21c5c6 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 3bd27db2dc4..53b4bd2c9ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7c8195afbf8f45bca27b107df1650daf9023cd7a + b1b9ae8774dbff146d4a0149a85229360e1d5dfd - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7c8195afbf8f45bca27b107df1650daf9023cd7a + b1b9ae8774dbff146d4a0149a85229360e1d5dfd https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 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 - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 diff --git a/eng/Versions.props b/eng/Versions.props index 73621d92618..e083aa4afc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.19-servicing.23313.12 + 6.0.19-servicing.23314.6 5.0.0-alpha1.19562.1 - 6.0.18-servicing.23269.7 - 6.0.18-servicing.23269.7 + 6.0.19-servicing.23313.25 + 6.0.19-servicing.23313.25 - 6.0.18-servicing.23269.7 - 6.0.18 - 6.0.18 - 6.0.10 + 6.0.19-servicing.23313.25 + 6.0.19 + 6.0.19 + 6.0.11 6.0.0 6.0.1 6.0.0 From 669314bc4c99d34d2d0c4299bf68b4b7ed9580b8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Jun 2023 17:50:35 +0000 Subject: [PATCH 12/21] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230616.2 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.19-servicing.23314.6 -> To Version 6.0.19-servicing.23316.2 --- 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 2d06eabdca9..ccbceab4b3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b1b9ae8774dbff146d4a0149a85229360e1d5dfd + 4e9cc74519c57c5c4913459618f0dab2d6696ea1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b1b9ae8774dbff146d4a0149a85229360e1d5dfd + 4e9cc74519c57c5c4913459618f0dab2d6696ea1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8d814e67cf3..90a5b6af5de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.19-servicing.23314.6 + 6.0.19-servicing.23316.2 From 6298294127ccd64bc544dae38d09a4cd6be1d7a0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Jun 2023 15:54:58 +0000 Subject: [PATCH 13/21] Merged PR 32051: [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**: 20230620.10 - **Date Produced**: June 21, 2023 12:11:33 AM UTC - **Commit**: 2536781675df3fe4848e96605b0ee852fe3ee91b - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][2] - **Microsoft.Private.Winforms**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.11 to 6.0.11][3] - **Microsoft.NETCore.ILDAsm**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.19 to 6.0.20][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.19 to 6.0.20][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][3] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC4e9cc74519&targetVersion=GC2536781675&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCfcf11495c6&targetVersion=GCa08d9ce2ca&_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.Platforms**: from 6.0.11 to 6.0.11 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 12 ++++++------ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 40c3b21c5c6..981b869d6f1 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 ccbceab4b3f..4dea2dc4410 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4e9cc74519c57c5c4913459618f0dab2d6696ea1 + 2536781675df3fe4848e96605b0ee852fe3ee91b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4e9cc74519c57c5c4913459618f0dab2d6696ea1 + 2536781675df3fe4848e96605b0ee852fe3ee91b https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 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 - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 diff --git a/eng/Versions.props b/eng/Versions.props index 94dd02a4657..4c41820789c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.19-servicing.23316.2 + 6.0.20-servicing.23320.10 5.0.0-alpha1.19562.1 - 6.0.19-servicing.23313.25 - 6.0.19-servicing.23313.25 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 - 6.0.19-servicing.23313.25 - 6.0.19 - 6.0.19 + 6.0.20-servicing.23320.17 + 6.0.20 + 6.0.20 6.0.11 6.0.0 6.0.1 From 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Jun 2023 19:15:25 +0000 Subject: [PATCH 14/21] Merged PR 32118: [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**: 20230621.4 - **Date Produced**: June 21, 2023 5:20:08 PM UTC - **Commit**: 7f67c1539dcfa02ef740306820b44a713bdcb525 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][1] - **Microsoft.Private.Winforms**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC2536781675&targetVersion=GC7f67c1539d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- 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 4dea2dc4410..81951601835 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2536781675df3fe4848e96605b0ee852fe3ee91b + 7f67c1539dcfa02ef740306820b44a713bdcb525 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2536781675df3fe4848e96605b0ee852fe3ee91b + 7f67c1539dcfa02ef740306820b44a713bdcb525 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4c41820789c..577fa935809 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.20-servicing.23320.10 + 6.0.20-servicing.23321.4 From 7b8b7d5928985265109db7f148b359c96dc4828d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jul 2023 03:27:14 +0000 Subject: [PATCH 15/21] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230713.11 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.20-servicing.23321.4 -> To Version 6.0.21-servicing.23363.11 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.11 -> To Version 6.0.11 (parent: Microsoft.Private.Winforms --- NuGet.config | 2 ++ eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 12 ++++++------ 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..cfda5e33162 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 215c8720e2c..3cbeb147338 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7f67c1539dcfa02ef740306820b44a713bdcb525 + 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7f67c1539dcfa02ef740306820b44a713bdcb525 + 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + 0545d9fd7d80e0e8eaaff87aa0011ad5bc13fcc8 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 - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d diff --git a/eng/Versions.props b/eng/Versions.props index 229fcce911d..97ebca70d64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.20-servicing.23321.4 + 6.0.21-servicing.23363.11 5.0.0-alpha1.19562.1 - 6.0.20-servicing.23320.17 - 6.0.20-servicing.23320.17 + 6.0.21-servicing.23363.11 + 6.0.21-servicing.23363.11 - 6.0.20-servicing.23320.17 - 6.0.20 - 6.0.20 + 6.0.21-servicing.23363.11 + 6.0.21 + 6.0.21 6.0.11 6.0.0 6.0.1 From 3ce5a28a37f5cfe61ce9f8f4e19465c95b5976cd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jul 2023 20:27:38 +0000 Subject: [PATCH 16/21] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230714.6 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.21-servicing.23363.11 -> To Version 6.0.21-servicing.23364.6 Dependency coherency updates Microsoft.NETCore.Platforms From Version 6.0.11 -> To Version 6.0.11 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3cbeb147338..f90b90b5890 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 + 052009561f916cf06df82d89297ae3ed66cf5d2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 + 052009561f916cf06df82d89297ae3ed66cf5d2f https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0545d9fd7d80e0e8eaaff87aa0011ad5bc13fcc8 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int diff --git a/eng/Versions.props b/eng/Versions.props index 97ebca70d64..b43e624e694 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.21-servicing.23363.11 + 6.0.21-servicing.23364.6 From ccb899fabb951da0ce4ada295ab2783170aacef8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 10 Aug 2023 03:19:19 +0000 Subject: [PATCH 17/21] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms --- 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 34a38ffdb71..56874a77a32 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 + 0e63a4c51e83395143e12eb3df9d1de0081905f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 0e63a4c51e83395143e12eb3df9d1de0081905f8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2a4022f209e..8292b0f4b7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.21-servicing.23364.6 + 6.0.22-servicing.23409.7 From 466bc0dcd39ca4d366ee3de8f4a23223bad2b6d6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 15 Aug 2023 18:28:10 +0000 Subject: [PATCH 18/21] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.21-servicing.23363.11 to 6.0.22-servicing.23414.22 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.21-servicing.23363.11 to 6.0.22-servicing.23414.22 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.21 to 6.0.22 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.21-servicing.23363.11 to 6.0.22-servicing.23414.22 (parent: Microsoft.Private.Winforms) --- 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..20f9cafb055 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 56874a77a32..e05f0cf5932 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0e63a4c51e83395143e12eb3df9d1de0081905f8 + 0cd1589324d3ebe379ffeeed02c8c2ff517f3354 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0e63a4c51e83395143e12eb3df9d1de0081905f8 + 0cd1589324d3ebe379ffeeed02c8c2ff517f3354 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 + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 diff --git a/eng/Versions.props b/eng/Versions.props index 8292b0f4b7b..0394685cc21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.22-servicing.23409.7 + 6.0.22-servicing.23415.6 5.0.0-alpha1.19562.1 - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 + 6.0.22-servicing.23414.22 + 6.0.22-servicing.23414.22 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23414.22 + 6.0.22 + 6.0.22 6.0.11 6.0.0 6.0.1 From a9d6c10723434785b060eccf8383f9d4dcaf7bed Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 20:48:52 +0000 Subject: [PATCH 19/21] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230815.9 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.22-servicing.23415.6 -> To Version 6.0.22-servicing.23415.9 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.22-servicing.23414.22 -> To Version 6.0.22-servicing.23415.3 (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 20f9cafb055..b4839ad2a06 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 e05f0cf5932..b3b63b5b1be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0cd1589324d3ebe379ffeeed02c8c2ff517f3354 + 8e49f7f69149415593f0da365cae4ffdecb07c22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0cd1589324d3ebe379ffeeed02c8c2ff517f3354 + 8e49f7f69149415593f0da365cae4ffdecb07c22 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c diff --git a/eng/Versions.props b/eng/Versions.props index 0394685cc21..3298e891b5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.22-servicing.23415.6 + 6.0.22-servicing.23415.9 5.0.0-alpha1.19562.1 - 6.0.22-servicing.23414.22 - 6.0.22-servicing.23414.22 + 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.3 - 6.0.22-servicing.23414.22 + 6.0.22-servicing.23415.3 6.0.22 6.0.22 6.0.11 From 89f8ef7687501cce2e76a48cd405256ea0786059 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 17:33:24 +0000 Subject: [PATCH 20/21] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230816.4 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.22-servicing.23415.9 -> To Version 6.0.22-servicing.23416.4 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.22-servicing.23415.3 -> To Version 6.0.22-servicing.23415.11 (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 b4839ad2a06..1788771ab82 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 b3b63b5b1be..bfa141b7f7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8e49f7f69149415593f0da365cae4ffdecb07c22 + 0db2312765488a8a77ba6cef692fa53c636a47e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8e49f7f69149415593f0da365cae4ffdecb07c22 + 0db2312765488a8a77ba6cef692fa53c636a47e9 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf diff --git a/eng/Versions.props b/eng/Versions.props index 3298e891b5c..0c793d63075 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.22-servicing.23415.9 + 6.0.22-servicing.23416.4 5.0.0-alpha1.19562.1 - 6.0.22-servicing.23415.3 - 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.11 + 6.0.22-servicing.23415.11 - 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.11 6.0.22 6.0.22 6.0.11 From cc69ad111dd695019ae0bcef962265758701eba7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 07:07:25 +0000 Subject: [PATCH 21/21] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230824.7 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.22-servicing.23416.4 -> To Version 6.0.22-servicing.23424.7 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.22-servicing.23415.11 -> To Version 6.0.22-servicing.23424.25 (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 1788771ab82..9ffdd67e442 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 bfa141b7f7f..59c57fe05aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0db2312765488a8a77ba6cef692fa53c636a47e9 + 53190af510e57c1c146bd8a23725509771a42ae0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0db2312765488a8a77ba6cef692fa53c636a47e9 + 53190af510e57c1c146bd8a23725509771a42ae0 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd diff --git a/eng/Versions.props b/eng/Versions.props index 0c793d63075..028b6a7e310 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.22-servicing.23416.4 + 6.0.22-servicing.23424.7 5.0.0-alpha1.19562.1 - 6.0.22-servicing.23415.11 - 6.0.22-servicing.23415.11 + 6.0.22-servicing.23424.25 + 6.0.22-servicing.23424.25 - 6.0.22-servicing.23415.11 + 6.0.22-servicing.23424.25 6.0.22 6.0.22 6.0.11