From de996ab30cbc7c87348251b67fb54871051ceba1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Jul 2023 12:38:03 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20230720.3 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.23361.2 -> To Version 7.0.0-beta.23370.3 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4289eb7eae..4392584517 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ - + https://github.com/dotnet/arcade - cae11bc40b691f546d788f7ab37f7eaf0e24ded8 + c9c125ccc43361cd94433c2d7f7069d465ad11a5 diff --git a/global.json b/global.json index 2883a0c12c..b2e81dedab 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "7.0.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23361.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23370.3" } } From 6afa82ad629eb819dc75ab89a9a6cc0162e2147c Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 31 Jul 2023 02:00:06 -0700 Subject: [PATCH 2/4] Fix the code line that violate rule --- src/Microsoft.TemplateEngine.Utils/ListExtensions.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Microsoft.TemplateEngine.Utils/ListExtensions.cs b/src/Microsoft.TemplateEngine.Utils/ListExtensions.cs index bdf6562137..3d6d22538f 100644 --- a/src/Microsoft.TemplateEngine.Utils/ListExtensions.cs +++ b/src/Microsoft.TemplateEngine.Utils/ListExtensions.cs @@ -59,7 +59,9 @@ public ValueWrapper(T val) public T Val { get; private set; } +#pragma warning disable IDE0251 // Make member 'readonly' public override bool Equals(object obj) +#pragma warning restore IDE0251 // Make member 'readonly' { return obj is ValueWrapper v && Equals(Val, v.Val); } From f487b575b0cb7d82b826441ed57ea7ec532509fe Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 31 Jul 2023 02:08:00 -0700 Subject: [PATCH 3/4] Fix --- src/Microsoft.TemplateEngine.Utils/ListExtensions.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Microsoft.TemplateEngine.Utils/ListExtensions.cs b/src/Microsoft.TemplateEngine.Utils/ListExtensions.cs index 3d6d22538f..3e111e65cd 100644 --- a/src/Microsoft.TemplateEngine.Utils/ListExtensions.cs +++ b/src/Microsoft.TemplateEngine.Utils/ListExtensions.cs @@ -66,7 +66,9 @@ public override bool Equals(object obj) return obj is ValueWrapper v && Equals(Val, v.Val); } +#pragma warning disable IDE0251 // Make member 'readonly' public override int GetHashCode() +#pragma warning restore IDE0251 // Make member 'readonly' { return Val?.GetHashCode() ?? 0; } From 2cb6305f760c72ef177d83fd5efe003bd314c7d3 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 31 Jul 2023 22:48:36 -0700 Subject: [PATCH 4/4] Set members to readonly --- src/Microsoft.TemplateEngine.Utils/ListExtensions.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.TemplateEngine.Utils/ListExtensions.cs b/src/Microsoft.TemplateEngine.Utils/ListExtensions.cs index 3e111e65cd..e587668f82 100644 --- a/src/Microsoft.TemplateEngine.Utils/ListExtensions.cs +++ b/src/Microsoft.TemplateEngine.Utils/ListExtensions.cs @@ -59,16 +59,12 @@ public ValueWrapper(T val) public T Val { get; private set; } -#pragma warning disable IDE0251 // Make member 'readonly' - public override bool Equals(object obj) -#pragma warning restore IDE0251 // Make member 'readonly' + public override readonly bool Equals(object obj) { return obj is ValueWrapper v && Equals(Val, v.Val); } -#pragma warning disable IDE0251 // Make member 'readonly' - public override int GetHashCode() -#pragma warning restore IDE0251 // Make member 'readonly' + public override readonly int GetHashCode() { return Val?.GetHashCode() ?? 0; }