From e79a5cbf2402e917d749b52003cdf1e52a4c6dc0 Mon Sep 17 00:00:00 2001 From: Charles Stoner <10732005+cston@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:54:19 -0700 Subject: [PATCH 1/5] Update field references in property accessors --- src/tools/illink/test/ILLink.Tasks.Tests/Mock.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/illink/test/ILLink.Tasks.Tests/Mock.cs b/src/tools/illink/test/ILLink.Tasks.Tests/Mock.cs index 9a640c05b9f4ca..9b8d10c6fde127 100644 --- a/src/tools/illink/test/ILLink.Tasks.Tests/Mock.cs +++ b/src/tools/illink/test/ILLink.Tasks.Tests/Mock.cs @@ -37,8 +37,8 @@ public MockDriver CreateDriver () public static string[] OptimizationNames { get { - var field = typeof (ILLink).GetField ("_optimizationNames", BindingFlags.NonPublic | BindingFlags.Static); - return (string[]) field.GetValue (null); + var fieldInfo = typeof (ILLink).GetField ("_optimizationNames", BindingFlags.NonPublic | BindingFlags.Static); + return (string[]) fieldInfo.GetValue (null); } } From 7ab488b44dff869c8e60e13b8dc3ff5f095ff7d5 Mon Sep 17 00:00:00 2001 From: Charles Stoner <10732005+cston@users.noreply.github.com> Date: Tue, 1 Oct 2024 20:21:00 -0700 Subject: [PATCH 2/5] Update field references --- .../Reflection/MemberUsedViaReflection.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/MemberUsedViaReflection.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/MemberUsedViaReflection.cs index 9ddc8fa45debe4..212bdadf0bbce5 100644 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/MemberUsedViaReflection.cs +++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/MemberUsedViaReflection.cs @@ -144,9 +144,9 @@ private class SimpleType [Kept] public int memberKept { [Kept] - get { return field; } + get { return this.field; } [Kept] - set { field = value; } + set { this.field = value; } } [Kept] @@ -508,4 +508,4 @@ public static class PrefixLookupNestedType { } private static class PrefixLookupPrivateNestedType { } } } -} \ No newline at end of file +} From 6c66d20138318cdde5cc270d1d921adb97633c6d Mon Sep 17 00:00:00 2001 From: Charles Stoner <10732005+cston@users.noreply.github.com> Date: Tue, 1 Oct 2024 20:33:39 -0700 Subject: [PATCH 3/5] Use @ --- .../Reflection/MemberUsedViaReflection.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/MemberUsedViaReflection.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/MemberUsedViaReflection.cs index 212bdadf0bbce5..ba17ad6b8147f4 100644 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/MemberUsedViaReflection.cs +++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/MemberUsedViaReflection.cs @@ -144,9 +144,9 @@ private class SimpleType [Kept] public int memberKept { [Kept] - get { return this.field; } + get { return @field; } [Kept] - set { this.field = value; } + set { @field = value; } } [Kept] From bd68aecba3a61c2955214bf5a5dfdaa9bd5d7310 Mon Sep 17 00:00:00 2001 From: Charles Stoner <10732005+cston@users.noreply.github.com> Date: Wed, 2 Oct 2024 06:52:15 -0700 Subject: [PATCH 4/5] Rename field --- .../Reflection/MemberUsedViaReflection.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/MemberUsedViaReflection.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/MemberUsedViaReflection.cs index ba17ad6b8147f4..0a33e4e81e9d84 100644 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/MemberUsedViaReflection.cs +++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/Reflection/MemberUsedViaReflection.cs @@ -139,14 +139,14 @@ static void TestIfElse (bool decision) private class SimpleType { [Kept] - public static int field; + public static int fieldKept; [Kept] public int memberKept { [Kept] - get { return @field; } + get { return fieldKept; } [Kept] - set { @field = value; } + set { fieldKept = value; } } [Kept] From 71800683e5c0480253b2e9c200bd102e6b04785c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Oct 2024 12:25:16 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/roslyn build 20240930.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-3.24479.1 -> To Version 4.12.0-3.24480.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07e757dd1eddcd..9ad93d6b760248 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -352,17 +352,17 @@ https://github.com/dotnet/runtime-assets 3e7dcac0d1e416192f0e24e7acaa1e3449de270e - + https://github.com/dotnet/roslyn - 1ed3c1b184f9da5b9f71097672b63edb00858fad + be06af6a5e6472352531da4bb5ae2a6f7ccd6353 - + https://github.com/dotnet/roslyn - 1ed3c1b184f9da5b9f71097672b63edb00858fad + be06af6a5e6472352531da4bb5ae2a6f7ccd6353 - + https://github.com/dotnet/roslyn - 1ed3c1b184f9da5b9f71097672b63edb00858fad + be06af6a5e6472352531da4bb5ae2a6f7ccd6353 https://github.com/dotnet/roslyn-analyzers @@ -373,9 +373,9 @@ f4c8475010cbc3d5956c99c1f2c2d49c03c5871b - + https://github.com/dotnet/roslyn - 1ed3c1b184f9da5b9f71097672b63edb00858fad + be06af6a5e6472352531da4bb5ae2a6f7ccd6353 diff --git a/eng/Versions.props b/eng/Versions.props index 9b177122ea2f37..80ce0f2db99cb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,9 +43,9 @@ Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure they do not break the local dev experience. --> - 4.12.0-3.24476.1 - 4.12.0-3.24476.1 - 4.12.0-3.24476.1 + 4.12.0-3.24480.5 + 4.12.0-3.24480.5 + 4.12.0-3.24480.5