From a2c18a7fd3afffb66bac6d80f048a70fb9b16af0 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 1 Aug 2024 12:29:20 -0700 Subject: [PATCH 01/16] Localized file check-in by OneLocBuild Task: Build definition ID 164: Build ID 2506992 (#11799) * Localized file check-in by OneLocBuild Task: Build definition ID 164: Build ID 2506961 * Localized file check-in by OneLocBuild Task: Build definition ID 164: Build ID 2506961 --- .../Resources/xlf/SR.zh-Hant.xlf | 2 +- .../Resources/xlf/SR.zh-Hant.xlf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/System.Windows.Forms.Analyzers.CodeFixes.CSharp/Resources/xlf/SR.zh-Hant.xlf b/src/System.Windows.Forms.Analyzers.CodeFixes.CSharp/Resources/xlf/SR.zh-Hant.xlf index 8cf4f2161cb..1c34538cc65 100644 --- a/src/System.Windows.Forms.Analyzers.CodeFixes.CSharp/Resources/xlf/SR.zh-Hant.xlf +++ b/src/System.Windows.Forms.Analyzers.CodeFixes.CSharp/Resources/xlf/SR.zh-Hant.xlf @@ -4,7 +4,7 @@ Add DesignerSerializationVisibilityAttribute to property - Add DesignerSerializationVisibilityAttribute to property + 將 DesignerSerializationVisibilityAttribute 新增至屬性 diff --git a/src/System.Windows.Forms.Analyzers.CodeFixes.VisualBasic/Resources/xlf/SR.zh-Hant.xlf b/src/System.Windows.Forms.Analyzers.CodeFixes.VisualBasic/Resources/xlf/SR.zh-Hant.xlf index 8cf4f2161cb..1c34538cc65 100644 --- a/src/System.Windows.Forms.Analyzers.CodeFixes.VisualBasic/Resources/xlf/SR.zh-Hant.xlf +++ b/src/System.Windows.Forms.Analyzers.CodeFixes.VisualBasic/Resources/xlf/SR.zh-Hant.xlf @@ -4,7 +4,7 @@ Add DesignerSerializationVisibilityAttribute to property - Add DesignerSerializationVisibilityAttribute to property + 將 DesignerSerializationVisibilityAttribute 新增至屬性 From 6194fcc4bd5b23a47be4298f4cdc15ed78da8e0f Mon Sep 17 00:00:00 2001 From: SimonZhao888 <133954995+SimonZhao888@users.noreply.github.com> Date: Fri, 2 Aug 2024 03:50:27 +0800 Subject: [PATCH 02/16] Do not crash when an invalid VirtualMode==true ListView is destroyed (#11679) * Add VirtualMode check in the ReleaseUiaProvider method * Restore changes in ListView, and update the property description. * update resource files * Adding Exception about ListView failed to retrieval items * Update exception message * Optimization Code * Adjust codes * Add a new accessor method without throw no exception * Modifying Exception Information * Undo test item modifications * Optimized code * Remove useless codes * Modify the code as suggested * Add test case for new internal api * Add test case * Adjusting code styles * fix comment * fix comment * 1 avoid the private reflection because we have public property that can be used instead (AccessibilityObject) 2. invoke ReleaseUiaProviders in the same way as it is invoked in applications, by calling Control.ReleaseUiaProveders method. 3. validate that control handle had not been created. * catch the specific expected exception --------- Co-authored-by: Simon Zhao (BEYONDSOFT CONSULTING INC) Co-authored-by: Epica3055 Co-authored-by: Tanya Solyanik --- .../src/Resources/SR.resx | 2 +- .../src/Resources/xlf/SR.cs.xlf | 4 +- .../src/Resources/xlf/SR.de.xlf | 4 +- .../src/Resources/xlf/SR.es.xlf | 4 +- .../src/Resources/xlf/SR.fr.xlf | 4 +- .../src/Resources/xlf/SR.it.xlf | 4 +- .../src/Resources/xlf/SR.ja.xlf | 4 +- .../src/Resources/xlf/SR.ko.xlf | 4 +- .../src/Resources/xlf/SR.pl.xlf | 4 +- .../src/Resources/xlf/SR.pt-BR.xlf | 4 +- .../src/Resources/xlf/SR.ru.xlf | 4 +- .../src/Resources/xlf/SR.tr.xlf | 4 +- .../src/Resources/xlf/SR.zh-Hans.xlf | 4 +- .../src/Resources/xlf/SR.zh-Hant.xlf | 4 +- ...tView.ListViewItemCollection.IInnerList.cs | 14 ++++ .../ListView.ListViewItemCollection.cs | 8 +++ .../ListView.ListViewNativeItemCollection.cs | 68 +++++++++++-------- .../Forms/Controls/ListView/ListView.cs | 2 +- .../System/Windows/Forms/ListViewTests.cs | 60 ++++++++++++++++ 19 files changed, 149 insertions(+), 57 deletions(-) diff --git a/src/System.Windows.Forms/src/Resources/SR.resx b/src/System.Windows.Forms/src/Resources/SR.resx index d77b3cfc975..f3529e2b26b 100644 --- a/src/System.Windows.Forms/src/Resources/SR.resx +++ b/src/System.Windows.Forms/src/Resources/SR.resx @@ -4018,7 +4018,7 @@ Stack trace where the illegal operation occurred was: Occurs whenever the state of a virtual item is changed. - Sets the count of the item collection when the ListView is in virtual mode. + Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. Value of '{1}' is not valid for '{0}'. {0} should be greater than or equal to 0. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf index 4f97a54feb9..5e4255d7774 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf @@ -6855,8 +6855,8 @@ Trasování zásobníku, kde došlo k neplatné operaci: - Sets the count of the item collection when the ListView is in virtual mode. - Nastaví počet pro kolekci položek v případě, že je vlastnost ListView ve virtuálním režimu. + Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. + Nastaví počet pro kolekci položek v případě, že je vlastnost ListView ve virtuálním režimu. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf index 8087afad687..8aae9969a91 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf @@ -6855,8 +6855,8 @@ Stapelüberwachung, in der der unzulässige Vorgang auftrat: - Sets the count of the item collection when the ListView is in virtual mode. - Legt die Anzahl der Elemente für die Elementesammlung fest, wenn sich die ListView im virtuellen Modus befindet. + Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. + Legt die Anzahl der Elemente für die Elementesammlung fest, wenn sich die ListView im virtuellen Modus befindet. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf index 0371065311e..b59f7acbed5 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf @@ -6855,8 +6855,8 @@ El seguimiento de la pila donde tuvo lugar la operación no válida fue: - Sets the count of the item collection when the ListView is in virtual mode. - Establece el recuento de la colección de elementos cuando ListView está en modo virtual. + Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. + Establece el recuento de la colección de elementos cuando ListView está en modo virtual. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf index 3b1771b16d8..aeeb58b943c 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf @@ -6855,8 +6855,8 @@ Cette opération non conforme s'est produite sur la trace de la pile : - Sets the count of the item collection when the ListView is in virtual mode. - Définit le nombre de la collection d'éléments lorsque le ListView est en mode virtuel. + Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. + Définit le nombre de la collection d'éléments lorsque le ListView est en mode virtuel. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf index ef0690ba0aa..0b86f273b26 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf @@ -6855,8 +6855,8 @@ Traccia dello stack da cui si è verificata l'operazione non valida: - Sets the count of the item collection when the ListView is in virtual mode. - Imposta il numero di elementi nella raccolta quando il controllo ListView è in modalità virtuale. + Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. + Imposta il numero di elementi nella raccolta quando il controllo ListView è in modalità virtuale. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf index d2d1d7cf835..ca1a70768d0 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf @@ -6855,8 +6855,8 @@ Stack trace where the illegal operation occurred was: - Sets the count of the item collection when the ListView is in virtual mode. - ListView が仮想モードであるときに、項目コレクションの数を設定します。 + Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. + ListView が仮想モードであるときに、項目コレクションの数を設定します。 diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf index 57fddd139db..378a8b1073f 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf @@ -6855,8 +6855,8 @@ Stack trace where the illegal operation occurred was: - Sets the count of the item collection when the ListView is in virtual mode. - ListView가 가상 모드에 있는 경우 항목 컬렉션의 개수를 설정합니다. + Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. + ListView가 가상 모드에 있는 경우 항목 컬렉션의 개수를 설정합니다. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf index aefe67576f7..9ff9fc7c5ef 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf @@ -6855,8 +6855,8 @@ Stos śledzenia, w którym wystąpiła zabroniona operacja: - Sets the count of the item collection when the ListView is in virtual mode. - Ustawia liczbę kolekcji elementów, gdy formant ListView jest w trybie wirtualnym. + Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. + Ustawia liczbę kolekcji elementów, gdy formant ListView jest w trybie wirtualnym. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf index 35ed4d3d1cf..2fe6afe0003 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf @@ -6855,8 +6855,8 @@ Rastreamento de pilha em que a operação ilegal ocorreu: - Sets the count of the item collection when the ListView is in virtual mode. - Define a contagem de coleção de itens quando ListView está no modo virtual. + Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. + Define a contagem de coleção de itens quando ListView está no modo virtual. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf index 89bf91f5453..93c17d57579 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf @@ -6856,8 +6856,8 @@ Stack trace where the illegal operation occurred was: - Sets the count of the item collection when the ListView is in virtual mode. - Устанавливает счетчик коллекции элементов, когда ListView находится в виртуальном режиме. + Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. + Устанавливает счетчик коллекции элементов, когда ListView находится в виртуальном режиме. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf index 1ccb6b8cc93..8cf583187e5 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf @@ -6855,8 +6855,8 @@ Geçersiz işlemin gerçekleştiği yığın izi: - Sets the count of the item collection when the ListView is in virtual mode. - ListView sanal moddayken öğe koleksiyonu sayısını ayarlar. + Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. + ListView sanal moddayken öğe koleksiyonu sayısını ayarlar. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf index 759ada01525..b29c1028198 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf @@ -6855,8 +6855,8 @@ Stack trace where the illegal operation occurred was: - Sets the count of the item collection when the ListView is in virtual mode. - 当 ListView 处于虚拟模式时，设置项集合的计数。 + Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. + 当 ListView 处于虚拟模式时，设置项集合的计数。 diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf index 2ada131f238..e5344649fc9 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf @@ -6855,8 +6855,8 @@ Stack trace where the illegal operation occurred was: - Sets the count of the item collection when the ListView is in virtual mode. - 設定 ListView 處於虛擬模式時項目集合的計數。 + Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. + 設定 ListView 處於虛擬模式時項目集合的計數。 diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.ListViewItemCollection.IInnerList.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.ListViewItemCollection.IInnerList.cs index a41c43a54ae..1b99554316d 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.ListViewItemCollection.IInnerList.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.ListViewItemCollection.IInnerList.cs @@ -26,6 +26,20 @@ internal interface IInnerList ListViewItem Insert(int index, ListViewItem item); void Remove(ListViewItem item); void RemoveAt(int index); + ListViewItem? GetItemByIndex(int index) + { + ArgumentOutOfRangeException.ThrowIfNegative(index); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual(index, Count); + + try + { + return this[index]; + } + catch (InvalidOperationException) + { + return null; + } + } } } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.ListViewItemCollection.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.ListViewItemCollection.cs index 1a4e21fbdca..dc4328e25cb 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.ListViewItemCollection.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.ListViewItemCollection.cs @@ -73,6 +73,14 @@ public virtual ListViewItem this[int index] } } + internal ListViewItem? GetItemByIndex(int index) + { + ArgumentOutOfRangeException.ThrowIfNegative(index); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual(index, InnerList.Count); + + return InnerList.GetItemByIndex(index); + } + object? IList.this[int index] { get diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.ListViewNativeItemCollection.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.ListViewNativeItemCollection.cs index 6addbc83686..0d3e08a17b2 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.ListViewNativeItemCollection.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.ListViewNativeItemCollection.cs @@ -34,35 +34,7 @@ public int Count public ListViewItem this[int displayIndex] { - get - { - _owner.ApplyUpdateCachedItems(); - - if (_owner.VirtualMode) - { - // if we are showing virtual items, we need to get the item from the user - RetrieveVirtualItemEventArgs rVI = new(displayIndex); - _owner.OnRetrieveVirtualItem(rVI); - rVI.Item!.SetItemIndex(_owner, displayIndex); - return rVI.Item; - } - else - { - ArgumentOutOfRangeException.ThrowIfNegative(displayIndex); - ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual(displayIndex, _owner._itemCount); - - if (_owner.IsHandleCreated && !_owner.ListViewHandleDestroyed) - { - _owner._listItemsTable.TryGetValue(DisplayIndexToID(displayIndex), out ListViewItem? item); - return item!; - } - else - { - Debug.Assert(_owner._listViewItems is not null, "listItemsArray is null, but the handle isn't created"); - return _owner._listViewItems[displayIndex]; - } - } - } + get => GetItemByIndexInternal(displayIndex, throwInVirtualMode: true)!; set { _owner.ApplyUpdateCachedItems(); @@ -84,6 +56,44 @@ public ListViewItem this[int displayIndex] } } + public ListViewItem? GetItemByIndex(int index) => + GetItemByIndexInternal(index, throwInVirtualMode: false); + + private ListViewItem? GetItemByIndexInternal(int index, [NotNullWhen(true)] bool throwInVirtualMode) + { + _owner.ApplyUpdateCachedItems(); + + if (_owner.VirtualMode) + { + // If we are showing virtual items, we need to get the item from the user. + RetrieveVirtualItemEventArgs rVI = new(index); + _owner.OnRetrieveVirtualItem(rVI); + if (rVI.Item is null) + { + return !throwInVirtualMode ? null : throw new InvalidOperationException(SR.ListViewVirtualItemRequired); + } + + rVI.Item.SetItemIndex(_owner, index); + return rVI.Item; + } + else + { + ArgumentOutOfRangeException.ThrowIfNegative(index); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual(index, _owner._itemCount); + + if (_owner.IsHandleCreated && !_owner.ListViewHandleDestroyed) + { + _owner._listItemsTable.TryGetValue(DisplayIndexToID(index), out ListViewItem? item); + return item!; + } + else + { + Debug.Assert(_owner._listViewItems is not null, "listItemsArray is null, but the handle isn't created"); + return _owner._listViewItems[index]; + } + } + } + public ListViewItem Add(ListViewItem value) { if (_owner.VirtualMode) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.cs index 444d60a1917..d260e1c2903 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.cs @@ -5117,7 +5117,7 @@ internal override void ReleaseUiaProvider(HWND handle) for (int i = 0; i < Items.Count; i++) { - Items[i].ReleaseUiaProvider(); + Items.GetItemByIndex(i)?.ReleaseUiaProvider(); } if (_defaultGroup is not null) diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewTests.cs index bf1a2951d33..5bfd1fc4718 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewTests.cs @@ -5203,6 +5203,66 @@ public void ListView_AnnounceColumnHeader_WorksCorrectly(int x, int y, string ex Assert.True(listView.IsHandleCreated); } + public static TheoryData GetListViewItemTheoryData() => new() + { + { new("Item 1") }, + { null } + }; + + [WinFormsTheory] + [MemberData(nameof(GetListViewItemTheoryData))] + // Regression test for https://github.com/dotnet/winforms/issues/11663. + public void ListView_VirtualMode_ReleaseUiaProvider_Success(ListViewItem listItem) + { + using ListView listView = new() + { + VirtualMode = true, + VirtualListSize = 1 + }; + + listView.RetrieveVirtualItem += (s, e) => + { + e.Item = e.ItemIndex switch + { + 0 => listItem, + _ => throw new NotImplementedException() + }; + }; + + listView.AccessibilityObject.Should().NotBeNull(); + + Action action = () => listView.ReleaseUiaProvider(listView.InternalHandle); + action.Should().NotThrow(); + listView.IsAccessibilityObjectCreated.Should().BeFalse(); + listView.IsHandleCreated.Should().BeFalse(); + } + + [WinFormsFact] + public void ListView_VirtualMode_GetListViewItemAsExpected() + { + using ListView listView = new() + { + VirtualMode = true, + VirtualListSize = 2 + }; + + ListViewItem listItem1 = new("Item 1"); + ListViewItem listItem2 = null; + listView.RetrieveVirtualItem += (s, e) => + { + e.Item = e.ItemIndex switch + { + 0 => listItem1, + 1 => listItem2, + _ => throw new NotImplementedException() + }; + }; + listView.Items.GetItemByIndex(0).Should().Be(listView.Items[0]); + listView.Items.GetItemByIndex(1).Should().BeNull(); + Action action = () => listView.Items[1].ToString(); + action.Should().Throw(SR.ListViewVirtualItemRequired); + } + private class SubListViewAccessibleObject : ListView.ListViewAccessibleObject { internal string AnnouncedColumn { get; private set; } From 3b51f55af97fc77e19f20dd4bf00d94e0c393e52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 12:42:11 +0000 Subject: [PATCH 03/16] [main] Update dependencies from dotnet/arcade (#11808) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- eng/common/native/init-compiler.sh | 4 ++-- global.json | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ef059c990e..e6d1a40881a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -187,29 +187,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p - + https://github.com/dotnet/arcade - 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 + a3dae8d4fd5a17c147cbecfd31e61463731ac0cc - + https://github.com/dotnet/arcade - 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 + a3dae8d4fd5a17c147cbecfd31e61463731ac0cc - + https://github.com/dotnet/arcade - 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 + a3dae8d4fd5a17c147cbecfd31e61463731ac0cc - + https://github.com/dotnet/arcade - 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 + a3dae8d4fd5a17c147cbecfd31e61463731ac0cc - + https://github.com/dotnet/arcade - 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 + a3dae8d4fd5a17c147cbecfd31e61463731ac0cc - + https://github.com/dotnet/arcade - 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 + a3dae8d4fd5a17c147cbecfd31e61463731ac0cc diff --git a/eng/Versions.props b/eng/Versions.props index 22888382505..fef4815c8ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 9.0.0-beta.24379.1 - 9.0.0-beta.24379.1 - 9.0.0-beta.24379.1 + 9.0.0-beta.24401.1 + 9.0.0-beta.24401.1 + 9.0.0-beta.24401.1 17.4.0-preview-20220707-01 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 14175343cc6..9a0e1f2b456 100755 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -21,7 +21,7 @@ case "$compiler" in majorVersion="${version%%.*}" # LLVM based on v18 released in early 2024, with two releases per year - maxVersion="$((18 + ((($(date +%Y) - 2024) * 12 + $(date +%m) - 3) / 6)))" + maxVersion="$((18 + ((($(date +%Y) - 2024) * 12 + $(date +%-m) - 3) / 6)))" compiler=clang ;; @@ -31,7 +31,7 @@ case "$compiler" in majorVersion="${version%%.*}" # GCC based on v14 released in early 2024, with one release per year - maxVersion="$((14 + ((($(date +%Y) - 2024) * 12 + $(date +%m) - 3) / 12)))" + maxVersion="$((14 + ((($(date +%Y) - 2024) * 12 + $(date +%-m) - 3) / 12)))" compiler=gcc ;; esac diff --git a/global.json b/global.json index 8ecc09e2a5c..e3c20f1363c 100644 --- a/global.json +++ b/global.json @@ -14,9 +14,9 @@ "version": "9.0.100-preview.5.24307.3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24379.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24379.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24379.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24401.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24401.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24401.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24381.5" }, From d4bdea7843100d088401c274301c7bfe6803be99 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 12:42:27 +0000 Subject: [PATCH 04/16] [main] Update dependencies from dotnet/runtime (#11809) [main] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 176 ++++++++++++++++++++-------------------- eng/Versions.props | 56 ++++++------- global.json | 2 +- 3 files changed, 117 insertions(+), 117 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6d1a40881a..6757bbb6b03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,182 +7,182 @@ Note: if the Uri is a new place, you will need to add a subscription from that p --> - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 - + https://github.com/dotnet/runtime - 7f2b222f92d323b7ca522a06c7116f1ec25d12ca + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 diff --git a/eng/Versions.props b/eng/Versions.props index fef4815c8ee..6042901f0d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,37 +13,37 @@ - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 9.0.0-preview.7.24373.8 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 5.0.0-preview.7.20320.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 6.0.0 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 diff --git a/global.json b/global.json index e3c20f1363c..e0217f16575 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24401.1", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24401.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24381.5" + "Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24401.5" }, "native-tools": { "cmake": "latest" From bc5246772415fca6856516735916dc9b25cf2419 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 3 Aug 2024 12:41:02 +0000 Subject: [PATCH 05/16] [main] Update dependencies from dotnet/runtime (#11812) [main] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 176 ++++++++++++++++++++-------------------- eng/Versions.props | 56 ++++++------- global.json | 2 +- 3 files changed, 117 insertions(+), 117 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6757bbb6b03..1df9d0ae983 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,182 +7,182 @@ Note: if the Uri is a new place, you will need to add a subscription from that p --> - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + a4fe68fcb3233b8b229444557d38c7565938de05 diff --git a/eng/Versions.props b/eng/Versions.props index 6042901f0d8..52427cfacb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,37 +13,37 @@ - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 9.0.0-preview.7.24373.8 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 5.0.0-preview.7.20320.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 6.0.0 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24402.7 diff --git a/global.json b/global.json index e0217f16575..599a5b4e7e9 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24401.1", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24401.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24401.5" + "Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24402.7" }, "native-tools": { "cmake": "latest" From ff2acdf41abfdc9d6557c545cb61906158fe9976 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Sat, 3 Aug 2024 13:33:23 -0700 Subject: [PATCH 06/16] Fix dependency flow for Nrbf package (#11810) Co-authored-by: Jeremy Kuhne --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1df9d0ae983..41ff3a87432 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -120,6 +120,10 @@ Note: if the Uri is a new place, you will need to add a subscription from that p https://github.com/dotnet/runtime a4fe68fcb3233b8b229444557d38c7565938de05 + + https://github.com/dotnet/runtime + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + https://github.com/dotnet/runtime a4fe68fcb3233b8b229444557d38c7565938de05 diff --git a/eng/Versions.props b/eng/Versions.props index 52427cfacb4..4f926455257 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,7 +16,7 @@ 9.0.0-rc.1.24402.7 9.0.0-rc.1.24402.7 9.0.0-rc.1.24402.7 - 9.0.0-preview.7.24373.8 + 9.0.0-rc.1.24402.7 9.0.0-rc.1.24402.7 9.0.0-rc.1.24402.7 9.0.0-rc.1.24402.7 From a215418f3b9c484d9438a568cd2e38d93a6064d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 4 Aug 2024 12:41:04 +0000 Subject: [PATCH 07/16] [main] Update dependencies from dotnet/runtime (#11813) [main] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 180 ++++++++++++++++++++-------------------- eng/Versions.props | 58 ++++++------- global.json | 2 +- 3 files changed, 120 insertions(+), 120 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41ff3a87432..ebcdb150f9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,186 +7,186 @@ Note: if the Uri is a new place, you will need to add a subscription from that p --> - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/runtime - a4fe68fcb3233b8b229444557d38c7565938de05 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 diff --git a/eng/Versions.props b/eng/Versions.props index 4f926455257..80bc842ca4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,37 +13,37 @@ - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 5.0.0-preview.7.20320.5 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 6.0.0 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 - 9.0.0-rc.1.24402.7 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 diff --git a/global.json b/global.json index 599a5b4e7e9..4269dcdf7cf 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24401.1", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24401.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24402.7" + "Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24403.1" }, "native-tools": { "cmake": "latest" From 2798a8145c9b625ca60e6105dc171e2cd6f772c7 Mon Sep 17 00:00:00 2001 From: kirsan31 <17767561+kirsan31@users.noreply.github.com> Date: Mon, 5 Aug 2024 19:07:33 +0300 Subject: [PATCH 08/16] Default font scaling corrections and optimizations. Fix #11037. (#11206) * Small default font scaling corrections and optimizations. Fix #11037. * Outdated SetDefaultFont test removed. New tests added. * Suggestions implemented. * Fluent assertions. --- .../Windows/Forms/Internals/ScaleHelper.cs | 21 +---- .../src/System/Windows/Forms/Application.cs | 54 ++++++++--- .../src/System/Windows/Forms/Control.cs | 29 +++++- .../System/Windows/Forms/ApplicationTests.cs | 90 ++++++++++++++++--- 4 files changed, 149 insertions(+), 45 deletions(-) diff --git a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Internals/ScaleHelper.cs b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Internals/ScaleHelper.cs index 45f774531af..59e9e3f66c8 100644 --- a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Internals/ScaleHelper.cs +++ b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Internals/ScaleHelper.cs @@ -215,33 +215,16 @@ internal static Bitmap ScaleToDpi(Bitmap logicalBitmap, int dpi, bool disposeBit internal static bool IsScalingRequired => InitialSystemDpi != OneHundredPercentLogicalDpi; /// - /// Creates a scaled version of the given to the Windows Accessibility Text Size setting (also + /// Creates a scaled version of the given non system to the Windows Accessibility Text Size setting (also /// known as Text Scaling) if needed, otherwise returns . /// internal static Font? ScaleToSystemTextSize(Font? font) { - if (!OsVersion.IsWindows10_1507OrGreater() || font is null || font.IsSystemFont) + if (font is null || font.IsSystemFont || !OsVersion.IsWindows10_1507OrGreater()) { return null; } - if (font.IsSystemFont) - { - // Recreating the SystemFont will have it scaled to the right size for the current setting. This could be - // done more efficiently by querying the OS to see if this is necessary for the specific font. - // - // This should never return null. - Font newSystemFont = SystemFonts.GetFontByName(font.SystemFontName)!; - if (newSystemFont.Size == font.Size) - { - // No point in keeping an identical one, free the resource. - newSystemFont.Dispose(); - return null; - } - - return newSystemFont; - } - // The default(100) and max(225) text scale factor is value what Settings display text scale // applies and also clamps the text scale factor value between 100 and 225 value. // See https://docs.microsoft.com/windows/uwp/design/input/text-scaling. diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Application.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Application.cs index bbcb3a3f87a..7db4f080db3 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Application.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Application.cs @@ -25,6 +25,9 @@ public sealed partial class Application /// private static EventHandlerList? s_eventHandlers; private static Font? s_defaultFont; + /// + /// Scaled version of non system . + /// private static Font? s_defaultFontScaled; private static string? s_startupPath; private static string? s_executablePath; @@ -1204,23 +1207,52 @@ public static void SetDefaultFont(Font font) if (NativeWindow.AnyHandleCreated) throw new InvalidOperationException(string.Format(SR.Win32WindowAlreadyCreated, nameof(SetDefaultFont))); - // If user made a prior call to this API with a different custom fonts, we want to clean it up. - if (s_defaultFont is not null && !ReferenceEquals(s_defaultFont, font)) - { - s_defaultFont.Dispose(); - } - s_defaultFont = font; ScaleDefaultFont(); } + /// + /// Scale or if needed. + /// internal static void ScaleDefaultFont() { - // It is possible the existing scaled font will be identical after scaling the default font again. Figuring - // that out requires additional complexity that doesn't appear to be strictly necessary. - s_defaultFontScaled?.Dispose(); - s_defaultFontScaled = null; - s_defaultFontScaled = ScaleHelper.ScaleToSystemTextSize(s_defaultFont); + if (s_defaultFont is null) + { + return; + } + + if (s_defaultFont.IsSystemFont) + { + s_defaultFontScaled?.Dispose(); + s_defaultFontScaled = null; + // Recreating the SystemFont will have it scaled to the right size for the current setting. This could be + // done more efficiently by querying the OS to see if this is necessary for the specific font. + // + // This should never return null. + Font newSystemFont = SystemFonts.GetFontByName(s_defaultFont.SystemFontName)!; + if (s_defaultFont.Equals(newSystemFont)) + { + // No point in keeping an identical one, free the resource. + newSystemFont.Dispose(); + } + else + { + s_defaultFont = newSystemFont; + } + } + else // non system Font + { + Font? font = ScaleHelper.ScaleToSystemTextSize(s_defaultFont); + if (font is null || !font.Equals(s_defaultFontScaled)) // change s_defaultFontScaled only if needed + { + s_defaultFontScaled?.Dispose(); + s_defaultFontScaled = font; + } + else + { + font.Dispose(); + } + } } /// diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs index d6354e76d7c..25c7eea141c 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs @@ -12785,11 +12785,34 @@ protected virtual void WndProc(ref Message m) // SPI_SETICONTITLELOGFONT. Waiting for SPI_SETICONTITLELOGFONT has some sort of timing issue // where layout doesn't always update correctly. // - // Historically we reset the font on WM_SYSCOLORCHANGE, which does come through before any + // Historically we reset the font (s_defaultFont) on WM_SYSCOLORCHANGE, which does come through before any // of the WM_SETTINGCHANGE messages. SPI_SETNONCLIENTMETRICS seems more correct. + // + // We don't want reset font if scaling not actually changed: https://github.com/dotnet/winforms/issues/11037 + // Most (if not all) of these problems was solved with moving this code to SPI_SETNONCLIENTMETRICS! + // s_defaultFont = Application.DefaultFont ?? SystemFonts.MessageBoxFont; + // So we need to check both variants - manually set font (Application.DefaultFont is not null) and auto system font - s_defaultFont = null; - Application.ScaleDefaultFont(); + if (Application.DefaultFont is null) // auto system font + { + if (s_defaultFont is not null) // we need to check only if s_defaultFont already set + { + Font font = SystemFonts.MessageBoxFont!; + if (!s_defaultFont.Equals(font)) // the font has changed + { + s_defaultFont = font; + } + else + { + font.Dispose(); + } + } + } + else // manually set font + { + Application.ScaleDefaultFont(); // will update Application.s_defaultFont or Application.s_defaultFontScaled only if needed + s_defaultFont = Application.DefaultFont; // Application.s_defaultFontScaled ?? Application.s_defaultFont + } } } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ApplicationTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ApplicationTests.cs index 2dc706bf385..5d39868002e 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ApplicationTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ApplicationTests.cs @@ -6,6 +6,7 @@ using System.Globalization; using System.Windows.Forms.VisualStyles; using Microsoft.DotNet.RemoteExecutor; +using Microsoft.Win32; namespace System.Windows.Forms.Tests; @@ -219,36 +220,101 @@ public void Application_SetDefaultFont_AfterHandleCreated_InvalidOperationExcept } [WinFormsFact] - public void Application_SetDefaultFont_MustNotCloneSystemFont() + public void Application_SetDefaultFont_SystemFont() { var applicationTestAccessor = typeof(Application).TestAccessor().Dynamic; - Assert.Null(applicationTestAccessor.s_defaultFont); - Assert.Null(applicationTestAccessor.s_defaultFontScaled); - - Font systemCaptionFont = SystemFonts.CaptionFont; - Assert.True(systemCaptionFont.IsSystemFont); + Font font = applicationTestAccessor.s_defaultFont; + font.Should().BeNull(); + font = applicationTestAccessor.s_defaultFontScaled; + font.Should().BeNull(); // This a unholy, but generally at this stage NativeWindow.AnyHandleCreated=true, // And we won't be able to set the font, unless we flip the bit var nativeWindowTestAccessor = typeof(NativeWindow).TestAccessor().Dynamic; bool currentAnyHandleCreated = nativeWindowTestAccessor.t_anyHandleCreated; + try + { + nativeWindowTestAccessor.t_anyHandleCreated = false; + using Font sysFont = SystemFonts.CaptionFont; + sysFont.IsSystemFont.Should().BeTrue(); + Application.SetDefaultFont(sysFont); + font = applicationTestAccessor.s_defaultFontScaled; + font.Should().BeNull(); + // Because we set default font to system font, then in this test it must not be changed, + // unless, of course, after calling SystemFonts.CaptionFont and this check + // HKCU\Software\Microsoft\Accessibility\TextScaleFactor is not changed + Application.DefaultFont.Should().BeSameAs(sysFont); + + // create fake system font + using Font fakeSysFont = sysFont.WithSize(sysFont.Size * 1.25f); + // set IsSystemFont flag + fakeSysFont.TestAccessor().Dynamic.SetSystemFontName(sysFont.SystemFontName); + fakeSysFont.IsSystemFont.Should().BeTrue(); + Application.SetDefaultFont(fakeSysFont); + font = applicationTestAccessor.s_defaultFontScaled; + font.Should().BeNull(); + Application.DefaultFont.Should().NotBe(fakeSysFont, "Because we got a new real system font."); + Application.DefaultFont.Should().NotBeSameAs(sysFont, "Because we got a new system font."); + Application.DefaultFont.Should().Be(sysFont, "Because the new system font is the same as our original system font."); + } + finally + { + // Flip the bit back + nativeWindowTestAccessor.t_anyHandleCreated = currentAnyHandleCreated; + applicationTestAccessor.s_defaultFont?.Dispose(); + applicationTestAccessor.s_defaultFont = null; + } + } + [WinFormsFact] + public void Application_SetDefaultFont_NonSystemFont() + { + var applicationTestAccessor = typeof(Application).TestAccessor().Dynamic; + Font font = applicationTestAccessor.s_defaultFont; + font.Should().BeNull(); + font = applicationTestAccessor.s_defaultFontScaled; + font.Should().BeNull(); + + using Font customFont = new(new FontFamily("Arial"), 12f); + customFont.IsSystemFont.Should().BeFalse(); + + // This a unholy, but generally at this stage NativeWindow.AnyHandleCreated=true, + // And we won't be able to set the font, unless we flip the bit + var nativeWindowTestAccessor = typeof(NativeWindow).TestAccessor().Dynamic; + bool currentAnyHandleCreated = nativeWindowTestAccessor.t_anyHandleCreated; try { nativeWindowTestAccessor.t_anyHandleCreated = false; - Application.SetDefaultFont(systemCaptionFont); + Application.SetDefaultFont(customFont); + font = applicationTestAccessor.s_defaultFontScaled; + if (!OsVersion.IsWindows10_1507OrGreater()) + { + font.Should().BeNull(); + Application.DefaultFont.Should().BeSameAs(customFont); + return; + } - // We now handle the system font case within the ScaleHelper so we have no need to clone it. - Assert.True(applicationTestAccessor.s_defaultFont.IsSystemFont); + // Retrieve the text scale factor, which is set via Settings > Display > Make Text Bigger. + using RegistryKey key = Registry.CurrentUser.OpenSubKey("Software\\Microsoft\\Accessibility"); + int textScale = (int)(key?.GetValue("TextScaleFactor", 100) ?? 100); + if (textScale == 100) // Application.DefaultFont must be the same + { + font.Should().BeNull("Because TextScaleFactor == 100."); + Application.DefaultFont.Should().BeSameAs(customFont, "Because TextScaleFactor == 100."); + } + else // Application.DefaultFont must be a new scaled font + { + font.Should().NotBeNull("Because TextScaleFactor != 100."); + Application.DefaultFont.Should().NotBe(customFont, "Because textScaleFactor != 100 and we got a new scaled font."); + } } finally { // Flip the bit back nativeWindowTestAccessor.t_anyHandleCreated = currentAnyHandleCreated; - - applicationTestAccessor.s_defaultFont.Dispose(); - applicationTestAccessor.s_defaultFontScaled?.Dispose(); + applicationTestAccessor.s_defaultFont?.Dispose(); applicationTestAccessor.s_defaultFont = null; + applicationTestAccessor.s_defaultFontScaled?.Dispose(); applicationTestAccessor.s_defaultFontScaled = null; } } From b84a0724e7e7bb7eed720ebcc056f1f86d6d0c79 Mon Sep 17 00:00:00 2001 From: Ricardo Bossan Date: Mon, 5 Aug 2024 13:20:52 -0300 Subject: [PATCH 09/16] Suppress CodeQL for BinaryFormatter deserialization in several files (#11805) Suppress CodeQL for BinaryFormatter deserialization for several files Co-authored-by: Ricardo Bossan (BEYONDSOFT CONSULTING INC) (from Dev Box) --- ...ComponentSerializationService.CodeDomSerializationStore.cs | 2 +- .../src/System/Windows/Forms/Design/CommandSet.cs | 2 +- .../Forms/Design/OleDragDropHandler.ComponentDataObject.cs | 4 ++-- src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs | 3 ++- .../src/System/Resources/ResXSerializationBinder.cs | 3 ++- .../System/Windows/Forms/ActiveX/AxHost.PropertyBagStream.cs | 2 +- .../src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs | 2 +- .../OLE/DataObject.Composition.NativeToWinFormsAdapter.cs | 3 ++- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationService.CodeDomSerializationStore.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationService.CodeDomSerializationStore.cs index 9625a6b8583..908ed298b22 100644 --- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationService.CodeDomSerializationStore.cs +++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationService.CodeDomSerializationStore.cs @@ -225,7 +225,7 @@ private void Deserialize(IServiceProvider? provider, IContainer? container, bool { _resourceStream.Seek(0, SeekOrigin.Begin); #pragma warning disable SYSLIB0011 // Type or member is obsolete - Hashtable? resources = new BinaryFormatter().Deserialize(_resourceStream) as Hashtable; + Hashtable? resources = new BinaryFormatter().Deserialize(_resourceStream) as Hashtable; // CodeQL[SM03722, SM04191] : The operation is essential for the design experience when users are running their own designers they have created. This cannot be achieved without BinaryFormatter #pragma warning restore SYSLIB0011 // Type or member is obsolete _resources = new LocalResourceManager(resources); } diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/CommandSet.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/CommandSet.cs index 2462bced8dc..1f6ac15a8bc 100644 --- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/CommandSet.cs +++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/CommandSet.cs @@ -1865,7 +1865,7 @@ protected void OnMenuPaste(object? sender, EventArgs e) { s.Seek(0, SeekOrigin.Begin); #pragma warning disable SYSLIB0011 // Type or member is obsolete - object serializationData = new BinaryFormatter().Deserialize(s); + object serializationData = new BinaryFormatter().Deserialize(s); // CodeQL[SM03722, SM04191] : The operation is essential for the design experience when users are running their own designers they have created. This cannot be achieved without BinaryFormatter #pragma warning restore SYSLIB0011 // Type or member is obsolete using (ScaleHelper.EnterDpiAwarenessScope(DPI_AWARENESS_CONTEXT.DPI_AWARENESS_CONTEXT_SYSTEM_AWARE)) { diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/OleDragDropHandler.ComponentDataObject.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/OleDragDropHandler.ComponentDataObject.cs index be90f6ad3f4..23c851548f5 100644 --- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/OleDragDropHandler.ComponentDataObject.cs +++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/OleDragDropHandler.ComponentDataObject.cs @@ -139,7 +139,7 @@ private static void GetAssociatedComponents(IComponent component, IDesignerHost { SerializationStream!.Seek(0, SeekOrigin.Begin); #pragma warning disable SYSLIB0011 // Type or member is obsolete - return new BinaryFormatter().Deserialize(SerializationStream); + return new BinaryFormatter().Deserialize(SerializationStream); // CodeQL[SM03722, SM04191] : The operation is essential for the design experience when users are running their own designers they have created. This cannot be achieved without BinaryFormatter #pragma warning restore SYSLIB0011 // Type or member is obsolete } else if (format.Equals(NestedToolboxItemFormat)) @@ -211,7 +211,7 @@ public void Deserialize(IServiceProvider? serviceProvider, bool removeCurrentCom try { #pragma warning disable SYSLIB0011 // Type or member is obsolete - _serializationData ??= new BinaryFormatter().Deserialize(SerializationStream!); + _serializationData ??= new BinaryFormatter().Deserialize(SerializationStream!); // CodeQL[SM03722, SM04191] : The operation is essential for the design experience when users are running their own designers they have created. This cannot be achieved without BinaryFormatter #pragma warning restore SYSLIB0011 // Type or member is obsolete if (removeCurrentComponents && _components is not null) diff --git a/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs b/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs index 127a7d9ba9e..90b04726d70 100644 --- a/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs +++ b/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs @@ -447,7 +447,8 @@ Type ResolveTypeName(string typeName) Binder = new ResXSerializationBinder(typeResolver) }; - object? result = _binaryFormatter.Deserialize(stream); + // cs/dangerous-binary-deserialization + object? result = _binaryFormatter.Deserialize(stream); // CodeQL[SM03722] : BinaryFormatter is intended to be used as a fallback for unsupported types. Users must explicitly opt into this behavior if (result is ResXNullRef) { result = null; diff --git a/src/System.Windows.Forms/src/System/Resources/ResXSerializationBinder.cs b/src/System.Windows.Forms/src/System/Resources/ResXSerializationBinder.cs index c82af06f7b0..471a5ec5c63 100644 --- a/src/System.Windows.Forms/src/System/Resources/ResXSerializationBinder.cs +++ b/src/System.Windows.Forms/src/System/Resources/ResXSerializationBinder.cs @@ -66,7 +66,8 @@ internal class ResXSerializationBinder : SerializationBinder type ??= _typeResolver.GetType(parsed.FullName); // Hand back what we found or null to let the default loader take over. - return type; + // cs/deserialization/nullbindtotype + return type; // CodeQL[SM04225] : This binder isn't intended as a security facility; it's allowable for us to return null. } public override void BindToName(Type serializedType, out string? assemblyName, out string? typeName) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/AxHost.PropertyBagStream.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/AxHost.PropertyBagStream.cs index 8f0e9360fd4..e4223188daa 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/AxHost.PropertyBagStream.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/AxHost.PropertyBagStream.cs @@ -43,7 +43,7 @@ internal PropertyBagStream(Stream stream) { stream.Position = position; #pragma warning disable SYSLIB0011 // Type or member is obsolete - _bag = (Hashtable)new BinaryFormatter().Deserialize(stream); + _bag = (Hashtable)new BinaryFormatter().Deserialize(stream); // CodeQL[SM03722, SM04191] : BinaryFormatter is intended to be used as a fallback for unsupported types. Users must explicitly opt into this behavior" } catch (Exception inner) when (!inner.IsCriticalException()) { diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs index bbb34638ee9..110eda25ec3 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/Control.ActiveXImpl.cs @@ -1157,7 +1157,7 @@ bool SetValue(PropertyDescriptor currentProperty, object data) } stream.Position = 0; - deserialized = new BinaryFormatter().Deserialize(stream); + deserialized = new BinaryFormatter().Deserialize(stream); // CodeQL[SM03722, SM04191] : BinaryFormatter is intended to be used as a fallback for unsupported types. Users must explicitly opt into this behavior } #pragma warning restore diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/OLE/DataObject.Composition.NativeToWinFormsAdapter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/OLE/DataObject.Composition.NativeToWinFormsAdapter.cs index bda6d4149e9..3b430ccda64 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/OLE/DataObject.Composition.NativeToWinFormsAdapter.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/OLE/DataObject.Composition.NativeToWinFormsAdapter.cs @@ -204,11 +204,12 @@ static object ReadObjectFromHandleDeserializer(Stream stream, bool restrictDeser #pragma warning disable SYSLIB0011 // Type or member is obsolete #pragma warning disable SYSLIB0050 // Type or member is obsolete + // cs/dangerous-binary-deserialization return new BinaryFormatter() { Binder = restrictDeserialization ? new BitmapBinder() : null, AssemblyFormat = FormatterAssemblyStyle.Simple - }.Deserialize(stream); + }.Deserialize(stream); // CodeQL[SM03722] : BinaryFormatter is intended to be used as a fallback for unsupported types. Users must explicitly opt into this behavior #pragma warning restore SYSLIB0050 #pragma warning restore SYSLIB0011 } From aef1eaca434a40b51743c2b1ac41ed3a2ea3387c Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Mon, 5 Aug 2024 10:41:42 -0700 Subject: [PATCH 10/16] Localized file check-in by OneLocBuild Task: Build definition ID 164: Build ID 2507042 (#11801) --- src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf | 2 +- src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf | 2 +- src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf | 2 +- src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf | 2 +- src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf | 2 +- src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf | 2 +- src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf | 2 +- src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf | 2 +- src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf | 2 +- src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf | 2 +- src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf | 2 +- src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf | 2 +- src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf index 5e4255d7774..bfa7ac7208c 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.cs.xlf @@ -6856,7 +6856,7 @@ Trasování zásobníku, kde došlo k neplatné operaci: Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. - Nastaví počet pro kolekci položek v případě, že je vlastnost ListView ve virtuálním režimu. + Nastaví počet pro kolekci položek v případě, že je vlastnost ListView ve virtuálním režimu. Pokud je vlastnost VirtualMode nastavena na hodnotu true a vlastnost VirtualListSize je větší než 0, je nutné zpracovat událost RetrieveVirtualItem tak, že poskytnete platné položky. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf index 8aae9969a91..04575ad5174 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.de.xlf @@ -6856,7 +6856,7 @@ Stapelüberwachung, in der der unzulässige Vorgang auftrat: Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. - Legt die Anzahl der Elemente für die Elementesammlung fest, wenn sich die ListView im virtuellen Modus befindet. + Legt die Anzahl der Elemente für die Elementesammlung fest, wenn sich die ListView im virtuellen Modus befindet. Wenn VirtualMode auf TRUE festgelegt ist und die VirtualListSize-Eigenschaft größer als 0 ist, müssen Sie das RetrieveVirtualItem-Ereignis behandeln, das gültige Elemente bereitstellt. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf index b59f7acbed5..22a22d4a708 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.es.xlf @@ -6856,7 +6856,7 @@ El seguimiento de la pila donde tuvo lugar la operación no válida fue: Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. - Establece el recuento de la colección de elementos cuando ListView está en modo virtual. + Establece el recuento de la colección de elementos cuando ListView está en modo virtual. Si VirtualMode se establece en true y la propiedad VirtualListSize es mayor que 0, debe controlar el evento RetrieveVirtualItem que proporciona elementos válidos. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf index aeeb58b943c..cc479cf72c2 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.fr.xlf @@ -6856,7 +6856,7 @@ Cette opération non conforme s'est produite sur la trace de la pile : Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. - Définit le nombre de la collection d'éléments lorsque le ListView est en mode virtuel. + Définit le nombre de la collection d’éléments lorsque le ListView est en mode virtuel. Si VirtualMode a la valeur true et que la propriété VirtualListSize est supérieure à 0, vous devez gérer l’événement RetrieveVirtualItem en fournissant des éléments valides. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf index 0b86f273b26..d8ade0271fd 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.it.xlf @@ -6856,7 +6856,7 @@ Traccia dello stack da cui si è verificata l'operazione non valida: Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. - Imposta il numero di elementi nella raccolta quando il controllo ListView è in modalità virtuale. + Imposta il numero di elementi nella raccolta quando il controllo ListView è in modalità virtuale. Se VirtualMode è impostato su true e la proprietà VirtualListSize è maggiore di 0, è necessario gestire l'evento RetrieveVirtualItem che fornisce elementi validi. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf index ca1a70768d0..cfc4e7c11c0 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.ja.xlf @@ -6856,7 +6856,7 @@ Stack trace where the illegal operation occurred was: Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. - ListView が仮想モードであるときに、項目コレクションの数を設定します。 + ListView が仮想モードであるときに、項目コレクションの数を設定します。VirtualMode が true に設定されていて、VirtualListSize プロパティが 0 より大きい場合は、有効な項目を供給して RetrieveVirtualItem イベントを処理する必要があります。 diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf index 378a8b1073f..1cc6095d9e8 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.ko.xlf @@ -6856,7 +6856,7 @@ Stack trace where the illegal operation occurred was: Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. - ListView가 가상 모드에 있는 경우 항목 컬렉션의 개수를 설정합니다. + ListView가 가상 모드에 있는 경우 항목 컬렉션의 개수를 설정합니다. VirtualMode가 true로 설정되어 있고 VirtualListSize 속성이 0보다 큰 경우 유효한 항목을 제공하는 RetrieveVirtualItem 이벤트를 처리해야 합니다. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf index 9ff9fc7c5ef..72c5816c9e9 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.pl.xlf @@ -6856,7 +6856,7 @@ Stos śledzenia, w którym wystąpiła zabroniona operacja: Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. - Ustawia liczbę kolekcji elementów, gdy formant ListView jest w trybie wirtualnym. + Ustawia liczbę kolekcji elementów, gdy formant ListView jest w trybie wirtualnym. Jeśli VirtualMode ma wartość true, a właściwość VirtualListSize jest większa niż 0, należy obsłużyć zdarzenie RetrieveVirtualItem, podając prawidłowe elementy. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf index 2fe6afe0003..a39d846544c 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.pt-BR.xlf @@ -6856,7 +6856,7 @@ Rastreamento de pilha em que a operação ilegal ocorreu: Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. - Define a contagem de coleção de itens quando ListView está no modo virtual. + Define a contagem de coleção de itens quando ListView está no modo virtual. Se VirtualMode estiver definido como true e a propriedade VirtualListSize for maior que 0, você deverá manipular o evento RetrieveVirtualItem fornecendo itens válidos. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf index 93c17d57579..f6afcc784e1 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.ru.xlf @@ -6857,7 +6857,7 @@ Stack trace where the illegal operation occurred was: Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. - Устанавливает счетчик коллекции элементов, когда ListView находится в виртуальном режиме. + Устанавливает счетчик коллекции элементов, когда ListView находится в виртуальном режиме. Если для VirtualMode настроено значение true, а значение свойства VirtualListSize больше 0, необходимо обработать событие RetrieveVirtualItem, указав допустимые элементы. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf index 8cf583187e5..03b61e88211 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.tr.xlf @@ -6856,7 +6856,7 @@ Geçersiz işlemin gerçekleştiği yığın izi: Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. - ListView sanal moddayken öğe koleksiyonu sayısını ayarlar. + ListView sanal moddayken öğe koleksiyonu sayısını ayarlar. VirtualMode true olarak ayarlanmışsa ve VirtualListSize özelliği 0'dan büyükse, RetrieveVirtualItem olayını geçerli öğeler sağlayarak işlemeniz gerekir. diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf index b29c1028198..04031c8a418 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hans.xlf @@ -6856,7 +6856,7 @@ Stack trace where the illegal operation occurred was: Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. - 当 ListView 处于虚拟模式时，设置项集合的计数。 + 当 ListView 处于虚拟模式时，设置项集合的计数。如果 VirtualMode 设置为 true，且 VirtualListSize 属性大于 0，则必须处理提供有效项的 RetrieveVirtualItem 事件。 diff --git a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf index e5344649fc9..eef29ce9bb1 100644 --- a/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf +++ b/src/System.Windows.Forms/src/Resources/xlf/SR.zh-Hant.xlf @@ -6856,7 +6856,7 @@ Stack trace where the illegal operation occurred was: Sets the count of the item collection when the ListView is in virtual mode. If VirtualMode is set to true, and the VirtualListSize property is greater than 0, you must handle the RetrieveVirtualItem event providing valid items. - 設定 ListView 處於虛擬模式時項目集合的計數。 + 設定 ListView 處於虛擬模式時項目集合的計數。如果 VirtualMode 設定為 true，並且 VirtualListSize 屬性大於 0，則必須處理提供有效項目的 RetrieveVirtualItem 事件。 From ab9eb71f903d7771849887a15ab5ff3f37ba4c00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 12:36:20 +0000 Subject: [PATCH 11/16] [main] Update dependencies from dotnet/runtime (#11823) [main] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 180 ++++++++++++++++++++-------------------- eng/Versions.props | 58 ++++++------- global.json | 2 +- 3 files changed, 120 insertions(+), 120 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ebcdb150f9e..f466499270b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,186 +7,186 @@ Note: if the Uri is a new place, you will need to add a subscription from that p --> - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + af5a23cea6cf99842187d028946d2be2f62b7001 diff --git a/eng/Versions.props b/eng/Versions.props index 80bc842ca4e..249a7f3546c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,37 +13,37 @@ - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 5.0.0-preview.7.20320.5 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 6.0.0 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24405.9 diff --git a/global.json b/global.json index 4269dcdf7cf..21aa9bfeb4e 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24401.1", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24401.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24403.1" + "Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24405.9" }, "native-tools": { "cmake": "latest" From 4c0d8511e4453c87335605b395e522301fb69119 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 09:17:02 -0700 Subject: [PATCH 12/16] [main] Update dependencies from dotnet/runtime (#11834) Update dependencies from https://github.com/dotnet/runtime build 20240806.14 Microsoft.Internal.Runtime.WindowsDesktop.Transport , Microsoft.NET.Sdk.IL , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.ILAsm , Microsoft.NETCore.ILDAsm , Microsoft.NETCore.Platforms , Microsoft.Win32.Registry.AccessControl , Microsoft.Win32.SystemEvents , runtime.win-x64.Microsoft.NETCore.ILAsm , runtime.win-x86.Microsoft.NETCore.ILAsm , System.CodeDom , System.ComponentModel.Composition , System.ComponentModel.Composition.Registration , System.Configuration.ConfigurationManager , System.Data.Odbc , System.Data.OleDb , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices , System.DirectoryServices.AccountManagement , System.DirectoryServices.Protocols , System.Formats.Nrbf , System.IO.Hashing , System.IO.Packaging , System.IO.Ports , System.Management , System.Reflection.Context , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Runtime.Caching , System.Runtime.Serialization.Formatters , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceModel.Syndication , System.ServiceProcess.ServiceController , System.Speech , System.Text.Encoding.CodePages , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-rc.1.24405.9 -> To Version 9.0.0-rc.1.24406.14 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 180 ++++++++++++++++++++-------------------- eng/Versions.props | 58 ++++++------- global.json | 2 +- 3 files changed, 120 insertions(+), 120 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f466499270b..6891ac5aeaf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,186 +7,186 @@ Note: if the Uri is a new place, you will need to add a subscription from that p --> - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/runtime - af5a23cea6cf99842187d028946d2be2f62b7001 + 4985021ebfff545de02caa3386e3dd4b21784b95 diff --git a/eng/Versions.props b/eng/Versions.props index 249a7f3546c..708bff69bb8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,37 +13,37 @@ - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 5.0.0-preview.7.20320.5 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 6.0.0 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 - 9.0.0-rc.1.24405.9 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 diff --git a/global.json b/global.json index 21aa9bfeb4e..84831c27210 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24401.1", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24401.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24405.9" + "Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24406.14" }, "native-tools": { "cmake": "latest" From 4c8f625f78edb05882389f2bb9e8e1ce395f2495 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 09:17:26 -0700 Subject: [PATCH 13/16] [main] Update dependencies from dotnet/arcade (#11833) Update dependencies from https://github.com/dotnet/arcade build 20240805.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24401.1 -> To Version 9.0.0-beta.24405.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- global.json | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6891ac5aeaf..041089dcde5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p - + https://github.com/dotnet/arcade - a3dae8d4fd5a17c147cbecfd31e61463731ac0cc + 2c829550b968e29389ce8392244da2b006d71301 - + https://github.com/dotnet/arcade - a3dae8d4fd5a17c147cbecfd31e61463731ac0cc + 2c829550b968e29389ce8392244da2b006d71301 - + https://github.com/dotnet/arcade - a3dae8d4fd5a17c147cbecfd31e61463731ac0cc + 2c829550b968e29389ce8392244da2b006d71301 - + https://github.com/dotnet/arcade - a3dae8d4fd5a17c147cbecfd31e61463731ac0cc + 2c829550b968e29389ce8392244da2b006d71301 - + https://github.com/dotnet/arcade - a3dae8d4fd5a17c147cbecfd31e61463731ac0cc + 2c829550b968e29389ce8392244da2b006d71301 - + https://github.com/dotnet/arcade - a3dae8d4fd5a17c147cbecfd31e61463731ac0cc + 2c829550b968e29389ce8392244da2b006d71301 diff --git a/eng/Versions.props b/eng/Versions.props index 708bff69bb8..68dc8052350 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 9.0.0-beta.24401.1 - 9.0.0-beta.24401.1 - 9.0.0-beta.24401.1 + 9.0.0-beta.24405.1 + 9.0.0-beta.24405.1 + 9.0.0-beta.24405.1 17.4.0-preview-20220707-01 diff --git a/global.json b/global.json index 84831c27210..a0656146c3d 100644 --- a/global.json +++ b/global.json @@ -14,9 +14,9 @@ "version": "9.0.100-preview.5.24307.3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24401.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24401.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24401.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24405.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24405.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24405.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24406.14" }, From 7006c1c2c5515bc4b648e5b3c2ea6a604867e0b9 Mon Sep 17 00:00:00 2001 From: Jeremy Kuhne Date: Wed, 7 Aug 2024 18:07:17 -0700 Subject: [PATCH 14/16] Ensure source paths leave 40 characters for root (#11835) The default path for VS is in the user directory, which ends up being something like `C:\Users\jkuhne\source\repos\winforms`. Recent paths make the repo impossible to sync. I've added a test that reserves 40 characters for the repro root path and moved files out of subdirectories that violated that. A longer follow up is to see if we can pick some type names that aren't so long. Additionally we should try to up this check to 50 characters- which would require more renaming. --- ...ertySerializationDiagnosticAnalyzerTest.cs | 0 ...SharpIncrementalSourceGeneratorVerifier.cs | 0 .../Verifiers/CSharpSourceGeneratorTest`1.cs | 0 .../Verifiers/CSharpVerifierHelper.cs | 0 .../ApplicationConfigurationGeneratorTests.cs | 2 +- ...tialize_DefaultFont=SansSerif.verified.txt | 0 ...Initialize_DefaultFont=Tahoma.verified.txt | 0 ...nitialize_DefaultFont=default.verified.txt | 0 ...teInitialize_DefaultFont=null.verified.txt | 0 ...lize_EnableVisualStyles=false.verified.txt | 0 ...alize_EnableVisualStyles=true.verified.txt | 0 ...ze_UseCompTextRendering=false.verified.txt | 0 ...ize_UseCompTextRendering=true.verified.txt | 0 ...tionConfigurationInitializeBuilderTests.cs | 2 +- ....GenerateInitialize_default_boilerplate.cs | 0 ...ts.GenerateInitialize_default_top_level.cs | 0 ...ateInitialize_user_settings_boilerplate.cs | 0 ...Tests.GenerateInitialize_user_top_level.cs | 0 ...tializeBuilderTests.default_boilerplate.cs | 0 ...nitializeBuilderTests.default_top_level.cs | 0 .../ProjectFileReaderTests.FontConverter.cs | 0 .../Generators/ProjectFileReaderTests.cs | 0 ...indows.Forms.Analyzers.CSharp.Tests.csproj | 4 +- ...rSerializationVisibilityCodeFixProvider.vb | 0 ...lizationConfigurationDiagnosticAnalyzer.vb | 0 .../VisualBasicDiagnosticDescriptors.vb | 0 ...ySerializationConfigurationAnalyzerTest.vb | 0 ...s.Forms.Analyzers.VisualBasic.Tests.vbproj | 6 --- .../TestUtilities.Tests/PathLengthTests.cs | 40 +++++++++++++++++++ 29 files changed, 44 insertions(+), 10 deletions(-) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Analyzers/MissingPropertySerializationConfiguration/ControlPropertySerializationDiagnosticAnalyzerTest.cs (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Analyzers/Verifiers/CSharpIncrementalSourceGeneratorVerifier.cs (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Analyzers/Verifiers/CSharpSourceGeneratorTest`1.cs (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Analyzers/Verifiers/CSharpVerifierHelper.cs (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/ApplicationConfigurationGeneratorTests.cs (98%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=SansSerif.verified.txt (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=Tahoma.verified.txt (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=default.verified.txt (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=null.verified.txt (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_EnableVisualStyles=false.verified.txt (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_EnableVisualStyles=true.verified.txt (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_UseCompTextRendering=false.verified.txt (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_UseCompTextRendering=true.verified.txt (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/ApplicationConfigurationInitializeBuilderTests.cs (97%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_default_boilerplate.cs (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_default_top_level.cs (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_user_settings_boilerplate.cs (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_user_top_level.cs (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/MockData/ApplicationConfigurationInitializeBuilderTests.default_boilerplate.cs (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/MockData/ApplicationConfigurationInitializeBuilderTests.default_top_level.cs (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/ProjectFileReaderTests.FontConverter.cs (100%) rename src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/{System/Windows/Forms => }/Generators/ProjectFileReaderTests.cs (100%) rename src/System.Windows.Forms.Analyzers.CodeFixes.VisualBasic/{System/Windows/Forms/VisualBasic/CodeFixes => }/AddDesignerSerializationVisibility/AddDesignerSerializationVisibilityCodeFixProvider.vb (100%) rename src/System.Windows.Forms.Analyzers.VisualBasic/src/{System/Windows/Forms/VisualBasic => }/Analyzers/MissingPropertySerializationConfiguration/MissingPropertySerializationConfigurationDiagnosticAnalyzer.vb (100%) rename src/System.Windows.Forms.Analyzers.VisualBasic/src/{System/Windows/Forms/VisualBasic => }/Diagnostic/VisualBasicDiagnosticDescriptors.vb (100%) rename src/System.Windows.Forms.Analyzers.VisualBasic/tests/UnitTests/System.Windows.Forms.Analyzers.VisualBasic.Tests/{System/Windows/Forms/Analyzers/MissingPropertySerializationConfiguration => }/MissingPropertySerializationConfigurationAnalyzerTest.vb (100%) create mode 100644 src/System.Windows.Forms.Primitives/tests/TestUtilities.Tests/PathLengthTests.cs diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Analyzers/MissingPropertySerializationConfiguration/ControlPropertySerializationDiagnosticAnalyzerTest.cs b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Analyzers/MissingPropertySerializationConfiguration/ControlPropertySerializationDiagnosticAnalyzerTest.cs similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Analyzers/MissingPropertySerializationConfiguration/ControlPropertySerializationDiagnosticAnalyzerTest.cs rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Analyzers/MissingPropertySerializationConfiguration/ControlPropertySerializationDiagnosticAnalyzerTest.cs diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Analyzers/Verifiers/CSharpIncrementalSourceGeneratorVerifier.cs b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Analyzers/Verifiers/CSharpIncrementalSourceGeneratorVerifier.cs similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Analyzers/Verifiers/CSharpIncrementalSourceGeneratorVerifier.cs rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Analyzers/Verifiers/CSharpIncrementalSourceGeneratorVerifier.cs diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Analyzers/Verifiers/CSharpSourceGeneratorTest`1.cs b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Analyzers/Verifiers/CSharpSourceGeneratorTest`1.cs similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Analyzers/Verifiers/CSharpSourceGeneratorTest`1.cs rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Analyzers/Verifiers/CSharpSourceGeneratorTest`1.cs diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Analyzers/Verifiers/CSharpVerifierHelper.cs b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Analyzers/Verifiers/CSharpVerifierHelper.cs similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Analyzers/Verifiers/CSharpVerifierHelper.cs rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Analyzers/Verifiers/CSharpVerifierHelper.cs diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationGeneratorTests.cs b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationGeneratorTests.cs similarity index 98% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationGeneratorTests.cs rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationGeneratorTests.cs index 064935b03e2..2a10b26f3cc 100644 --- a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationGeneratorTests.cs +++ b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationGeneratorTests.cs @@ -220,6 +220,6 @@ public async Task CS_ApplicationConfigurationGenerator_GenerateInitialize_user_s private SourceText LoadFileContent(string testName) => SourceText.From( - File.ReadAllText($@"System\Windows\Forms\Generators\MockData\{GetType().Name}.{testName}.cs"), + File.ReadAllText($@"Generators\MockData\{GetType().Name}.{testName}.cs"), Encoding.UTF8); } diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=SansSerif.verified.txt b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=SansSerif.verified.txt similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=SansSerif.verified.txt rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=SansSerif.verified.txt diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=Tahoma.verified.txt b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=Tahoma.verified.txt similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=Tahoma.verified.txt rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=Tahoma.verified.txt diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=default.verified.txt b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=default.verified.txt similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=default.verified.txt rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=default.verified.txt diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=null.verified.txt b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=null.verified.txt similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=null.verified.txt rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_DefaultFont=null.verified.txt diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_EnableVisualStyles=false.verified.txt b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_EnableVisualStyles=false.verified.txt similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_EnableVisualStyles=false.verified.txt rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_EnableVisualStyles=false.verified.txt diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_EnableVisualStyles=true.verified.txt b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_EnableVisualStyles=true.verified.txt similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_EnableVisualStyles=true.verified.txt rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_EnableVisualStyles=true.verified.txt diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_UseCompTextRendering=false.verified.txt b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_UseCompTextRendering=false.verified.txt similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_UseCompTextRendering=false.verified.txt rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_UseCompTextRendering=false.verified.txt diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_UseCompTextRendering=true.verified.txt b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_UseCompTextRendering=true.verified.txt similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_UseCompTextRendering=true.verified.txt rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.GenerateInitialize_UseCompTextRendering=true.verified.txt diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.cs b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.cs similarity index 97% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.cs rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.cs index ff3595863ee..3f7d373eef6 100644 --- a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.cs +++ b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ApplicationConfigurationInitializeBuilderTests.cs @@ -30,7 +30,7 @@ public partial class ApplicationConfigurationInitializeBuilderTests [InlineData("MyProject", "default_boilerplate")] public void ApplicationConfigurationInitializeBuilder_GenerateInitialize_can_handle_namespace(string? ns, string expectedFileName) { - string expected = File.ReadAllText($@"System\Windows\Forms\Generators\MockData\{GetType().Name}.{expectedFileName}.cs"); + string expected = File.ReadAllText($@"Generators\MockData\{GetType().Name}.{expectedFileName}.cs"); string output = ApplicationConfigurationInitializeBuilder.GenerateInitialize(ns, new ApplicationConfig( diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_default_boilerplate.cs b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_default_boilerplate.cs similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_default_boilerplate.cs rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_default_boilerplate.cs diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_default_top_level.cs b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_default_top_level.cs similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_default_top_level.cs rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_default_top_level.cs diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_user_settings_boilerplate.cs b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_user_settings_boilerplate.cs similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_user_settings_boilerplate.cs rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_user_settings_boilerplate.cs diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_user_top_level.cs b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_user_top_level.cs similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_user_top_level.cs rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/MockData/ApplicationConfigurationGeneratorTests.GenerateInitialize_user_top_level.cs diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/MockData/ApplicationConfigurationInitializeBuilderTests.default_boilerplate.cs b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/MockData/ApplicationConfigurationInitializeBuilderTests.default_boilerplate.cs similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/MockData/ApplicationConfigurationInitializeBuilderTests.default_boilerplate.cs rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/MockData/ApplicationConfigurationInitializeBuilderTests.default_boilerplate.cs diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/MockData/ApplicationConfigurationInitializeBuilderTests.default_top_level.cs b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/MockData/ApplicationConfigurationInitializeBuilderTests.default_top_level.cs similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/MockData/ApplicationConfigurationInitializeBuilderTests.default_top_level.cs rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/MockData/ApplicationConfigurationInitializeBuilderTests.default_top_level.cs diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ProjectFileReaderTests.FontConverter.cs b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ProjectFileReaderTests.FontConverter.cs similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ProjectFileReaderTests.FontConverter.cs rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ProjectFileReaderTests.FontConverter.cs diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ProjectFileReaderTests.cs b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ProjectFileReaderTests.cs similarity index 100% rename from src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ProjectFileReaderTests.cs rename to src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/Generators/ProjectFileReaderTests.cs diff --git a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System.Windows.Forms.Analyzers.CSharp.Tests.csproj b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System.Windows.Forms.Analyzers.CSharp.Tests.csproj index 103ea05e9d6..f694dc32083 100644 --- a/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System.Windows.Forms.Analyzers.CSharp.Tests.csproj +++ b/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System.Windows.Forms.Analyzers.CSharp.Tests.csproj @@ -28,8 +28,8 @@ - - + + PreserveNewest diff --git a/src/System.Windows.Forms.Analyzers.CodeFixes.VisualBasic/System/Windows/Forms/VisualBasic/CodeFixes/AddDesignerSerializationVisibility/AddDesignerSerializationVisibilityCodeFixProvider.vb b/src/System.Windows.Forms.Analyzers.CodeFixes.VisualBasic/AddDesignerSerializationVisibility/AddDesignerSerializationVisibilityCodeFixProvider.vb similarity index 100% rename from src/System.Windows.Forms.Analyzers.CodeFixes.VisualBasic/System/Windows/Forms/VisualBasic/CodeFixes/AddDesignerSerializationVisibility/AddDesignerSerializationVisibilityCodeFixProvider.vb rename to src/System.Windows.Forms.Analyzers.CodeFixes.VisualBasic/AddDesignerSerializationVisibility/AddDesignerSerializationVisibilityCodeFixProvider.vb diff --git a/src/System.Windows.Forms.Analyzers.VisualBasic/src/System/Windows/Forms/VisualBasic/Analyzers/MissingPropertySerializationConfiguration/MissingPropertySerializationConfigurationDiagnosticAnalyzer.vb b/src/System.Windows.Forms.Analyzers.VisualBasic/src/Analyzers/MissingPropertySerializationConfiguration/MissingPropertySerializationConfigurationDiagnosticAnalyzer.vb similarity index 100% rename from src/System.Windows.Forms.Analyzers.VisualBasic/src/System/Windows/Forms/VisualBasic/Analyzers/MissingPropertySerializationConfiguration/MissingPropertySerializationConfigurationDiagnosticAnalyzer.vb rename to src/System.Windows.Forms.Analyzers.VisualBasic/src/Analyzers/MissingPropertySerializationConfiguration/MissingPropertySerializationConfigurationDiagnosticAnalyzer.vb diff --git a/src/System.Windows.Forms.Analyzers.VisualBasic/src/System/Windows/Forms/VisualBasic/Diagnostic/VisualBasicDiagnosticDescriptors.vb b/src/System.Windows.Forms.Analyzers.VisualBasic/src/Diagnostic/VisualBasicDiagnosticDescriptors.vb similarity index 100% rename from src/System.Windows.Forms.Analyzers.VisualBasic/src/System/Windows/Forms/VisualBasic/Diagnostic/VisualBasicDiagnosticDescriptors.vb rename to src/System.Windows.Forms.Analyzers.VisualBasic/src/Diagnostic/VisualBasicDiagnosticDescriptors.vb diff --git a/src/System.Windows.Forms.Analyzers.VisualBasic/tests/UnitTests/System.Windows.Forms.Analyzers.VisualBasic.Tests/System/Windows/Forms/Analyzers/MissingPropertySerializationConfiguration/MissingPropertySerializationConfigurationAnalyzerTest.vb b/src/System.Windows.Forms.Analyzers.VisualBasic/tests/UnitTests/System.Windows.Forms.Analyzers.VisualBasic.Tests/MissingPropertySerializationConfigurationAnalyzerTest.vb similarity index 100% rename from src/System.Windows.Forms.Analyzers.VisualBasic/tests/UnitTests/System.Windows.Forms.Analyzers.VisualBasic.Tests/System/Windows/Forms/Analyzers/MissingPropertySerializationConfiguration/MissingPropertySerializationConfigurationAnalyzerTest.vb rename to src/System.Windows.Forms.Analyzers.VisualBasic/tests/UnitTests/System.Windows.Forms.Analyzers.VisualBasic.Tests/MissingPropertySerializationConfigurationAnalyzerTest.vb diff --git a/src/System.Windows.Forms.Analyzers.VisualBasic/tests/UnitTests/System.Windows.Forms.Analyzers.VisualBasic.Tests/System.Windows.Forms.Analyzers.VisualBasic.Tests.vbproj b/src/System.Windows.Forms.Analyzers.VisualBasic/tests/UnitTests/System.Windows.Forms.Analyzers.VisualBasic.Tests/System.Windows.Forms.Analyzers.VisualBasic.Tests.vbproj index c59dd663ee6..083c68dac3c 100644 --- a/src/System.Windows.Forms.Analyzers.VisualBasic/tests/UnitTests/System.Windows.Forms.Analyzers.VisualBasic.Tests/System.Windows.Forms.Analyzers.VisualBasic.Tests.vbproj +++ b/src/System.Windows.Forms.Analyzers.VisualBasic/tests/UnitTests/System.Windows.Forms.Analyzers.VisualBasic.Tests/System.Windows.Forms.Analyzers.VisualBasic.Tests.vbproj @@ -28,10 +28,4 @@ - - - PreserveNewest - - - diff --git a/src/System.Windows.Forms.Primitives/tests/TestUtilities.Tests/PathLengthTests.cs b/src/System.Windows.Forms.Primitives/tests/TestUtilities.Tests/PathLengthTests.cs new file mode 100644 index 00000000000..e8b3fe470fc --- /dev/null +++ b/src/System.Windows.Forms.Primitives/tests/TestUtilities.Tests/PathLengthTests.cs @@ -0,0 +1,40 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using FluentAssertions; +using System.IO.Enumeration; + +namespace System.Tests; + +public class PathLengthTests +{ + [Fact] + public void RepoPathsLeaveRoomForRoot() + { + string currentPath = typeof(PathLengthTests).Assembly.Location; + currentPath = Path.GetFullPath(@"..\..\..\..\..\..\src", currentPath); + Directory.Exists(currentPath).Should().BeTrue(); + + // Current path will be something like C:\Users\jkuhne\source\repos\winforms\src (41 chars, 38 without src). + // We want to reserve 40 characters of the path length for everything past src. + int currentRootLength = currentPath.Length - "src".Length; + + const int MaxRootLength = 40; + + int maxLength = 260 - (currentRootLength > MaxRootLength + ? MaxRootLength + : MaxRootLength + (MaxRootLength - currentRootLength)); + + FileSystemEnumerable enumerable = new( + currentPath, + (ref FileSystemEntry entry) => entry.ToFullPath(), + new EnumerationOptions() { RecurseSubdirectories = true }) + { + ShouldIncludePredicate = (ref FileSystemEntry entry) => + // Directory doesn't contain a trailing slash + entry.Directory.Length + entry.FileName.Length > maxLength + }; + + enumerable.Should().BeEmpty(); + } +} From 64e4b37132d992ae4298e19be883b225d535eb4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 12:42:26 +0000 Subject: [PATCH 15/16] [main] Update dependencies from dotnet/runtime (#11839) [main] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 180 ++++++++++++++++++++-------------------- eng/Versions.props | 58 ++++++------- global.json | 2 +- 3 files changed, 120 insertions(+), 120 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 041089dcde5..fe959855d46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,186 +7,186 @@ Note: if the Uri is a new place, you will need to add a subscription from that p --> - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + a562a9fe5582dabf601884392d5ce987484ea706 diff --git a/eng/Versions.props b/eng/Versions.props index 68dc8052350..79e98660bf7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,37 +13,37 @@ - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 5.0.0-preview.7.20320.5 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 6.0.0 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 + 9.0.0-rc.1.24407.9 diff --git a/global.json b/global.json index a0656146c3d..623ea9267f8 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24405.1", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24405.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24406.14" + "Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24407.9" }, "native-tools": { "cmake": "latest" From 7aeab490a5dfa8c9429da4164a1d3b4e97ba6780 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 15:58:52 +0000 Subject: [PATCH 16/16] [main] Update dependencies from dotnet/arcade (#11838) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- global.json | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe959855d46..25e5b789f9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p - + https://github.com/dotnet/arcade - 2c829550b968e29389ce8392244da2b006d71301 + 610e251fc34686333b98188320ca1eecd7e6af6c - + https://github.com/dotnet/arcade - 2c829550b968e29389ce8392244da2b006d71301 + 610e251fc34686333b98188320ca1eecd7e6af6c - + https://github.com/dotnet/arcade - 2c829550b968e29389ce8392244da2b006d71301 + 610e251fc34686333b98188320ca1eecd7e6af6c - + https://github.com/dotnet/arcade - 2c829550b968e29389ce8392244da2b006d71301 + 610e251fc34686333b98188320ca1eecd7e6af6c - + https://github.com/dotnet/arcade - 2c829550b968e29389ce8392244da2b006d71301 + 610e251fc34686333b98188320ca1eecd7e6af6c - + https://github.com/dotnet/arcade - 2c829550b968e29389ce8392244da2b006d71301 + 610e251fc34686333b98188320ca1eecd7e6af6c diff --git a/eng/Versions.props b/eng/Versions.props index 79e98660bf7..3f0c4c1ae1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 9.0.0-beta.24405.1 - 9.0.0-beta.24405.1 - 9.0.0-beta.24405.1 + 9.0.0-beta.24408.1 + 9.0.0-beta.24408.1 + 9.0.0-beta.24408.1 17.4.0-preview-20220707-01 diff --git a/global.json b/global.json index 623ea9267f8..8cf01fe1675 100644 --- a/global.json +++ b/global.json @@ -14,9 +14,9 @@ "version": "9.0.100-preview.5.24307.3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24405.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24405.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24405.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24408.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24408.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24408.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "9.0.0-rc.1.24407.9" },