From effb355e094a406003cb19b31169d1881ec1a496 Mon Sep 17 00:00:00 2001 From: Zhiyuan Liang Date: Tue, 18 Jun 2024 16:49:35 +0800 Subject: [PATCH 1/4] fix xunit1031 warning --- tests/Tests.FeatureManagement/FeatureManagement.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Tests.FeatureManagement/FeatureManagement.cs b/tests/Tests.FeatureManagement/FeatureManagement.cs index e5c0ba06..964f8dd4 100644 --- a/tests/Tests.FeatureManagement/FeatureManagement.cs +++ b/tests/Tests.FeatureManagement/FeatureManagement.cs @@ -752,11 +752,11 @@ public async Task ThreadsafeSnapshot() await Task.WhenAll(tasks); - bool result = tasks.First().Result; + bool result = await tasks.First(); foreach (Task t in tasks) { - Assert.Equal(result, t.Result); + Assert.Equal(result, await t); } } From 4b0955d57648de5d25858878d69fad8d57b04c1b Mon Sep 17 00:00:00 2001 From: Zhiyuan Liang Date: Tue, 18 Jun 2024 17:23:41 +0800 Subject: [PATCH 2/4] resolve nullable warning --- examples/ConsoleApp/ConsoleApp.csproj | 1 - examples/FeatureFlagDemo/FeatureFlagDemo.csproj | 1 - examples/FeatureFlagDemo/Views/Shared/Error.cshtml.cs | 2 +- examples/TargetingConsoleApp/TargetingConsoleApp.csproj | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/examples/ConsoleApp/ConsoleApp.csproj b/examples/ConsoleApp/ConsoleApp.csproj index 83e2d4f1..fe29b948 100644 --- a/examples/ConsoleApp/ConsoleApp.csproj +++ b/examples/ConsoleApp/ConsoleApp.csproj @@ -4,7 +4,6 @@ Exe net6.0 enable - enable diff --git a/examples/FeatureFlagDemo/FeatureFlagDemo.csproj b/examples/FeatureFlagDemo/FeatureFlagDemo.csproj index 724d6920..fcf18a50 100644 --- a/examples/FeatureFlagDemo/FeatureFlagDemo.csproj +++ b/examples/FeatureFlagDemo/FeatureFlagDemo.csproj @@ -2,7 +2,6 @@ net6.0 - enable enable diff --git a/examples/FeatureFlagDemo/Views/Shared/Error.cshtml.cs b/examples/FeatureFlagDemo/Views/Shared/Error.cshtml.cs index ae038094..d832e108 100644 --- a/examples/FeatureFlagDemo/Views/Shared/Error.cshtml.cs +++ b/examples/FeatureFlagDemo/Views/Shared/Error.cshtml.cs @@ -8,7 +8,7 @@ namespace FeatureFlagDemo.Pages.Shared [IgnoreAntiforgeryToken] public class ErrorModel : PageModel { - public string? RequestId { get; set; } + public string RequestId { get; set; } public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); diff --git a/examples/TargetingConsoleApp/TargetingConsoleApp.csproj b/examples/TargetingConsoleApp/TargetingConsoleApp.csproj index 91831acc..e1ffbd53 100644 --- a/examples/TargetingConsoleApp/TargetingConsoleApp.csproj +++ b/examples/TargetingConsoleApp/TargetingConsoleApp.csproj @@ -4,7 +4,6 @@ Exe net6.0 enable - enable From bd50239263a60437e53b55bbfd46746a4da860bc Mon Sep 17 00:00:00 2001 From: Zhiyuan Liang Date: Tue, 18 Jun 2024 17:38:43 +0800 Subject: [PATCH 3/4] remove nullable --- examples/RazorPages/Pages/Error.cshtml.cs | 2 +- examples/RazorPages/RazorPages.csproj | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/RazorPages/Pages/Error.cshtml.cs b/examples/RazorPages/Pages/Error.cshtml.cs index 74050d52..756381b5 100644 --- a/examples/RazorPages/Pages/Error.cshtml.cs +++ b/examples/RazorPages/Pages/Error.cshtml.cs @@ -8,7 +8,7 @@ namespace RazorPages.Pages [IgnoreAntiforgeryToken] public class ErrorModel : PageModel { - public string? RequestId { get; set; } + public string RequestId { get; set; } public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); diff --git a/examples/RazorPages/RazorPages.csproj b/examples/RazorPages/RazorPages.csproj index 2a2cbb46..f2103eac 100644 --- a/examples/RazorPages/RazorPages.csproj +++ b/examples/RazorPages/RazorPages.csproj @@ -2,7 +2,6 @@ net6.0 - enable enable From 6f57846d15ddac076d078affad968a8a77327d3f Mon Sep 17 00:00:00 2001 From: Zhiyuan Liang Date: Thu, 20 Jun 2024 13:10:01 +0800 Subject: [PATCH 4/4] revert change to RazorPages project --- examples/RazorPages/Pages/Error.cshtml.cs | 2 +- examples/RazorPages/RazorPages.csproj | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/RazorPages/Pages/Error.cshtml.cs b/examples/RazorPages/Pages/Error.cshtml.cs index 756381b5..74050d52 100644 --- a/examples/RazorPages/Pages/Error.cshtml.cs +++ b/examples/RazorPages/Pages/Error.cshtml.cs @@ -8,7 +8,7 @@ namespace RazorPages.Pages [IgnoreAntiforgeryToken] public class ErrorModel : PageModel { - public string RequestId { get; set; } + public string? RequestId { get; set; } public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); diff --git a/examples/RazorPages/RazorPages.csproj b/examples/RazorPages/RazorPages.csproj index f2103eac..2a2cbb46 100644 --- a/examples/RazorPages/RazorPages.csproj +++ b/examples/RazorPages/RazorPages.csproj @@ -2,6 +2,7 @@ net6.0 + enable enable