From e0ce6a96964725c705c797faee14e5a20d34468f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 16 Jul 2025 08:54:30 +0000 Subject: [PATCH 1/4] Initial plan From ea611b2b72fd5d56ffeb33cf532b97ba98393f85 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 16 Jul 2025 09:17:22 +0000 Subject: [PATCH 2/4] Remove individual ILLink.Descriptors.xml and consolidate into global xunit descriptor Co-authored-by: akoeplinger <1376924+akoeplinger@users.noreply.github.com> --- eng/testing/ILLink.Descriptor.xunit.xml | 3 +++ .../Microsoft.CSharp/tests/ILLink.Descriptors.xml | 7 ------- .../Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 src/libraries/Microsoft.CSharp/tests/ILLink.Descriptors.xml diff --git a/eng/testing/ILLink.Descriptor.xunit.xml b/eng/testing/ILLink.Descriptor.xunit.xml index 78ee4cddc3246a..6ab8003bbec88f 100644 --- a/eng/testing/ILLink.Descriptor.xunit.xml +++ b/eng/testing/ILLink.Descriptor.xunit.xml @@ -16,6 +16,9 @@ + + + diff --git a/src/libraries/Microsoft.CSharp/tests/ILLink.Descriptors.xml b/src/libraries/Microsoft.CSharp/tests/ILLink.Descriptors.xml deleted file mode 100644 index b438257bdcaac9..00000000000000 --- a/src/libraries/Microsoft.CSharp/tests/ILLink.Descriptors.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj index c180a1efa25146..560b908e3c42d6 100644 --- a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj +++ b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj @@ -11,7 +11,6 @@ true - From 3730f6069efa9f62da0eef0f2f4a5c248cfff8f3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 16 Jul 2025 10:57:19 +0000 Subject: [PATCH 3/4] Fix dynamic binding issue in Microsoft.CSharp tests by casting dynamic parameter to object Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com> --- eng/testing/ILLink.Descriptor.xunit.xml | 3 --- src/libraries/Microsoft.CSharp/tests/AssignmentTests.cs | 2 +- .../Microsoft.CSharp/tests/ILLink.Descriptors.xml | 7 +++++++ .../Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 src/libraries/Microsoft.CSharp/tests/ILLink.Descriptors.xml diff --git a/eng/testing/ILLink.Descriptor.xunit.xml b/eng/testing/ILLink.Descriptor.xunit.xml index 6ab8003bbec88f..78ee4cddc3246a 100644 --- a/eng/testing/ILLink.Descriptor.xunit.xml +++ b/eng/testing/ILLink.Descriptor.xunit.xml @@ -16,9 +16,6 @@ - - - diff --git a/src/libraries/Microsoft.CSharp/tests/AssignmentTests.cs b/src/libraries/Microsoft.CSharp/tests/AssignmentTests.cs index 1c9d3fc784cadb..db59578a9babaf 100644 --- a/src/libraries/Microsoft.CSharp/tests/AssignmentTests.cs +++ b/src/libraries/Microsoft.CSharp/tests/AssignmentTests.cs @@ -83,7 +83,7 @@ public void AddAssignment(dynamic lhs, dynamic rhs, object expected) { lhs += rhs; Assert.Equal(expected, lhs); - Assert.IsType(expected.GetType(), lhs); + Assert.IsType(expected.GetType(), (object)lhs); } [Theory, MemberData(nameof(PropertyAdditions))] diff --git a/src/libraries/Microsoft.CSharp/tests/ILLink.Descriptors.xml b/src/libraries/Microsoft.CSharp/tests/ILLink.Descriptors.xml new file mode 100644 index 00000000000000..b438257bdcaac9 --- /dev/null +++ b/src/libraries/Microsoft.CSharp/tests/ILLink.Descriptors.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj index 560b908e3c42d6..c180a1efa25146 100644 --- a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj +++ b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj @@ -11,6 +11,7 @@ true + From f6515c21f647bf2db38a935df81d2b45460e1d29 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 16 Jul 2025 11:43:14 +0000 Subject: [PATCH 4/4] Remove unnecessary ILLink descriptor since dynamic binding issue was fixed with cast Co-authored-by: MichalStrehovsky <13110571+MichalStrehovsky@users.noreply.github.com> --- .../Microsoft.CSharp/tests/ILLink.Descriptors.xml | 7 ------- .../Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj | 1 - 2 files changed, 8 deletions(-) delete mode 100644 src/libraries/Microsoft.CSharp/tests/ILLink.Descriptors.xml diff --git a/src/libraries/Microsoft.CSharp/tests/ILLink.Descriptors.xml b/src/libraries/Microsoft.CSharp/tests/ILLink.Descriptors.xml deleted file mode 100644 index b438257bdcaac9..00000000000000 --- a/src/libraries/Microsoft.CSharp/tests/ILLink.Descriptors.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj index c180a1efa25146..560b908e3c42d6 100644 --- a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj +++ b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj @@ -11,7 +11,6 @@ true -