From 0000e45ec7916c6734c5b532c43686d8ce75c7b8 Mon Sep 17 00:00:00 2001 From: "Ricardo Bossan (BEYONDSOFT CONSULTING INC) (from Dev Box)" Date: Tue, 26 Mar 2024 22:19:46 -0300 Subject: [PATCH 01/21] Adds boilerplate for new ActiveX control tests --- .../tests/AxHosts/AxHosts.csproj | 17 +++++++++++++++ .../System.Windows.Forms.Tests.csproj | 9 ++++++++ .../System/Windows/Forms/AxWebBrowserTests.cs | 21 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs diff --git a/src/System.Windows.Forms/tests/AxHosts/AxHosts.csproj b/src/System.Windows.Forms/tests/AxHosts/AxHosts.csproj index c4fb99a6198..46255e17dd4 100644 --- a/src/System.Windows.Forms/tests/AxHosts/AxHosts.csproj +++ b/src/System.Windows.Forms/tests/AxHosts/AxHosts.csproj @@ -54,6 +54,23 @@ false false + + 1 + 1 + eab22ac0-30c1-11cf-a7eb-0000c05bae0b + 0 + tlbimp + false + false + + + aximp + 1 + 1 + eab22ac0-30c1-11cf-a7eb-0000c05bae0b + 0 + false + diff --git a/src/System.Windows.Forms/tests/UnitTests/System.Windows.Forms.Tests.csproj b/src/System.Windows.Forms/tests/UnitTests/System.Windows.Forms.Tests.csproj index 0f381e8d2fd..104d77315c8 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System.Windows.Forms.Tests.csproj +++ b/src/System.Windows.Forms/tests/UnitTests/System.Windows.Forms.Tests.csproj @@ -50,6 +50,15 @@ + + + $(ArtifactsBinDir)\AxHosts\$(Configuration)\net472\AxInterop.SHDocVw.dll + + + $(ArtifactsBinDir)\AxHosts\$(Configuration)\net472\Interop.SHDocVw.dll + + + PreserveNewest diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs new file mode 100644 index 00000000000..38a1661639d --- /dev/null +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs @@ -0,0 +1,21 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.ComponentModel; +using AxSHDocVw; + +namespace System.Windows.Forms.Tests.System.Windows.Forms; +public class AxMicrosoftWebBrowserTests +{ + private readonly Form _form; + private readonly AxMicrosoftWebBrowserTests _control; + + public AxMicrosoftWebBrowserTests() + { + using Form form = new(); + using AxWebBrowser control = new(); + ((ISupportInitialize)control).BeginInit(); + form.Controls.Add(control); + ((ISupportInitialize)control).EndInit(); + } +} From e4e63fdd49a12034e6fa80293f817bb95f410472 Mon Sep 17 00:00:00 2001 From: "Ricardo Bossan (BEYONDSOFT CONSULTING INC) (from Dev Box)" Date: Tue, 26 Mar 2024 22:26:25 -0300 Subject: [PATCH 02/21] Renamed test class for AxWebBrowser --- .../UnitTests/System/Windows/Forms/AxWebBrowserTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs index 38a1661639d..04ff57a9f05 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs @@ -5,12 +5,12 @@ using AxSHDocVw; namespace System.Windows.Forms.Tests.System.Windows.Forms; -public class AxMicrosoftWebBrowserTests +public class AxWebBrowserTests { private readonly Form _form; - private readonly AxMicrosoftWebBrowserTests _control; + private readonly AxWebBrowserTests _control; - public AxMicrosoftWebBrowserTests() + public AxWebBrowserTests() { using Form form = new(); using AxWebBrowser control = new(); From fa646d4ab3640a8b3ec5d83a201e44c1cd62bd86 Mon Sep 17 00:00:00 2001 From: "Ricardo Bossan (BEYONDSOFT CONSULTING INC) (from Dev Box)" Date: Wed, 27 Mar 2024 23:08:26 -0300 Subject: [PATCH 03/21] Add tests for AxWebBrowserTests --- .../System/Windows/Forms/AxWebBrowserTests.cs | 80 ++++++++++++++++--- 1 file changed, 70 insertions(+), 10 deletions(-) diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs index 04ff57a9f05..51666cade7f 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs @@ -2,20 +2,80 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.ComponentModel; +using System.Reflection; using AxSHDocVw; -namespace System.Windows.Forms.Tests.System.Windows.Forms; -public class AxWebBrowserTests +namespace System.Windows.Forms.Tests; +public class AxWebBrowserTests : IDisposable { private readonly Form _form; - private readonly AxWebBrowserTests _control; + private readonly AxWebBrowser _control; + private const string Url = "https://github.com/dotnet/winforms"; - public AxWebBrowserTests() + public AxWebBrowserTests() { - using Form form = new(); - using AxWebBrowser control = new(); - ((ISupportInitialize)control).BeginInit(); - form.Controls.Add(control); - ((ISupportInitialize)control).EndInit(); - } + _form = new Form(); + _control = new AxWebBrowser(); + ((ISupportInitialize)_control).BeginInit(); + _form.Controls.Add(_control); + ((ISupportInitialize)_control).EndInit(); + } + + [WinFormsFact] + public void AxWebBrowser_WhenInitialized_ExpectsProperties() + { + var properties = TypeDescriptor.GetProperties(_control); + var events = TypeDescriptor.GetEvents(_control); + + properties.Count.Should().BeGreaterThan(0); + events.Count.Should().BeGreaterThan(0); + + // Filters testing control properties and events so only those related to the AxWebBrowser assembly remain. + Type assemblyType = typeof(AxWebBrowser); + Assembly assembly = Assembly.GetAssembly(assemblyType); + string assemblyNameFromType = assembly.GetName().Name; + + var testingControlProps = properties + .Cast() + .Where(prop => prop.ComponentType.Assembly.GetName().Name == assemblyNameFromType) + .Select(prop => prop.Name) + .ToList(); + + var testingControlEvents = events + .Cast() + .Where(ev => ev.ComponentType.Assembly.GetName().Name == assemblyNameFromType) + .Select(ev => ev.Name) + .ToList(); + + // Compares testing control's properties and events to those of the assembly + TypeInfo assemblyTypeInfo = assembly.GetType(assemblyType.FullName).GetTypeInfo(); + testingControlProps.All(p => assemblyTypeInfo.DeclaredProperties.Any(ap => ap.Name == p)).Should().BeTrue(); + testingControlEvents.All(e => assemblyTypeInfo.DeclaredEvents.Any(ae => ae.Name == e)).Should().BeTrue(); + } + + [WinFormsFact] + public void AxWebBrowser_GoHome_InvokesMethod() + { + _control.GoHome(); + } + + [WinFormsFact] + public void AxWebBrowser_GoSearch_InvokesMethod() + { + _control.GoSearch(); + } + + [WinFormsFact] + public void AxWebBrowser_Navigate_InvokesMethod() + { + _control.Navigate(Url); + } + + public void Dispose() + { + // This line was added due to https://github.com/dotnet/winforms/issues/10692 + using NoAssertContext context = new NoAssertContext(); + _control.Dispose(); + _form.Dispose(); + } } From 7936655636054394f2ba1b3d1fe86870b2d46ec5 Mon Sep 17 00:00:00 2001 From: "Ricardo Bossan (BEYONDSOFT CONSULTING INC) (from Dev Box)" Date: Thu, 28 Mar 2024 15:56:58 -0300 Subject: [PATCH 04/21] Remove methods from test --- .../System/Windows/Forms/AxWebBrowserTests.cs | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs index 51666cade7f..5025f931813 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs @@ -10,7 +10,6 @@ public class AxWebBrowserTests : IDisposable { private readonly Form _form; private readonly AxWebBrowser _control; - private const string Url = "https://github.com/dotnet/winforms"; public AxWebBrowserTests() { @@ -43,7 +42,7 @@ public void AxWebBrowser_WhenInitialized_ExpectsProperties() var testingControlEvents = events .Cast() - .Where(ev => ev.ComponentType.Assembly.GetName().Name == assemblyNameFromType) + .Where(ev => ev.ComponentType.Assembly.GetName().Name == assemblyNameFromType) .Select(ev => ev.Name) .ToList(); @@ -53,24 +52,6 @@ public void AxWebBrowser_WhenInitialized_ExpectsProperties() testingControlEvents.All(e => assemblyTypeInfo.DeclaredEvents.Any(ae => ae.Name == e)).Should().BeTrue(); } - [WinFormsFact] - public void AxWebBrowser_GoHome_InvokesMethod() - { - _control.GoHome(); - } - - [WinFormsFact] - public void AxWebBrowser_GoSearch_InvokesMethod() - { - _control.GoSearch(); - } - - [WinFormsFact] - public void AxWebBrowser_Navigate_InvokesMethod() - { - _control.Navigate(Url); - } - public void Dispose() { // This line was added due to https://github.com/dotnet/winforms/issues/10692 From 2615169956bf88de5a38ff04065622e30055b03e Mon Sep 17 00:00:00 2001 From: "Ricardo Bossan (BEYONDSOFT CONSULTING INC) (from Dev Box)" Date: Mon, 1 Apr 2024 21:55:18 -0300 Subject: [PATCH 05/21] Update tests for AxWebBrowser --- .../System/Windows/Forms/AxWebBrowserTests.cs | 78 ++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs index 5025f931813..3be439a5c57 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs @@ -4,12 +4,14 @@ using System.ComponentModel; using System.Reflection; using AxSHDocVw; +using SHDocVw; namespace System.Windows.Forms.Tests; public class AxWebBrowserTests : IDisposable { private readonly Form _form; private readonly AxWebBrowser _control; + private object _url = "https://github.com/dotnet/winforms"; public AxWebBrowserTests() { @@ -52,10 +54,82 @@ public void AxWebBrowser_WhenInitialized_ExpectsProperties() testingControlEvents.All(e => assemblyTypeInfo.DeclaredEvents.Any(ae => ae.Name == e)).Should().BeTrue(); } + [WinFormsFact] + public void AxWebBrowser_GoHome_ShouldNotThrowException() + { + _control.Invoking(c => c.GoHome()).Should().NotThrow(); + } + + [WinFormsFact] + public void AxWebBrowser_GoSearch_ShouldNotThrowException() + { + _control.Invoking(c => c.GoSearch()).Should().NotThrow(); + } + + [WinFormsFact] + public void AxWebBrowser_Navigate_ShouldNotThrowException() + { + _control.Invoking(c => c.Navigate(_url.ToString())).Should().NotThrow(); + } + + [WinFormsFact] + public void AxWebBrowser_Navigate2_ShouldRaiseBeforeNavigate2() + { + bool eventRaised = false; + _control.BeforeNavigate2 += (sender, e) => eventRaised = true; + + _control.Invoking(c => c.Navigate2(ref _url)).Should().NotThrow(); + + eventRaised.Should().BeTrue(); + } + + [WinFormsFact] + public void AxWebBrowser_Stop_ShouldNotThrowException() + { + _control.Invoking(c => c.Stop()).Should().NotThrow(); + } + + [WinFormsFact] + public void AxWebBrowser_GetProperty_ShouldNotThrowException() + { + _control.Invoking(c => c.GetProperty("url")).Should().NotThrow(); + } + + [WinFormsFact] + public void AxWebBrowser_PutProperty_ShouldNotThrowException() + { + _control.Invoking(c => c.PutProperty("url", _url)).Should().NotThrow(); + } + + [WinFormsTheory] + [InlineData(new object[] { OLECMDID.OLECMDID_OPEN })] + [InlineData(new object[] { OLECMDID.OLECMDID_FOCUSVIEWCONTROLS })] + [InlineData(new object[] { OLECMDID.OLECMDID_CLOSE })] + public void AxWebBrowser_QueryStatusWB_ShouldNotThrowException(OLECMDID cmdId) + { + _control.Invoking(c => c.QueryStatusWB(cmdId)).Should().NotThrow(); + } + + [WinFormsTheory] + [InlineData(new object[] { OLECMDID.OLECMDID_COPY, OLECMDEXECOPT.OLECMDEXECOPT_DODEFAULT })] + [InlineData(new object[] { OLECMDID.OLECMDID_COPY, OLECMDEXECOPT.OLECMDEXECOPT_PROMPTUSER })] + [InlineData(new object[] { OLECMDID.OLECMDID_COPY, OLECMDEXECOPT.OLECMDEXECOPT_DONTPROMPTUSER })] + [InlineData(new object[] { OLECMDID.OLECMDID_COPY, OLECMDEXECOPT.OLECMDEXECOPT_SHOWHELP })] + [InlineData(new object[] { OLECMDID.OLECMDID_STOP, OLECMDEXECOPT.OLECMDEXECOPT_DODEFAULT })] + [InlineData(new object[] { OLECMDID.OLECMDID_STOP, OLECMDEXECOPT.OLECMDEXECOPT_PROMPTUSER })] + [InlineData(new object[] { OLECMDID.OLECMDID_STOP, OLECMDEXECOPT.OLECMDEXECOPT_DONTPROMPTUSER })] + [InlineData(new object[] { OLECMDID.OLECMDID_STOP, OLECMDEXECOPT.OLECMDEXECOPT_SHOWHELP })] + [InlineData(new object[] { OLECMDID.OLECMDID_CLOSE, OLECMDEXECOPT.OLECMDEXECOPT_DODEFAULT })] + [InlineData(new object[] { OLECMDID.OLECMDID_CLOSE, OLECMDEXECOPT.OLECMDEXECOPT_DONTPROMPTUSER })] + [InlineData(new object[] { OLECMDID.OLECMDID_CLOSE, OLECMDEXECOPT.OLECMDEXECOPT_PROMPTUSER })] + [InlineData(new object[] { OLECMDID.OLECMDID_CLOSE, OLECMDEXECOPT.OLECMDEXECOPT_SHOWHELP })] + public void AxWebBrowser_ExecWB_ShouldNotThrowException(OLECMDID cmdId, OLECMDEXECOPT cmdexecopt) + { + _control.Invoking(c => c.ExecWB(cmdId, cmdexecopt)).Should().NotThrow(); + } + public void Dispose() { - // This line was added due to https://github.com/dotnet/winforms/issues/10692 - using NoAssertContext context = new NoAssertContext(); _control.Dispose(); _form.Dispose(); } From 36bb8f2af06d47b5bb8d93227fd43a8abc9b5925 Mon Sep 17 00:00:00 2001 From: "Ricardo Bossan (BEYONDSOFT CONSULTING INC) (from Dev Box)" Date: Tue, 2 Apr 2024 22:26:35 -0300 Subject: [PATCH 06/21] Handle feedback --- .../System/Windows/Forms/AxWebBrowserTests.cs | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs index 3be439a5c57..225eb1ba386 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs @@ -96,36 +96,42 @@ public void AxWebBrowser_GetProperty_ShouldNotThrowException() } [WinFormsFact] - public void AxWebBrowser_PutProperty_ShouldNotThrowException() + public void AxWebBrowser_PutProperty_ReturnsExpected() { + object prop = _control.GetProperty("url"); + prop.Should().BeNull(); + _control.Invoking(c => c.PutProperty("url", _url)).Should().NotThrow(); + + prop = _control.GetProperty("url"); + prop.Should().NotBeNull(); } [WinFormsTheory] - [InlineData(new object[] { OLECMDID.OLECMDID_OPEN })] - [InlineData(new object[] { OLECMDID.OLECMDID_FOCUSVIEWCONTROLS })] - [InlineData(new object[] { OLECMDID.OLECMDID_CLOSE })] + [InlineData(OLECMDID.OLECMDID_OPEN)] + [InlineData(OLECMDID.OLECMDID_FOCUSVIEWCONTROLS)] + [InlineData(OLECMDID.OLECMDID_CLOSE)] public void AxWebBrowser_QueryStatusWB_ShouldNotThrowException(OLECMDID cmdId) { _control.Invoking(c => c.QueryStatusWB(cmdId)).Should().NotThrow(); } [WinFormsTheory] - [InlineData(new object[] { OLECMDID.OLECMDID_COPY, OLECMDEXECOPT.OLECMDEXECOPT_DODEFAULT })] - [InlineData(new object[] { OLECMDID.OLECMDID_COPY, OLECMDEXECOPT.OLECMDEXECOPT_PROMPTUSER })] - [InlineData(new object[] { OLECMDID.OLECMDID_COPY, OLECMDEXECOPT.OLECMDEXECOPT_DONTPROMPTUSER })] - [InlineData(new object[] { OLECMDID.OLECMDID_COPY, OLECMDEXECOPT.OLECMDEXECOPT_SHOWHELP })] - [InlineData(new object[] { OLECMDID.OLECMDID_STOP, OLECMDEXECOPT.OLECMDEXECOPT_DODEFAULT })] - [InlineData(new object[] { OLECMDID.OLECMDID_STOP, OLECMDEXECOPT.OLECMDEXECOPT_PROMPTUSER })] - [InlineData(new object[] { OLECMDID.OLECMDID_STOP, OLECMDEXECOPT.OLECMDEXECOPT_DONTPROMPTUSER })] - [InlineData(new object[] { OLECMDID.OLECMDID_STOP, OLECMDEXECOPT.OLECMDEXECOPT_SHOWHELP })] - [InlineData(new object[] { OLECMDID.OLECMDID_CLOSE, OLECMDEXECOPT.OLECMDEXECOPT_DODEFAULT })] - [InlineData(new object[] { OLECMDID.OLECMDID_CLOSE, OLECMDEXECOPT.OLECMDEXECOPT_DONTPROMPTUSER })] - [InlineData(new object[] { OLECMDID.OLECMDID_CLOSE, OLECMDEXECOPT.OLECMDEXECOPT_PROMPTUSER })] - [InlineData(new object[] { OLECMDID.OLECMDID_CLOSE, OLECMDEXECOPT.OLECMDEXECOPT_SHOWHELP })] - public void AxWebBrowser_ExecWB_ShouldNotThrowException(OLECMDID cmdId, OLECMDEXECOPT cmdexecopt) + [InlineData(OLECMDID.OLECMDID_COPY, OLECMDEXECOPT.OLECMDEXECOPT_DODEFAULT)] + [InlineData(OLECMDID.OLECMDID_COPY, OLECMDEXECOPT.OLECMDEXECOPT_PROMPTUSER)] + [InlineData(OLECMDID.OLECMDID_COPY, OLECMDEXECOPT.OLECMDEXECOPT_DONTPROMPTUSER)] + [InlineData(OLECMDID.OLECMDID_COPY, OLECMDEXECOPT.OLECMDEXECOPT_SHOWHELP)] + [InlineData(OLECMDID.OLECMDID_STOP, OLECMDEXECOPT.OLECMDEXECOPT_DODEFAULT)] + [InlineData(OLECMDID.OLECMDID_STOP, OLECMDEXECOPT.OLECMDEXECOPT_PROMPTUSER)] + [InlineData(OLECMDID.OLECMDID_STOP, OLECMDEXECOPT.OLECMDEXECOPT_DONTPROMPTUSER)] + [InlineData(OLECMDID.OLECMDID_STOP, OLECMDEXECOPT.OLECMDEXECOPT_SHOWHELP)] + [InlineData(OLECMDID.OLECMDID_CLOSE, OLECMDEXECOPT.OLECMDEXECOPT_DODEFAULT)] + [InlineData(OLECMDID.OLECMDID_CLOSE, OLECMDEXECOPT.OLECMDEXECOPT_DONTPROMPTUSER)] + [InlineData(OLECMDID.OLECMDID_CLOSE, OLECMDEXECOPT.OLECMDEXECOPT_PROMPTUSER)] + [InlineData(OLECMDID.OLECMDID_CLOSE, OLECMDEXECOPT.OLECMDEXECOPT_SHOWHELP)] + public void AxWebBrowser_ExecWB_ShouldNotThrowException(OLECMDID cmdId, OLECMDEXECOPT cmdExecOpt) { - _control.Invoking(c => c.ExecWB(cmdId, cmdexecopt)).Should().NotThrow(); + _control.Invoking(c => c.ExecWB(cmdId, cmdExecOpt)).Should().NotThrow(); } public void Dispose() From e948ef0c63dbd8559a57862079d62b0a615e55d4 Mon Sep 17 00:00:00 2001 From: "Ricardo Bossan (BEYONDSOFT CONSULTING INC) (from Dev Box)" Date: Wed, 3 Apr 2024 13:59:41 -0300 Subject: [PATCH 07/21] Adds new assertion to test --- .../tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs index 225eb1ba386..1669a69b743 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxWebBrowserTests.cs @@ -105,6 +105,7 @@ public void AxWebBrowser_PutProperty_ReturnsExpected() prop = _control.GetProperty("url"); prop.Should().NotBeNull(); + prop.Should().Be(_url.ToString()); } [WinFormsTheory] From 561af9e5eea9ed910db6caa9610ca794d69d979e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 12:35:42 +0000 Subject: [PATCH 08/21] [main] Update dependencies from dotnet/runtime (#11160) [main] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 172 ++++++++++++++++++++-------------------- eng/Versions.props | 54 ++++++------- global.json | 2 +- 3 files changed, 114 insertions(+), 114 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 742d7c90b5b..508eb725a79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,178 +7,178 @@ Note: if the Uri is a new place, you will need to add a subscription from that p --> - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a - + https://github.com/dotnet/runtime - 85e8f688ffaf02743da29adff95e98ebd22a6f53 + 3bae822e56590dec674ed25df8e5b7f23927af9a diff --git a/eng/Versions.props b/eng/Versions.props index 46dbd9a17b5..49d96645e73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,35 +13,35 @@ - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 5.0.0-preview.7.20320.5 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 6.0.0 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 - 9.0.0-preview.4.24202.16 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24203.2 diff --git a/global.json b/global.json index cedf036b2c2..384df71cb94 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24203.1", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24203.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24202.16" + "Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24203.2" }, "native-tools": { "cmake": "latest" From 897c9d87e973be3724375f8b272e82a5c6692070 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 16:02:37 +0000 Subject: [PATCH 09/21] [main] Update dependencies from dotnet/runtime (#11168) [main] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 172 ++++++++++++++++++++-------------------- eng/Versions.props | 54 ++++++------- global.json | 2 +- 3 files changed, 114 insertions(+), 114 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 508eb725a79..39860b25268 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,178 +7,178 @@ Note: if the Uri is a new place, you will need to add a subscription from that p --> - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 3bae822e56590dec674ed25df8e5b7f23927af9a + ffb257818db89672d84d538964cec1b54fb2a094 diff --git a/eng/Versions.props b/eng/Versions.props index 49d96645e73..c55af6d2b72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,35 +13,35 @@ - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 5.0.0-preview.7.20320.5 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 6.0.0 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 - 9.0.0-preview.4.24203.2 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 diff --git a/global.json b/global.json index 384df71cb94..800bf767d1c 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24203.1", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24203.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24203.2" + "Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24204.3" }, "native-tools": { "cmake": "latest" From d9e9d930ab30e628687b4a73ba8c970360c401ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 6 Apr 2024 12:36:36 +0000 Subject: [PATCH 10/21] [main] Update dependencies from dotnet/arcade (#11169) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 6 ++--- eng/common/cross/build-rootfs.sh | 11 +++++++-- .../templates-official/job/onelocbuild.yml | 2 +- .../templates-official/job/source-build.yml | 2 +- .../post-build/post-build.yml | 6 ++--- .../variables/pool-providers.yml | 2 +- global.json | 6 ++--- 8 files changed, 33 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39860b25268..078d38a844a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -183,29 +183,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 diff --git a/eng/Versions.props b/eng/Versions.props index c55af6d2b72..c330a51937e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,9 +54,9 @@ - 9.0.0-beta.24203.1 - 9.0.0-beta.24203.1 - 9.0.0-beta.24203.1 + 9.0.0-beta.24205.14 + 9.0.0-beta.24205.14 + 9.0.0-beta.24205.14 17.4.0-preview-20220707-01 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 99a9dd6bb60..a10304fa117 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -444,11 +444,18 @@ __RootfsDir="$( cd "$__RootfsDir" && pwd )" if [[ "$__CodeName" == "alpine" ]]; then __ApkToolsVersion=2.12.11 - __ApkToolsSHA512SUM=53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33 __ApkToolsDir="$(mktemp -d)" __ApkKeysDir="$(mktemp -d)" - wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//v$__ApkToolsVersion/x86_64/apk.static" -P "$__ApkToolsDir" + arch="$(uname -m)" + wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" -P "$__ApkToolsDir" + if [[ "$arch" == "x86_64" ]]; then + __ApkToolsSHA512SUM="53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33" + elif [[ "$arch" == "aarch64" ]]; then + __ApkToolsSHA512SUM="9e2b37ecb2b56c05dad23d379be84fd494c14bd730b620d0d576bda760588e1f2f59a7fcb2f2080577e0085f23a0ca8eadd993b4e61c2ab29549fdb71969afd0" + else + echo "WARNING: add missing hash for your host architecture. To find the value, use: `find /tmp -name apk.static -exec sha512sum {} \;`" + fi echo "$__ApkToolsSHA512SUM $__ApkToolsDir/apk.static" | sha512sum -c chmod +x "$__ApkToolsDir/apk.static" diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index 52b4d05d3f8..ba9ba493032 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -56,7 +56,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 50d4b98e201..50f04e642a3 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -52,7 +52,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: 1es-mariner-2-pt os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index da1f40958b4..d286e956bdf 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -110,7 +110,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: @@ -150,7 +150,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: - template: setup-maestro-vars.yml @@ -208,7 +208,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index 1f308b24efc..beab7d1bfba 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022 +# image: 1es-windows-2022-pt variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/global.json b/global.json index 800bf767d1c..f2b31283924 100644 --- a/global.json +++ b/global.json @@ -14,9 +14,9 @@ "version": "9.0.100-preview.1.24101.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24203.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24203.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24203.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24205.14", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24205.14", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24205.14", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24204.3" }, From 0e3964e75d345cdb4d849e676d97042cf3e5f723 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Mon, 8 Apr 2024 08:20:14 -0700 Subject: [PATCH 11/21] Mark ComNativeDescriptor-related code as RequiresUnreferencedCode (#11165) --- .../COM2Interop/COM2AboutBoxPropertyDescriptor.cs | 1 + .../Forms/ComponentModel/COM2Interop/COM2IDispatchConverter.cs | 1 + .../COM2Interop/COM2IManagedPerPropertyBrowsingHandler.cs | 1 + .../COM2Interop/COM2IPerPropertyBrowsingHandler.cs | 1 + .../COM2Interop/COM2IVsPerPropertyBrowsingHandler.cs | 1 + .../Windows/Forms/ComponentModel/COM2Interop/COM2Properties.cs | 1 + .../Forms/ComponentModel/COM2Interop/COM2PropertyDescriptor.cs | 1 + .../Forms/ComponentModel/COM2Interop/COM2TypeInfoProcessor.cs | 1 + ...IPerPropertyBrowsingHandler.Com2IPerPropertyBrowsingEnum.cs | 1 + ...PerPropertyBrowsingHandler.Com2IPerPropertyEnumConverter.cs | 1 + .../COM2Interop/ComNativeDescriptor.ComTypeDescriptor.cs | 1 + .../COM2Interop/ComNativeDescriptor.NullTypeDescriptor.cs | 1 + .../Forms/ComponentModel/COM2Interop/ComNativeDescriptor.cs | 3 +++ 13 files changed, 15 insertions(+) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2AboutBoxPropertyDescriptor.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2AboutBoxPropertyDescriptor.cs index 9f869d8b9f0..942a46ab799 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2AboutBoxPropertyDescriptor.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2AboutBoxPropertyDescriptor.cs @@ -7,6 +7,7 @@ namespace System.Windows.Forms.ComponentModel.Com2Interop; +[RequiresUnreferencedCode(ComNativeDescriptor.ComTypeDescriptorsMessage + " Uses Com2PropertyDescriptor which is not trim-compatible.")] internal sealed partial class Com2AboutBoxPropertyDescriptor : Com2PropertyDescriptor { private TypeConverter? _converter; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IDispatchConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IDispatchConverter.cs index f704297a9b1..0a3dbb5f2b6 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IDispatchConverter.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IDispatchConverter.cs @@ -7,6 +7,7 @@ namespace System.Windows.Forms.ComponentModel.Com2Interop; +[RequiresUnreferencedCode(ComNativeDescriptor.ComTypeDescriptorsMessage + " Uses ComNativeDescriptor which is not trim-compatible.")] internal unsafe class Com2IDispatchConverter : Com2ExtendedTypeConverter { private readonly bool _allowExpand; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IManagedPerPropertyBrowsingHandler.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IManagedPerPropertyBrowsingHandler.cs index fc91b263340..0c353fc920d 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IManagedPerPropertyBrowsingHandler.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IManagedPerPropertyBrowsingHandler.cs @@ -11,6 +11,7 @@ namespace System.Windows.Forms.ComponentModel.Com2Interop; /// /// Browsing handler for . /// +[RequiresUnreferencedCode(ComNativeDescriptor.ComTypeDescriptorsMessage + " Uses reflection to inspect types whose names are not statically known.")] internal sealed unsafe class Com2IManagedPerPropertyBrowsingHandler : Com2ExtendedBrowsingHandler { public override void RegisterEvents(Com2PropertyDescriptor[]? properties) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IPerPropertyBrowsingHandler.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IPerPropertyBrowsingHandler.cs index 466feaa9c28..f09604e7a3a 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IPerPropertyBrowsingHandler.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IPerPropertyBrowsingHandler.cs @@ -10,6 +10,7 @@ namespace System.Windows.Forms.ComponentModel.Com2Interop; /// /// Browsing handler for . /// +[RequiresUnreferencedCode(ComNativeDescriptor.ComTypeDescriptorsMessage + " Uses COM2PropertyDescriptor which is not trim-compatible.")] internal sealed unsafe partial class Com2IPerPropertyBrowsingHandler : Com2ExtendedBrowsingHandler { public override void RegisterEvents(Com2PropertyDescriptor[]? properties) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IVsPerPropertyBrowsingHandler.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IVsPerPropertyBrowsingHandler.cs index 8f49237959b..c21ad946d03 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IVsPerPropertyBrowsingHandler.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IVsPerPropertyBrowsingHandler.cs @@ -10,6 +10,7 @@ namespace System.Windows.Forms.ComponentModel.Com2Interop; /// /// Browsing handler for . /// +[RequiresUnreferencedCode(ComNativeDescriptor.ComTypeDescriptorsMessage + " Uses Com2IDispatchConverter which is not trim-compatible.")] internal sealed unsafe class Com2IVsPerPropertyBrowsingHandler : Com2ExtendedBrowsingHandler { public static unsafe bool AllowChildProperties(Com2PropertyDescriptor property) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2Properties.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2Properties.cs index be87f3e0f43..0eb561c6e3e 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2Properties.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2Properties.cs @@ -9,6 +9,7 @@ namespace System.Windows.Forms.ComponentModel.Com2Interop; /// This class is responsible for managing a set of properties for a native object. It determines /// when the properties need to be refreshed, and owns the extended handlers for those properties. /// +[RequiresUnreferencedCode(ComNativeDescriptor.ComTypeDescriptorsMessage + " Uses Com2TypeInfoProcessor which is not trim-compatible.")] internal sealed class Com2Properties { // This is the interval that we'll hold properties for. If someone doesn't touch an object for this amount of time, diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2PropertyDescriptor.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2PropertyDescriptor.cs index acf3207aee1..bd644040786 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2PropertyDescriptor.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2PropertyDescriptor.cs @@ -23,6 +23,7 @@ namespace System.Windows.Forms.ComponentModel.Com2Interop; /// of s. /// /// +[RequiresUnreferencedCode(ComNativeDescriptor.ComTypeDescriptorsMessage + " Uses ComNativeDescriptor which is not trim-compatible.")] internal unsafe partial class Com2PropertyDescriptor : PropertyDescriptor, ICloneable { private EventHandlerList? _events; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2TypeInfoProcessor.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2TypeInfoProcessor.cs index c0a2f7bdc13..87d88ca298e 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2TypeInfoProcessor.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2TypeInfoProcessor.cs @@ -26,6 +26,7 @@ namespace System.Windows.Forms.ComponentModel.Com2Interop; /// information such as IPerPropertyBrowsing is handled elsewhere. /// /// +[RequiresUnreferencedCode(ComNativeDescriptor.ComTypeDescriptorsMessage + " Uses ComNativeDescriptor which is not trim-compatible.")] internal static unsafe partial class Com2TypeInfoProcessor { private static ModuleBuilder? s_moduleBuilder; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/Com2IPerPropertyBrowsingHandler.Com2IPerPropertyBrowsingEnum.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/Com2IPerPropertyBrowsingHandler.Com2IPerPropertyBrowsingEnum.cs index 97bc81a29e7..8aa2cdf7c39 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/Com2IPerPropertyBrowsingHandler.Com2IPerPropertyBrowsingEnum.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/Com2IPerPropertyBrowsingHandler.Com2IPerPropertyBrowsingEnum.cs @@ -10,6 +10,7 @@ namespace System.Windows.Forms.ComponentModel.Com2Interop; internal partial class Com2IPerPropertyBrowsingHandler { // This exists for perf reasons. We delay doing this until we are actually asked for the array of values. + [RequiresUnreferencedCode(ComNativeDescriptor.ComTypeDescriptorsMessage + " Uses Com2IPerPropertyBrowsingHandler which is not trim-compatible.")] private unsafe class Com2IPerPropertyBrowsingEnum : Com2Enum { private readonly string?[] _names; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/Com2IPerPropertyBrowsingHandler.Com2IPerPropertyEnumConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/Com2IPerPropertyBrowsingHandler.Com2IPerPropertyEnumConverter.cs index 550d4a05b25..941180558d5 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/Com2IPerPropertyBrowsingHandler.Com2IPerPropertyEnumConverter.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/Com2IPerPropertyBrowsingHandler.Com2IPerPropertyEnumConverter.cs @@ -12,6 +12,7 @@ internal partial class Com2IPerPropertyBrowsingHandler /// /// Used to identify the enums that we added. /// + [RequiresUnreferencedCode(ComNativeDescriptor.ComTypeDescriptorsMessage + " Uses Com2IPerPropertyBrowsingHandler which is not trim-compatible.")] private unsafe class Com2IPerPropertyEnumConverter : Com2EnumConverter { private readonly Com2IPerPropertyBrowsingEnum _itemsEnum; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.ComTypeDescriptor.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.ComTypeDescriptor.cs index 17fcdbf5c8c..ce5b3abdb70 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.ComTypeDescriptor.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.ComTypeDescriptor.cs @@ -12,6 +12,7 @@ internal partial class ComNativeDescriptor /// /// The given by for a given type instance. /// + [RequiresUnreferencedCode(ComNativeDescriptor.ComTypeDescriptorsMessage + " Uses ComNativeDescriptor which is not trim-compatible.")] private sealed unsafe class ComTypeDescriptor : ICustomTypeDescriptor { private readonly ComNativeDescriptor _handler; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.NullTypeDescriptor.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.NullTypeDescriptor.cs index f721f9ce9d6..28669929c99 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.NullTypeDescriptor.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.NullTypeDescriptor.cs @@ -12,6 +12,7 @@ internal partial class ComNativeDescriptor /// Stub descriptor for when we're passed a null to . This used to be /// contained in . /// + [RequiresUnreferencedCode(ComTypeDescriptorsMessage + " Uses ComNativeDescriptor which is not trim-compatible.")] private sealed class NullTypeDescriptor : ICustomTypeDescriptor { AttributeCollection ICustomTypeDescriptor.GetAttributes() => new(s_staticAttributes); diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.cs index ff13b48bb0f..cb0f0a41d44 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.cs @@ -22,8 +22,11 @@ namespace System.Windows.Forms.ComponentModel.Com2Interop; /// . /// /// +[RequiresUnreferencedCode(ComNativeDescriptor.ComTypeDescriptorsMessage + " Uses Com2IManagedPerPropertyBrowsingHandler which is not trim-compatible.")] internal sealed unsafe partial class ComNativeDescriptor : TypeDescriptionProvider { + internal const string ComTypeDescriptorsMessage = "COM type descriptors are not trim-compatible."; + private static readonly Attribute[] s_staticAttributes = [BrowsableAttribute.Yes, DesignTimeVisibleAttribute.No]; // Our collection of Object managers (Com2Properties) for native properties From ff25ff65bf4a28e68376a6c705cd5bd79a897b23 Mon Sep 17 00:00:00 2001 From: Lakshan Fernando Date: Mon, 8 Apr 2024 10:50:33 -0700 Subject: [PATCH 12/21] Miscellaneous trim fixes --- .../src/System/ComponentModel/Design/DesignerHost.cs | 2 ++ .../Controls/TextBox/TextBoxAutoCompleteSourceConverter.cs | 1 - .../Windows/Forms/Layout/Containers/ContainerControl.cs | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerHost.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerHost.cs index 8c056925af3..5491976d3f9 100644 --- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerHost.cs +++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerHost.cs @@ -1240,8 +1240,10 @@ bool IDesignerLoaderHost2.IgnoreErrorsDuringReload [DynamicallyAccessedMembers(GetAllMembers)] MemberInfo[] IReflect.GetMember(string name, BindingFlags bindingAttr) => typeof(IDesignerHost).GetMember(name, bindingAttr); + [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors | DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods | DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.NonPublicFields | DynamicallyAccessedMemberTypes.PublicNestedTypes | DynamicallyAccessedMemberTypes.NonPublicNestedTypes | DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.NonPublicProperties | DynamicallyAccessedMemberTypes.PublicEvents | DynamicallyAccessedMemberTypes.NonPublicEvents)] MemberInfo[] IReflect.GetMembers(BindingFlags bindingAttr) => typeof(IDesignerHost).GetMembers(bindingAttr); + [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] object? IReflect.InvokeMember( string name, BindingFlags invokeAttr, diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/TextBox/TextBoxAutoCompleteSourceConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/TextBox/TextBoxAutoCompleteSourceConverter.cs index 9f9ae2876bf..5631fadffd3 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/TextBox/TextBoxAutoCompleteSourceConverter.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/TextBox/TextBoxAutoCompleteSourceConverter.cs @@ -8,7 +8,6 @@ namespace System.Windows.Forms; internal class TextBoxAutoCompleteSourceConverter : EnumConverter { public TextBoxAutoCompleteSourceConverter( - [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.PublicFields)] Type type) : base(type) { } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Layout/Containers/ContainerControl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Layout/Containers/ContainerControl.cs index 4dea17f2f10..3f7be28dfd4 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Layout/Containers/ContainerControl.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Layout/Containers/ContainerControl.cs @@ -251,6 +251,11 @@ public override BindingContext? BindingContext { get { + if (!Binding.IsSupported) + { + throw new NotSupportedException(SR.BindingNotSupported); + } + BindingContext? bm = base.BindingContext; if (bm is null) { From 8cf6afd64e885ad56db387544809fde62f0f158d Mon Sep 17 00:00:00 2001 From: Lakshan Fernando Date: Mon, 8 Apr 2024 12:48:47 -0700 Subject: [PATCH 13/21] Update src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerHost.cs Co-authored-by: Sven Boemer --- .../src/System/ComponentModel/Design/DesignerHost.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerHost.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerHost.cs index 5491976d3f9..b420fd19d59 100644 --- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerHost.cs +++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerHost.cs @@ -1240,7 +1240,7 @@ bool IDesignerLoaderHost2.IgnoreErrorsDuringReload [DynamicallyAccessedMembers(GetAllMembers)] MemberInfo[] IReflect.GetMember(string name, BindingFlags bindingAttr) => typeof(IDesignerHost).GetMember(name, bindingAttr); - [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors | DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods | DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.NonPublicFields | DynamicallyAccessedMemberTypes.PublicNestedTypes | DynamicallyAccessedMemberTypes.NonPublicNestedTypes | DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.NonPublicProperties | DynamicallyAccessedMemberTypes.PublicEvents | DynamicallyAccessedMemberTypes.NonPublicEvents)] + [DynamicallyAccessedMembers(GetAllMembers)] MemberInfo[] IReflect.GetMembers(BindingFlags bindingAttr) => typeof(IDesignerHost).GetMembers(bindingAttr); [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] From d896f08397d88e62c9f8af085c01146edcab3da7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 13:20:35 -0700 Subject: [PATCH 14/21] [main] Update dependencies from dotnet/arcade (#11174) * Update dependencies from https://github.com/dotnet/arcade build 20240407.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.24205.14 -> To Version 9.0.0-beta.24207.1 * Update dependencies from https://github.com/dotnet/arcade build 20240407.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.24205.14 -> To Version 9.0.0-beta.24207.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 078d38a844a..4fc3e37fdc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -183,29 +183,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 diff --git a/eng/Versions.props b/eng/Versions.props index c330a51937e..e336d9090e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,9 +54,9 @@ - 9.0.0-beta.24205.14 - 9.0.0-beta.24205.14 - 9.0.0-beta.24205.14 + 9.0.0-beta.24207.1 + 9.0.0-beta.24207.1 + 9.0.0-beta.24207.1 17.4.0-preview-20220707-01 diff --git a/global.json b/global.json index f2b31283924..cc7acce58c3 100644 --- a/global.json +++ b/global.json @@ -14,9 +14,9 @@ "version": "9.0.100-preview.1.24101.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24205.14", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24205.14", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24205.14", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24207.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24207.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24207.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24204.3" }, From b6745a5b5075bef05415d1600a5125282410a71b Mon Sep 17 00:00:00 2001 From: gpetrou <4172445+gpetrou@users.noreply.github.com> Date: Mon, 8 Apr 2024 23:20:50 +0300 Subject: [PATCH 15/21] Enable nullability in ListControlStringCollectionEditor and StringArrayEditor (#11144) * Enable nullability in ListControlStringCollectionEditor and StringArrayEditor * Combine pattern matching --- .../Forms/Design/ListControlStringCollectionEditor.cs | 10 ++++------ .../System/Windows/Forms/Design/StringArrayEditor.cs | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ListControlStringCollectionEditor.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ListControlStringCollectionEditor.cs index 30455d3fbff..cca63c6669e 100644 --- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ListControlStringCollectionEditor.cs +++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ListControlStringCollectionEditor.cs @@ -1,8 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#nullable disable - using System.ComponentModel; namespace System.Windows.Forms.Design; @@ -14,15 +12,15 @@ namespace System.Windows.Forms.Design; /// internal class ListControlStringCollectionEditor : StringCollectionEditor { - public ListControlStringCollectionEditor(Type type) : base(type) + public ListControlStringCollectionEditor(Type type) + : base(type) { } - public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) + public override object? EditValue(ITypeDescriptorContext? context, IServiceProvider provider, object? value) { // If we're trying to edit the items in an object that has a DataSource set, throw an exception. - ListControl control = context.Instance as ListControl; - if (control?.DataSource is not null) + if (context?.Instance is ListControl control && control.DataSource is not null) { throw new ArgumentException(SR.DataSourceLocksItems); } diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/StringArrayEditor.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/StringArrayEditor.cs index a2b2b7fbdb5..05c727ff09c 100644 --- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/StringArrayEditor.cs +++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/StringArrayEditor.cs @@ -1,8 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#nullable disable - namespace System.Windows.Forms.Design; /// @@ -15,12 +13,12 @@ public StringArrayEditor(Type type) { } - protected override Type CreateCollectionItemType() => CollectionType.GetElementType(); + protected override Type CreateCollectionItemType() => CollectionType.GetElementType() ?? typeof(string[]); /// /// We implement the getting and setting of items on this collection. /// - protected override object[] GetItems(object editValue) + protected override object[] GetItems(object? editValue) { if (editValue is not Array valueArray) { @@ -37,9 +35,9 @@ protected override object[] GetItems(object editValue) /// It should return an instance to replace with, or /// if there is no need to replace the instance. /// - protected override object SetItems(object editValue, object[] value) + protected override object? SetItems(object? editValue, object[]? value) { - if (editValue is Array or null) + if (editValue is Array or null && value is not null) { Array newArray = Array.CreateInstance(CollectionItemType, value.Length); Array.Copy(value, newArray, value.Length); From fb66ffa584b2a9297c267d92cadc1a1ff2a52d5c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 12:36:46 +0000 Subject: [PATCH 16/21] [main] Update dependencies from dotnet/arcade (#11179) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 ++++++------ eng/Versions.props | 6 +-- eng/common/cross/build-rootfs.sh | 64 +++++++++++++++++++------------- global.json | 6 +-- 4 files changed, 57 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4fc3e37fdc6..4d39b763b1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -183,29 +183,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p - + https://github.com/dotnet/arcade - 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 + a4f367bfa9602e4c24f509902285176fa3153a64 - + https://github.com/dotnet/arcade - 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 + a4f367bfa9602e4c24f509902285176fa3153a64 - + https://github.com/dotnet/arcade - 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 + a4f367bfa9602e4c24f509902285176fa3153a64 - + https://github.com/dotnet/arcade - 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 + a4f367bfa9602e4c24f509902285176fa3153a64 - + https://github.com/dotnet/arcade - 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 + a4f367bfa9602e4c24f509902285176fa3153a64 - + https://github.com/dotnet/arcade - 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 + a4f367bfa9602e4c24f509902285176fa3153a64 diff --git a/eng/Versions.props b/eng/Versions.props index e336d9090e3..1b6b92e10ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,9 +54,9 @@ - 9.0.0-beta.24207.1 - 9.0.0-beta.24207.1 - 9.0.0-beta.24207.1 + 9.0.0-beta.24208.8 + 9.0.0-beta.24208.8 + 9.0.0-beta.24208.8 17.4.0-preview-20220707-01 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index a10304fa117..ed1bfeda3c9 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -142,7 +142,6 @@ while :; do case $lowerI in -\?|-h|--help) usage - exit 1 ;; arm) __BuildArch=arm @@ -229,12 +228,19 @@ while :; do __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" ;; lldb*) - version="${lowerI/lldb/}" - parts=(${version//./ }) + version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" + majorVersion="${version%%.*}" + + [ -z "${version##*.*}" ] && minorVersion="${version#*.}" + if [ -z "$minorVersion" ]; then + minorVersion=0 + fi # for versions > 6.0, lldb has dropped the minor version - if [[ "${parts[0]}" -gt 6 ]]; then - version="${parts[0]}" + if [ "$majorVersion" -le 6 ]; then + version="$majorVersion.$minorVersion" + else + version="$majorVersion" fi __LLDB_Package="liblldb-${version}-dev" @@ -243,15 +249,19 @@ while :; do unset __LLDB_Package ;; llvm*) - version="${lowerI/llvm/}" - parts=(${version//./ }) - __LLVM_MajorVersion="${parts[0]}" - __LLVM_MinorVersion="${parts[1]}" - - # for versions > 6.0, llvm has dropped the minor version - if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then - __LLVM_MinorVersion=0; + version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" + __LLVM_MajorVersion="${version%%.*}" + + [ -z "${version##*.*}" ] && __LLVM_MinorVersion="${version#*.}" + if [ -z "$__LLVM_MinorVersion" ]; then + __LLVM_MinorVersion=0 fi + + # for versions > 6.0, lldb has dropped the minor version + if [ "$__LLVM_MajorVersion" -gt 6 ]; then + __LLVM_MinorVersion= + fi + ;; xenial) # Ubuntu 16.04 if [[ "$__CodeName" != "jessie" ]]; then @@ -323,15 +333,14 @@ while :; do alpine*) __CodeName=alpine __UbuntuRepo= - version="${lowerI/alpine/}" - if [[ "$version" == "edge" ]]; then + if [[ "$lowerI" == "alpineedge" ]]; then __AlpineVersion=edge else - parts=(${version//./ }) - __AlpineMajorVersion="${parts[0]}" - __AlpineMinoVersion="${parts[1]}" - __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion" + version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" + __AlpineMajorVersion="${version%%.*}" + __AlpineMinorVersion="${version#*.}" + __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinorVersion" fi ;; freebsd13) @@ -454,7 +463,7 @@ if [[ "$__CodeName" == "alpine" ]]; then elif [[ "$arch" == "aarch64" ]]; then __ApkToolsSHA512SUM="9e2b37ecb2b56c05dad23d379be84fd494c14bd730b620d0d576bda760588e1f2f59a7fcb2f2080577e0085f23a0ca8eadd993b4e61c2ab29549fdb71969afd0" else - echo "WARNING: add missing hash for your host architecture. To find the value, use: `find /tmp -name apk.static -exec sha512sum {} \;`" + echo "WARNING: add missing hash for your host architecture. To find the value, use: 'find /tmp -name apk.static -exec sha512sum {} \;'" fi echo "$__ApkToolsSHA512SUM $__ApkToolsDir/apk.static" | sha512sum -c chmod +x "$__ApkToolsDir/apk.static" @@ -484,12 +493,14 @@ if [[ "$__CodeName" == "alpine" ]]; then fi # initialize DB + # shellcheck disable=SC2086 "$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" --initdb add if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then + # shellcheck disable=SC2086 __AlpinePackages+=" $("$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ @@ -498,6 +509,7 @@ if [[ "$__CodeName" == "alpine" ]]; then fi # install all packages in one go + # shellcheck disable=SC2086 "$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ @@ -521,6 +533,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then rm -rf "$__RootfsDir/tmp/pkg-${__FreeBSDPkg}" # install packages we need. INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf update + # shellcheck disable=SC2086 INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages elif [[ "$__CodeName" == "illumos" ]]; then mkdir "$__RootfsDir/tmp" @@ -582,8 +595,8 @@ elif [[ "$__CodeName" == "haiku" ]]; then mkdir "$__RootfsDir/tmp/download" echo "Downloading Haiku package tool" - git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 $__RootfsDir/tmp/script - wget -O "$__RootfsDir/tmp/download/hosttools.zip" $($__RootfsDir/tmp/script/fetch.sh --hosttools) + git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 "$__RootfsDir/tmp/script" + wget -O "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)" unzip -o "$__RootfsDir/tmp/download/hosttools.zip" -d "$__RootfsDir/tmp/bin" DepotBaseUrl="https://depot.haiku-os.org/__api/v2/pkg/get-pkg" @@ -616,7 +629,7 @@ elif [[ "$__CodeName" == "haiku" ]]; then # Download buildtools echo "Downloading Haiku buildtools" - wget -O "$__RootfsDir/tmp/download/buildtools.zip" $($__RootfsDir/tmp/script/fetch.sh --buildtools --arch=$__HaikuArch) + wget -O "$__RootfsDir/tmp/download/buildtools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --buildtools --arch=$__HaikuArch)" unzip -o "$__RootfsDir/tmp/download/buildtools.zip" -d "$__RootfsDir" # Cleaning up temporary files @@ -629,10 +642,12 @@ elif [[ -n "$__CodeName" ]]; then __Keyring="$__Keyring --force-check-gpg" fi + # shellcheck disable=SC2086 debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list" chroot "$__RootfsDir" apt-get update chroot "$__RootfsDir" apt-get -f -y install + # shellcheck disable=SC2086 chroot "$__RootfsDir" apt-get -y install $__UbuntuPackages chroot "$__RootfsDir" symlinks -cr /usr chroot "$__RootfsDir" apt-get clean @@ -650,6 +665,5 @@ elif [[ "$__Tizen" == "tizen" ]]; then ROOTFS_DIR="$__RootfsDir" "$__CrossDir/tizen-build-rootfs.sh" "$__BuildArch" else echo "Unsupported target platform." - usage; - exit 1 + usage fi diff --git a/global.json b/global.json index cc7acce58c3..35f9db179cf 100644 --- a/global.json +++ b/global.json @@ -14,9 +14,9 @@ "version": "9.0.100-preview.1.24101.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24207.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24207.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24207.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24208.8", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24208.8", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24208.8", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24204.3" }, From ea8b2140cf6a04c03a709e865dd439ea29cbee28 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Tue, 9 Apr 2024 08:58:25 -0700 Subject: [PATCH 17/21] Fix TableLayoutSettings.StyleConverter trim warnings (#11176) `[DynamicallyAccessedMembers(PublicConstructors)]` on `TableLayoutStyle` will treat the return value of `this.GetType()` inside of methods on the type as satisfying `PublicConstructors`, which is required by the `GetConstructor` call. The helper method is needed because trim analysis doesn't treat `style.GetType()` the same way. See https://github.com/dotnet/runtime/issues/100786. --- .../TableLayoutPanel/TableLayoutSettings.StyleConverter.cs | 6 +++--- .../Forms/Panels/TableLayoutPanel/TableLayoutStyle.cs | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.StyleConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.StyleConverter.cs index 9bf5884aceb..6fdd7d5471f 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.StyleConverter.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutSettings.StyleConverter.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using System.ComponentModel; @@ -29,12 +29,12 @@ public override bool CanConvertTo(ITypeDescriptorContext? context, Type? destina { case SizeType.AutoSize: return new InstanceDescriptor( - style.GetType().GetConstructor([]), + style.GetTypeWithConstructor().GetConstructor([]), Array.Empty()); case SizeType.Absolute: case SizeType.Percent: return new InstanceDescriptor( - style.GetType().GetConstructor([typeof(SizeType), typeof(int)]), + style.GetTypeWithConstructor().GetConstructor([typeof(SizeType), typeof(int)]), new object[] { style.SizeType, style.Size }); default: break; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutStyle.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutStyle.cs index 5604abbcde1..4a88f268138 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutStyle.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Panels/TableLayoutPanel/TableLayoutStyle.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using System.ComponentModel; @@ -7,6 +7,7 @@ namespace System.Windows.Forms; [TypeConverter(typeof(TableLayoutSettings.StyleConverter))] +[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] public abstract class TableLayoutStyle { private IArrangedElement? _owner; @@ -73,4 +74,8 @@ internal void SetSize(float size) Debug.Assert(size >= 0); _size = size; } + + // Workaround for https://github.com/dotnet/runtime/issues/100786 + [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] + internal Type GetTypeWithConstructor() => this.GetType(); } From 3f357c440bd749318328c890f510bb1244740fbe Mon Sep 17 00:00:00 2001 From: v-zhgl <38325459+Zheng-Li01@users.noreply.github.com> Date: Tue, 9 Apr 2024 16:12:55 +0000 Subject: [PATCH 18/21] Add code coverage for MonthCalendar (#11149) * Add code coverage for MonthCalendar * Add blank line * Handle FeedBacks * Handle FeedBacks --- .../MonthCalendar.DateBoldEventArgsTests.cs | 44 +++++ ...thCalendar.SelectionRangeConverterTests.cs | 167 ++++++++++++++++++ .../Windows/Forms/MonthCalendarTests.cs | 12 ++ 3 files changed, 223 insertions(+) create mode 100644 src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendar.DateBoldEventArgsTests.cs create mode 100644 src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendar.SelectionRangeConverterTests.cs diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendar.DateBoldEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendar.DateBoldEventArgsTests.cs new file mode 100644 index 00000000000..11bbdf6ae35 --- /dev/null +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendar.DateBoldEventArgsTests.cs @@ -0,0 +1,44 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace System.Windows.Forms.Tests; + +public class MonthCalendar_DateBoldEventArgsTests +{ + public static readonly TheoryData s_dateBoldEventArgs_Constructor_InitializesPropertiesCorrectly_Data = new() + { + { DateTime.UtcNow, 5 }, + { DateTime.UtcNow.AddDays(-1), 10 }, + { DateTime.UtcNow.AddDays(1), 0 } + }; + + [WinFormsTheory] + [MemberData(nameof(s_dateBoldEventArgs_Constructor_InitializesPropertiesCorrectly_Data))] + public void DateBoldEventArgs_Constructor_InitializesPropertiesCorrectly(DateTime startDate, int size) + { + DateBoldEventArgs eventArgs = new(startDate, size); + + eventArgs.StartDate.Should().Be(startDate); + eventArgs.Size.Should().Be(size); + } + + public static readonly TheoryData s_daysToBold_GetSetWorksCorrectly_Data = new() + { + { new int[] {1, 2, 3, 4, 5} }, + { Array.Empty() }, + { new int[] {-1, -2, -3} }, + { null } + }; + + [WinFormsTheory] + [MemberData(nameof(s_daysToBold_GetSetWorksCorrectly_Data))] + public void DateBoldEventArgs_DaysToBold_GetSetWorksCorrectly(int[] value) + { + DateBoldEventArgs eventArgs = new(DateTime.UtcNow, 5) + { + DaysToBold = value + }; + + eventArgs.DaysToBold.Should().Equal(value); + } +} diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendar.SelectionRangeConverterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendar.SelectionRangeConverterTests.cs new file mode 100644 index 00000000000..fb93f5d32e4 --- /dev/null +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendar.SelectionRangeConverterTests.cs @@ -0,0 +1,167 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Collections; +using System.ComponentModel; +using System.ComponentModel.Design.Serialization; +using System.Globalization; + +namespace System.Windows.Forms.Tests; + +public class MonthCalendar_SelectionRangeConverterTests +{ + private readonly SelectionRange _range = new(new DateTime(2022, 1, 1), new DateTime(2022, 12, 31)); + + private readonly SelectionRangeConverter _converter; + + public MonthCalendar_SelectionRangeConverterTests() + { + _converter = new SelectionRangeConverter(); + } + + private static IDictionary CreatePropertyValues(object start, object end) => new Dictionary + { + { "Start", start }, + { "End", end } + }; + + [WinFormsTheory] + [InlineData(typeof(string), true)] + [InlineData(typeof(DateTime), true)] + [InlineData(typeof(int), false)] + public void CanConvertFrom_ReturnsExpected(Type type, bool expected) + { + _converter.CanConvertFrom(null, type).Should().Be(expected); + } + + [WinFormsTheory] + [InlineData(typeof(InstanceDescriptor), true)] + [InlineData(typeof(DateTime), true)] + [InlineData(typeof(int), false)] + public void CanConvertTo_ReturnsExpected(Type type, bool expected) + { + _converter.CanConvertTo(null, type).Should().Be(expected); + } + + [WinFormsTheory] + [InlineData("2022-01-01, 2022-12-31", "2022-01-01", "2022-12-31")] + [InlineData("2022-01-01", "2022-01-01", "2022-01-01")] + public void ConvertFromString_ReturnsCorrectSelectionRange(string value, string expectedStart, string expectedEnd) + { + if (!value.Contains(',')) + { + // If not, append a comma and the same date to make it a range + value += $", {value}"; + } + + SelectionRange range = (SelectionRange)_converter.ConvertFrom(null, CultureInfo.InvariantCulture, value); + + range.Start.Should().Be(DateTime.Parse(expectedStart)); + range.End.Should().Be(DateTime.Parse(expectedEnd)); + } + + [WinFormsFact] + public void ConvertFromDateTime_ReturnsSelectionRangeWithSameStartAndEnd() + { + DateTime value = new(2022, 1, 1); + SelectionRange range = (SelectionRange)_converter.ConvertFrom(null, CultureInfo.InvariantCulture, value); + + range.Start.Should().Be(value); + range.End.Should().Be(value); + } + + [WinFormsFact] + public void ConvertFromInvalidString_ThrowsArgumentException() + { + string value = "invalid"; + Action act = () => _converter.ConvertFrom(null, CultureInfo.InvariantCulture, value); + + act.Should().Throw(); + } + + public static readonly TheoryData s_convertToData = new() + { + { "2022-01-01, 2022-12-31", typeof(string), "2022-01-01, 2022-12-31" }, + { "2022-01-01", typeof(DateTime), new DateTime(2022, 1, 1) } + }; + + [WinFormsTheory] + [MemberData(nameof(s_convertToData))] + public void ConvertTo_ReturnsExpected(string dateValue, Type targetType, object expected) + { + string[] dates = dateValue.Split(','); + DateTime start = DateTime.Parse(dates[0]); + DateTime end = dates.Length > 1 ? DateTime.Parse(dates[1]) : start; + SelectionRange range = new(start, end); + + object result = _converter.ConvertTo(null, CultureInfo.InvariantCulture, range, targetType); + + result.Should().Be(expected); + } + + [WinFormsFact] + public void ConvertTo_InstanceDescriptor_ReturnsCorrectInstanceDescriptor() + { + InstanceDescriptor descriptor = (InstanceDescriptor)_converter.ConvertTo(null, CultureInfo.InvariantCulture, _range, typeof(InstanceDescriptor)); + SelectionRange result = (SelectionRange)descriptor.Invoke(); + + result.Start.Should().Be(new DateTime(2022, 1, 1)); + result.End.Should().Be(new DateTime(2022, 12, 31)); + } + + [WinFormsFact] + public void ConvertTo_UnsupportedType_ThrowsNotSupportedException() + { + Action act = () => _converter.ConvertTo(null, CultureInfo.InvariantCulture, _range, typeof(int)); + + act.Should().Throw(); + } + + public static readonly TheoryData s_test_TheoryData = new() + { + { "invalid", new DateTime(2022, 12, 31) }, + { null, new DateTime(2022, 12, 31) }, + { new DateTime(2022, 1, 1), new DateTime(2022, 12, 31) } + }; + + [WinFormsTheory] + [MemberData(nameof(s_test_TheoryData))] + public void CreateInstance_InvalidStart_ReturnExcepted(object startDate, object endDate) + { + IDictionary propertyValues = CreatePropertyValues(startDate, endDate); + Func func = () => (SelectionRange)_converter.CreateInstance(null, propertyValues); + if (startDate is not DateTime startTime || endDate is not DateTime endTime) + { + func.Should().Throw(); + } + else + { + SelectionRange range = func(); + range.Start.Should().Be(startTime); + range.End.Should().Be(endTime); + } + } + + [WinFormsFact] + public void GetCreateInstanceSupported_ReturnsTrue() + { + _converter.GetCreateInstanceSupported(context: null).Should().BeTrue(); + } + + [WinFormsFact] + public void GetProperties_ReturnsCorrectProperties() + { + SelectionRange range = new SelectionRange(DateTime.Now, DateTime.Now.AddDays(1)); + PropertyDescriptorCollection props = _converter.GetProperties(null, range, null); + + props.Count.Should().Be(2); + props[0].Name.Should().Be("Start"); + props[1].Name.Should().Be("End"); + } + + [WinFormsFact] + public void GetPropertiesSupported_ReturnsTrue() + { + _converter.GetPropertiesSupported(context: null).Should().BeTrue(); + } +} diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendarTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendarTests.cs index 1b15fc8cfde..5b2250639a1 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendarTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendarTests.cs @@ -4241,6 +4241,18 @@ public unsafe void MonthCalendar_GetIndexInMonths_ReturnsExpected(DateTime curre Assert.Equal(expectedIndex, actualIndex); } + [WinFormsFact] + public void SelectionRange_CopyConstructor_CopiesStartAndEndDatesCorrectly() + { + DateTime startDate = new(2023, 1, 1); + DateTime endDate = new(2023, 12, 31); + SelectionRange originalRange = new(startDate, endDate); + SelectionRange copiedRange = new(originalRange); + + copiedRange.Start.Should().Be(startDate); + copiedRange.End.Should().Be(endDate); + } + private class SubMonthCalendar : MonthCalendar { public new bool CanEnableIme => base.CanEnableIme; From 1facc7c59758b7bb759d2420dd765e938946bf42 Mon Sep 17 00:00:00 2001 From: Lakshan Fernando Date: Tue, 9 Apr 2024 15:07:34 -0700 Subject: [PATCH 19/21] Remove an unnecessary new line --- .../Controls/TextBox/TextBoxAutoCompleteSourceConverter.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/TextBox/TextBoxAutoCompleteSourceConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/TextBox/TextBoxAutoCompleteSourceConverter.cs index 5631fadffd3..b270d8f4350 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/TextBox/TextBoxAutoCompleteSourceConverter.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/TextBox/TextBoxAutoCompleteSourceConverter.cs @@ -7,8 +7,7 @@ namespace System.Windows.Forms; internal class TextBoxAutoCompleteSourceConverter : EnumConverter { - public TextBoxAutoCompleteSourceConverter( - Type type) : base(type) + public TextBoxAutoCompleteSourceConverter(Type type) : base(type) { } From 9313f05e84328c3176eb7d80497c9505cd8aaebf Mon Sep 17 00:00:00 2001 From: Loni Tra Date: Tue, 9 Apr 2024 15:37:50 -0700 Subject: [PATCH 20/21] Add New Trim Project (#11182) add trim project for another scenario --- Winforms.sln | 19 ++ .../Form1.Designer.cs | 72 ++++++++ .../TrimTestBinaryDeserialization/Form1.cs | 13 ++ .../TrimTestBinaryDeserialization/Form1.resx | 166 ++++++++++++++++++ .../TrimTestBinaryDeserialization/Program.cs | 16 ++ .../TrimTestBinaryDeserialization.csproj | 26 +++ .../TrimTestBinaryDeserialization/readme.txt | 1 + 7 files changed, 313 insertions(+) create mode 100644 src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Form1.Designer.cs create mode 100644 src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Form1.cs create mode 100644 src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Form1.resx create mode 100644 src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Program.cs create mode 100644 src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/TrimTestBinaryDeserialization.csproj create mode 100644 src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/readme.txt diff --git a/Winforms.sln b/Winforms.sln index 8e684b908d2..54eeb04ddea 100644 --- a/Winforms.sln +++ b/Winforms.sln @@ -175,6 +175,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScratchProjectWithInternals EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComDisabled.Tests", "src\System.Windows.Forms\tests\ComDisabledTests\ComDisabled.Tests.csproj", "{55F3174F-C1FE-4C8F-AF71-2512630088F8}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrimTestBinaryDeserialization", "src\System.Windows.Forms\tests\IntegrationTests\TrimTestBinaryDeserialization\TrimTestBinaryDeserialization.csproj", "{CFBCC732-C988-4FE7-A21B-98A142365374}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -963,6 +965,22 @@ Global {55F3174F-C1FE-4C8F-AF71-2512630088F8}.Release|x64.Build.0 = Release|Any CPU {55F3174F-C1FE-4C8F-AF71-2512630088F8}.Release|x86.ActiveCfg = Release|Any CPU {55F3174F-C1FE-4C8F-AF71-2512630088F8}.Release|x86.Build.0 = Release|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Debug|arm64.ActiveCfg = Debug|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Debug|arm64.Build.0 = Debug|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Debug|x64.ActiveCfg = Debug|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Debug|x64.Build.0 = Debug|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Debug|x86.ActiveCfg = Debug|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Debug|x86.Build.0 = Debug|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Release|Any CPU.Build.0 = Release|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Release|arm64.ActiveCfg = Release|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Release|arm64.Build.0 = Release|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Release|x64.ActiveCfg = Release|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Release|x64.Build.0 = Release|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Release|x86.ActiveCfg = Release|Any CPU + {CFBCC732-C988-4FE7-A21B-98A142365374}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1025,6 +1043,7 @@ Global {BA61D5A8-29E9-41AA-A3FA-B7F0A7F9A191} = {680FB14C-7B0C-4D63-9F1A-18ACCDB0F52A} {61376D2A-4AD5-48F4-BF99-2BB630E21945} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7} {55F3174F-C1FE-4C8F-AF71-2512630088F8} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC} + {CFBCC732-C988-4FE7-A21B-98A142365374} = {680FB14C-7B0C-4D63-9F1A-18ACCDB0F52A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7B1B0433-F612-4E5A-BE7E-FCF5B9F6E136} diff --git a/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Form1.Designer.cs b/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Form1.Designer.cs new file mode 100644 index 00000000000..6e9edb654b6 --- /dev/null +++ b/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Form1.Designer.cs @@ -0,0 +1,72 @@ +namespace TrimTestBinaryDeserialization +{ + partial class Form1 + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); + ListViewItem listViewItem1 = new ListViewItem("This is a ListViewItem with an image", 0); + imageList1 = new ImageList(components); + listView1 = new ListView(); + SuspendLayout(); + // + // imageList1 + // + imageList1.ColorDepth = ColorDepth.Depth32Bit; + imageList1.ImageStream = (ImageListStreamer)resources.GetObject("imageList1.ImageStream"); + imageList1.TransparentColor = Color.Transparent; + imageList1.Images.SetKeyName(0, "dotnet.png"); + // + // listView1 + // + listView1.Items.AddRange(new ListViewItem[] { listViewItem1 }); + listView1.LargeImageList = imageList1; + listView1.Location = new Point(0, 0); + listView1.Name = "listView1"; + listView1.Size = new Size(269, 139); + listView1.TabIndex = 0; + listView1.UseCompatibleStateImageBehavior = false; + listView1.View = View.Tile; + // + // Form1 + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(listView1); + Name = "Form1"; + Text = "Form1"; + ResumeLayout(false); + } + + #endregion + + private ImageList imageList1; + private ListView listView1; + } +} diff --git a/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Form1.cs b/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Form1.cs new file mode 100644 index 00000000000..200073a0e3e --- /dev/null +++ b/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Form1.cs @@ -0,0 +1,13 @@ +using System.ComponentModel; + +namespace TrimTestBinaryDeserialization +{ + [DesignerCategory("Default")] + public partial class Form1 : Form + { + public Form1() + { + InitializeComponent(); + } + } +} diff --git a/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Form1.resx b/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Form1.resx new file mode 100644 index 00000000000..b7df8937774 --- /dev/null +++ b/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Form1.resx @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs + LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu + SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAeAgAAAJNU0Z0AUkBTAMBAQAB + CAEAAQgBAAEQAQABEAEABP8BIQEACP8BQgFNATYHAAE2AwABKAMAAUADAAEQAwABAQEAASAGAAEQEgAB + 0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B/wHSASkBTwH/AdMBKgFQAf8B0gEpAU8B/wHSASkB + TwH/AdIBKQFPAf8B0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B/wHTASoBUAH/AdIBKQFPAf8B + 0gEpAU8B/8AAAdIBKQFPAf8B0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B/wHTASoBUAH/AdIB + KQFPAf8B0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0wEqAVAB + /wHSASkBTwH/AdIBKQFPAf/AAAHTASoBUAH/AdMBKgFQAf8B0wEqAVAB/wHTASoBUAH/AdMBKgFQAf8B + 1AErAVEB/wHTASoBUAH/AdMBKgFQAf8B0wEqAVAB/wHTASoBUAH/AdMBKgFQAf8B0wEqAVAB/wHTASoB + UAH/AdQBKwFRAf8B0wEqAVAB/wHTASoBUAH/wAAB0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B + /wHSASkBTwH/AdMBKgFQAf8B0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B/wHSASkBTwH/AdIB + KQFPAf8B0gEpAU8B/wHTASoBUAH/AdIBKQFPAf8B0gEpAU8B/8AAAdIBKQFPAf8B0gEpAU8B/wHSASkB + TwH/AdIBKQFPAf8B0gEpAU8B/wHTASoBUAH/AdIBKQFPAf8B0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B + 0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0wEqAVAB/wHSASkBTwH/AdIBKQFPAf/AAAHSASkBTwH/AdIB + KQFPAf8B0gEqAU8B/wH2Ad4B4wH/AfUB0wHbAf8B0wEqAVAB/wHSASoBTwH/AfgB6AHsAf8B0AEWAUQB + /wH4AeMB6QH/AfgB4wHpAf8B0gEpAU8B/wHzAdAB2QH/AdMBKgFQAf8B0gEpAU8B/wHSASkBTwH/wAAB + 0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0wEqAVAB/wH6AeUB7AH/AdMBKgFQAf8B+QHpAe0B/wH+A/8B + zwEPATkB/wHTASwBUgH/AdIBKQFPAf8B0gEpAU8B/wH6AeIB5wH/AdMBKgFQAf8B0gEpAU8B/wHSASkB + TwH/wAAB0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B/wH6AeUB6QH/AdEBJAFMAf8B3wFnAYEB + /wH+A/8BzwEOATkB/wP+Av8B/gL/AdIBKQFPAf8B+gHiAecB/wHTASoBUAH/AdIBKQFPAf8B0gEpAU8B + /8AAAdIBKQFPAf8B0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B+gHlAewB/wP9Af8B0gEpAU8B/wH+A/8B + zwEPATkB/wHTASwBUgH/AdIBKgFQAf8B0gEqAVAB/wH6AeIB5wH/AdMBKwFRAf8B0gEpAU8B/wHSASkB + TwH/wAAB0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B/wH0AcUBzwH/AdIBKgFQAf8B0gEpAU8B + /wH3AdoB4QH/AdABEgE9Af8B9wHTAdsB/wH3AdEB2QH/AfcB0wHbAf8B9wHTAdsB/wH3AdQB3AH/AdIB + KAFOAf8B0gEpAU8B/8AAAdMBKgFQAf8B0wEqAVAB/wHTASoBUAH/AdMBKgFQAf8B0wEqAVAB/wHUASsB + UQH/AdMBKgFQAf8B0wEqAVAB/wHTASoBUAH/AdMBKgFQAf8B0wEqAVAB/wHTASoBUAH/AdMBKgFQAf8B + 1AErAVEB/wHTASoBUAH/AdMBKgFQAf/AAAHSASkBTwH/AdIBKQFPAf8B0gEpAU8B/wHSASkBTwH/AdIB + KQFPAf8B0wEqAVAB/wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B + /wHSASkBTwH/AdMBKgFQAf8B0gEpAU8B/wHSASkBTwH/wAAB0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B + 0gEpAU8B/wHSASkBTwH/AdMBKgFQAf8B0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B/wHSASkB + TwH/AdIBKQFPAf8B0gEpAU8B/wHTASoBUAH/AdIBKQFPAf8B0gEpAU8B/8AAAdIBKQFPAf8B0gEpAU8B + /wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B/wHTASoBUAH/AdIBKQFPAf8B0gEpAU8B/wHSASkBTwH/AdIB + KQFPAf8B0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0wEqAVAB/wHSASkBTwH/AdIBKQFPAf/AAAHSASkB + TwH/AdIBKQFPAf8B0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0wEqAVAB/wHSASkBTwH/AdIBKQFPAf8B + 0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B/wHSASkBTwH/AdMBKgFQAf8B0gEpAU8B/wHSASkB + TwH/wAAB0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B/wHSASkBTwH/AdMBKgFQAf8B0gEpAU8B + /wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B/wHSASkBTwH/AdIBKQFPAf8B0gEpAU8B/wHTASoBUAH/AdIB + KQFPAf8B0gEpAU8B/8AAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/+BAAs= + + + \ No newline at end of file diff --git a/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Program.cs b/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Program.cs new file mode 100644 index 00000000000..fa98acd98d7 --- /dev/null +++ b/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/Program.cs @@ -0,0 +1,16 @@ +namespace TrimTestBinaryDeserialization +{ + internal static class Program + { + /// + /// The main entry point for the application. + /// + [STAThread] + public static void Main() + { + Application.EnableVisualStyles(); + Application.SetHighDpiMode(HighDpiMode.PerMonitorV2); + Application.Run(new Form1()); + } + } +} diff --git a/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/TrimTestBinaryDeserialization.csproj b/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/TrimTestBinaryDeserialization.csproj new file mode 100644 index 00000000000..5047df86f5e --- /dev/null +++ b/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/TrimTestBinaryDeserialization.csproj @@ -0,0 +1,26 @@ + + + + WinExe + enable + WinExe + enable + true + + false + false + false + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/readme.txt b/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/readme.txt new file mode 100644 index 00000000000..219a491db5a --- /dev/null +++ b/src/System.Windows.Forms/tests/IntegrationTests/TrimTestBinaryDeserialization/readme.txt @@ -0,0 +1 @@ +This project is meant as a scenario for testing and adding trimming support. \ No newline at end of file From 2874fa355300019b97097c4c668b25fc003befb5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 12:37:11 +0000 Subject: [PATCH 21/21] [main] Update dependencies from dotnet/arcade (#11192) [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 4d39b763b1f..b0e7dcd0bd4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -183,29 +183,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p - + https://github.com/dotnet/arcade - a4f367bfa9602e4c24f509902285176fa3153a64 + 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 - + https://github.com/dotnet/arcade - a4f367bfa9602e4c24f509902285176fa3153a64 + 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 - + https://github.com/dotnet/arcade - a4f367bfa9602e4c24f509902285176fa3153a64 + 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 - + https://github.com/dotnet/arcade - a4f367bfa9602e4c24f509902285176fa3153a64 + 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 - + https://github.com/dotnet/arcade - a4f367bfa9602e4c24f509902285176fa3153a64 + 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 - + https://github.com/dotnet/arcade - a4f367bfa9602e4c24f509902285176fa3153a64 + 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 diff --git a/eng/Versions.props b/eng/Versions.props index 1b6b92e10ad..c29245579eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,9 +54,9 @@ - 9.0.0-beta.24208.8 - 9.0.0-beta.24208.8 - 9.0.0-beta.24208.8 + 9.0.0-beta.24209.3 + 9.0.0-beta.24209.3 + 9.0.0-beta.24209.3 17.4.0-preview-20220707-01 diff --git a/global.json b/global.json index 35f9db179cf..a53eb19301b 100644 --- a/global.json +++ b/global.json @@ -14,9 +14,9 @@ "version": "9.0.100-preview.1.24101.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24208.8", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24208.8", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24208.8", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24209.3", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24209.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24209.3", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24204.3" },