diff --git a/.csharpierignore b/.csharpierignore index 7e3489e..cf72dd9 100644 --- a/.csharpierignore +++ b/.csharpierignore @@ -1,3 +1,3 @@ -**/nuget.config -**/_snapshots/ -**/_snapshot/ +**/[Nn]u[Gg]et.config +**/*.verified.* +**/*.received.* diff --git a/.editorconfig b/.editorconfig index fa80a79..5ffb95a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -44,19 +44,22 @@ generated_code = true # XML project files [*.{slnx,csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,nativeproj,locproj}] indent_size = 2 -max_line_length = 160 +max_line_length = 200 # Xml build files [*.builds] indent_size = 2 +max_line_length = 200 # Xml files [*.{xml,stylecop,resx,ruleset}] indent_size = 2 +max_line_length = 200 # XML config files [*.{props,targets,ruleset,config,nuspec,vsixmanifest,vsct}] indent_size = 2 +max_line_length = 200 # JSON files [*.json] @@ -87,10 +90,6 @@ insert_final_newline = false [*.sln] indent_style = tab -[*.{received,verified}.txt] -insert_final_newline = false -trim_trailing_whitespace = false - [*.{cs,csx,vb,vbx}] # .NET Code Style Settings # See https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference @@ -135,6 +134,13 @@ dotnet_naming_rule.all_const.severity = error dotnet_naming_rule.all_const.style = all_elements dotnet_naming_rule.all_const.symbols = all_const +dotnet_naming_style.all_static_readonly.capitalization = pascal_case +dotnet_naming_symbols.all_static_readonly.applicable_kinds = field +dotnet_naming_symbols.all_static_readonly.required_modifiers = static, readonly +dotnet_naming_rule.all_static_readonly.severity = error +dotnet_naming_rule.all_static_readonly.style = all_static_readonly +dotnet_naming_rule.all_static_readonly.symbols = all_static_readonly + dotnet_naming_style.all_fields.required_prefix = _ dotnet_naming_style.all_fields.capitalization = camel_case dotnet_naming_symbols.all_fields.applicable_kinds = field @@ -264,22 +270,26 @@ dotnet_diagnostic.IDE0046.severity = sugges csharp_style_prefer_primary_constructors = false dotnet_diagnostic.IDE0290.severity = suggestion +# IDE0060: Remove unused parameter +dotnet_diagnostic.IDE0060.severity = warning +dotnet_diagnostic.RCS1163.severity = none +dotnet_code_quality_unused_parameters = all + # [CSharpier] Incompatible rules deactivated # https://csharpier.com/docs/IntegratingWithLinters#code-analysis-rules dotnet_diagnostic.IDE0055.severity = none -dotnet_diagnostic.SA1000.severity = none -dotnet_diagnostic.SA1009.severity = none -dotnet_diagnostic.SA1111.severity = none -dotnet_diagnostic.SA1118.severity = none -dotnet_diagnostic.SA1137.severity = none -dotnet_diagnostic.SA1413.severity = none -dotnet_diagnostic.SA1500.severity = none -dotnet_diagnostic.SA1501.severity = none -dotnet_diagnostic.SA1502.severity = none -dotnet_diagnostic.SA1504.severity = none -dotnet_diagnostic.SA1515.severity = none -dotnet_diagnostic.SA1516.severity = none # Support for NetEvolve.Arguments Methods # https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1062#null-check-validation-methods dotnet_code_quality.CA1062.null_check_validation_methods = M:NetEvolve.Arguments.Argument.ThrowIfNull(System.Object,System.String)|M:NetEvolve.Arguments.Argument.ThrowIfNull(System.Void*,System.String)|M:NetEvolve.Arguments.Argument.ThrowIfNullOrEmpty(System.String,System.String)|M:NetEvolve.Arguments.Argument.ThrowIfNullOrEmpty``1(System.Collections.Generic.IEnumerable{``0},System.String)|M:NetEvolve.Arguments.Argument.ThrowIfNullOrWhiteSpace(System.String,System.String) + +# Disable all style rules for generated code +[*.{received,verified}.*] +generated_code = true +# Disable all style rules for migrations +dotnet_analyzer_diagnostic.severity = none + +[**/Migrations/*.{cs,csx,vb,vbx}] +generated_code = true +# Disable all style rules for migrations +dotnet_analyzer_diagnostic.severity = none diff --git a/.gitattributes b/.gitattributes index 3d6b51a..a6fc23c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,4 @@ * text=auto eol=lf -* text eol=lf # (binary is a macro for -text -diff) *.png binary diff --git a/.gitignore b/.gitignore index 7bcbf66..0279c9e 100644 --- a/.gitignore +++ b/.gitignore @@ -364,3 +364,13 @@ MigrationBackup/ # Prevent nested .editorconfig files - only root .editorconfig should be used **/.editorconfig !/.editorconfig + +# MemPalace per-project files +.mempalace/ +mempalace.yaml +entities.json + +# Beads / Dolt files (added by bd init) +.dolt/ +*.db +.beads-credential-key diff --git a/Directory.Packages.props b/Directory.Packages.props index 4fc5bc4..0908ad9 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,12 +5,17 @@ + - + + + + + diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(Task,Timespan).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(Task,Timespan).cs similarity index 100% rename from src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(Task,Timespan).cs rename to src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(Task,Timespan).cs diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(Task,int).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(Task,int).cs similarity index 100% rename from src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(Task,int).cs rename to src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(Task,int).cs diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(TaskOfT,Timespan).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(TaskOfT,Timespan).cs similarity index 100% rename from src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(TaskOfT,Timespan).cs rename to src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(TaskOfT,Timespan).cs diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(TaskOfT,int).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(TaskOfT,int).cs similarity index 100% rename from src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(TaskOfT,int).cs rename to src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(TaskOfT,int).cs diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTask,Timespan).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(ValueTask,Timespan).cs similarity index 100% rename from src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTask,Timespan).cs rename to src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(ValueTask,Timespan).cs diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTask,int).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(ValueTask,int).cs similarity index 100% rename from src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTask,int).cs rename to src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(ValueTask,int).cs diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTaskOfT,Timespan).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(ValueTaskOfT,Timespan).cs similarity index 100% rename from src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTaskOfT,Timespan).cs rename to src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(ValueTaskOfT,Timespan).cs diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTaskOfT,int).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(ValueTaskOfT,int).cs similarity index 100% rename from src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTaskOfT,int).cs rename to src/NetEvolve.Extensions.Tasks/TaskExtensions.WithTimeoutAsync(ValueTaskOfT,int).cs diff --git a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(Task,int).cs b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsTaskIntTests.cs similarity index 89% rename from tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(Task,int).cs rename to tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsTaskIntTests.cs index dac1fce..6774e69 100644 --- a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(Task,int).cs +++ b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsTaskIntTests.cs @@ -15,7 +15,7 @@ public async Task WithTimeoutAsync_ParamTaskNull_ArgumentNullException() { Task task = null!; - var testCode = async () => await task!.WithTimeoutAsync(100); + var testCode = async () => await task!.WithTimeoutAsync(100).ConfigureAwait(false); _ = await Assert.ThrowsAsync("task", testCode); } @@ -24,7 +24,7 @@ public async Task WithTimeoutAsync_IsValidTrue_Expected() { var timeoutInMilliseconds = 1000; - var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); static Task TestMethod() => Task.Delay(20); @@ -35,7 +35,7 @@ public async Task WithTimeoutAsync_IsValidFalse_Expected() { var timeoutInMilliseconds = 20; - var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); static Task TestMethod() => Task.Delay(1000); @@ -46,7 +46,7 @@ public async Task WithTimeoutAsync_TaskAlreadyCompleted_Expected() { var timeoutInMilliseconds = 1000; - var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); static Task TestMethod() => Task.CompletedTask; @@ -57,7 +57,7 @@ public async Task WithTimeoutAsync_TimeoutInfinite_Expected() { var timeoutInMilliseconds = Timeout.Infinite; - var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); static Task TestMethod() => Task.Delay(1000); @@ -68,7 +68,7 @@ public async Task WithTimeoutAsync_TimeoutZero_Expected() { var timeoutInMilliseconds = 0; - var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); static Task TestMethod() => Task.Delay(1000); @@ -79,7 +79,7 @@ public async Task WithTimeoutAsync_TimeoutMinusTwo_ThrowArgumentOutOfRangeExcept { var timeoutInMilliseconds = -2; - var testCode = async () => await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var testCode = async () => await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.ThrowsAsync("timeoutInMilliseconds", testCode); static Task TestMethod() => Task.Delay(1000); diff --git a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(TaskOfT,int).cs b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsTaskOfTIntTests.cs similarity index 82% rename from tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(TaskOfT,int).cs rename to tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsTaskOfTIntTests.cs index 8ba59ba..f375df6 100644 --- a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(TaskOfT,int).cs +++ b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsTaskOfTIntTests.cs @@ -15,7 +15,7 @@ public async Task WithTimeoutAsync_ParamTaskNull_ArgumentNullException() { Task task = null!; - var testCode = async () => await task!.WithTimeoutAsync(100); + var testCode = async () => await task!.WithTimeoutAsync(100).ConfigureAwait(false); _ = await Assert.ThrowsAsync("task", testCode); } @@ -24,13 +24,13 @@ public async Task WithTimeoutAsync_IsValidTrue_Expected() { var timeoutInMilliseconds = 1000; - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); _ = await Assert.That(result).IsEqualTo(1); static async Task TestMethod() { - await Task.Delay(20); + await Task.Delay(20).ConfigureAwait(false); return 1; } } @@ -40,13 +40,13 @@ public async Task WithTimeoutAsync_IsValidFalse_Expected() { var timeoutInMilliseconds = 20; - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); _ = await Assert.That(result).IsEqualTo(1); static async Task TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } @@ -56,7 +56,7 @@ public async Task WithTimeoutAsync_TaskAlreadyCompleted_Expected() { var timeoutInMilliseconds = 20; - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); _ = await Assert.That(result).IsEqualTo(1); @@ -68,13 +68,13 @@ public async Task WithTimeoutAsync_TimeoutInfinite_Expected() { var timeoutInMilliseconds = Timeout.Infinite; - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); _ = await Assert.That(result).IsEqualTo(1); static async Task TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } @@ -84,13 +84,13 @@ public async Task WithTimeoutAsync_TimeoutZero_Expected() { var timeoutInMilliseconds = 0; - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); _ = await Assert.That(result).IsEqualTo(1); static async Task TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } @@ -100,12 +100,12 @@ public async Task WithTimeoutAsync_TimeoutMinusTwo_ThrowsArgumentOutOfRangeExcep { var timeoutInMilliseconds = -2; - var testCode = async () => await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var testCode = async () => await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.ThrowsAsync("timeoutInMilliseconds", testCode); static async Task TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } diff --git a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(TaskOfT,Timespan).cs b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsTaskOfTTimespanTests.cs similarity index 83% rename from tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(TaskOfT,Timespan).cs rename to tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsTaskOfTTimespanTests.cs index 0e528a2..80c4778 100644 --- a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(TaskOfT,Timespan).cs +++ b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsTaskOfTTimespanTests.cs @@ -15,7 +15,7 @@ public async Task WithTimeoutAsync_ParamTaskNull_ArgumentNullException() { Task task = null!; - var testCode = async () => await task!.WithTimeoutAsync(TimeSpan.FromMilliseconds(100)); + var testCode = async () => await task!.WithTimeoutAsync(TimeSpan.FromMilliseconds(100)).ConfigureAwait(false); _ = await Assert.ThrowsAsync("task", testCode); } @@ -24,13 +24,13 @@ public async Task WithTimeoutAsync_IsValidTrue_Expected() { var timeout = TimeSpan.FromMilliseconds(1000); - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); _ = await Assert.That(result).IsEqualTo(1); static async Task TestMethod() { - await Task.Delay(20); + await Task.Delay(20).ConfigureAwait(false); return 1; } } @@ -40,13 +40,13 @@ public async Task WithTimeoutAsync_IsValidFalse_Expected() { var timeout = TimeSpan.FromMilliseconds(20); - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); _ = await Assert.That(result).IsEqualTo(1); static async Task TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } @@ -56,7 +56,7 @@ public async Task WithTimeoutAsync_TaskAlreadyCompleted_Expected() { var timeout = TimeSpan.FromMilliseconds(20); - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); _ = await Assert.That(result).IsEqualTo(1); @@ -68,13 +68,13 @@ public async Task WithTimeoutAsync_TimeoutInfinite_Expected() { var timeout = Timeout.InfiniteTimeSpan; - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); _ = await Assert.That(result).IsEqualTo(1); static async Task TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } @@ -84,13 +84,13 @@ public async Task WithTimeoutAsync_TimeoutZero_Expected() { var timeout = TimeSpan.Zero; - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); _ = await Assert.That(result).IsEqualTo(1); static async Task TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } @@ -100,12 +100,12 @@ public async Task WithTimeoutAsync_TimeoutMinusTwo_ThrowsArgumentOutOfRangeExcep { var timeout = new TimeSpan(0, 0, 0, 0, -2); - var testCode = async () => await TestMethod().WithTimeoutAsync(timeout); + var testCode = async () => await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.ThrowsAsync("timeout", testCode); static async Task TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } diff --git a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(Task,Timespan).cs b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsTaskTimespanTests.cs similarity index 85% rename from tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(Task,Timespan).cs rename to tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsTaskTimespanTests.cs index 85f57c0..4e693d2 100644 --- a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(Task,Timespan).cs +++ b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsTaskTimespanTests.cs @@ -15,7 +15,7 @@ public async Task WithTimeoutAsync_ParamTaskNull_ArgumentNullException() { Task task = null!; - var testCode = async () => await task!.WithTimeoutAsync(TimeSpan.FromMilliseconds(100)); + var testCode = async () => await task!.WithTimeoutAsync(TimeSpan.FromMilliseconds(100)).ConfigureAwait(false); _ = await Assert.ThrowsAsync("task", testCode); } @@ -24,10 +24,10 @@ public async Task WithTimeoutAsync_IsValidTrue_Expected() { var timeout = TimeSpan.FromMilliseconds(1000); - var isValid = await TestMethod().WithTimeoutAsync(timeout); + var isValid = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); - static async Task TestMethod() => await Task.Delay(20); + static async Task TestMethod() => await Task.Delay(20).ConfigureAwait(false); } [Test] @@ -35,10 +35,10 @@ public async Task WithTimeoutAsync_IsValidFalse_Expected() { var timeout = TimeSpan.FromMilliseconds(20); - var isValid = await TestMethod().WithTimeoutAsync(timeout); + var isValid = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); - static async Task TestMethod() => await Task.Delay(1000); + static async Task TestMethod() => await Task.Delay(1000).ConfigureAwait(false); } [Test] @@ -46,7 +46,7 @@ public async Task WithTimeoutAsync_TaskAlreadyCompleted_Expected() { var timeout = TimeSpan.FromMilliseconds(100); - var isValid = await TestMethod().WithTimeoutAsync(timeout); + var isValid = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); static Task TestMethod() => Task.CompletedTask; @@ -57,10 +57,10 @@ public async Task WithTimeoutAsync_TimeoutInfinite_Expected() { var timeout = Timeout.InfiniteTimeSpan; - var isValid = await TestMethod().WithTimeoutAsync(timeout); + var isValid = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); - static async Task TestMethod() => await Task.Delay(1000); + static async Task TestMethod() => await Task.Delay(1000).ConfigureAwait(false); } [Test] @@ -68,10 +68,10 @@ public async Task WithTimeoutAsync_TimeoutZero_Expected() { var timeout = TimeSpan.Zero; - var isValid = await TestMethod().WithTimeoutAsync(timeout); + var isValid = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); - static async Task TestMethod() => await Task.Delay(1000); + static async Task TestMethod() => await Task.Delay(1000).ConfigureAwait(false); } [Test] @@ -79,9 +79,9 @@ public async Task WithTimeoutAsync_TimeoutMinusTwo_ThrowArgumentOutOfRangeExcept { var timeout = new TimeSpan(0, 0, 0, 0, -2); - var testCode = async () => await TestMethod().WithTimeoutAsync(timeout); + var testCode = async () => await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.ThrowsAsync("timeout", testCode); - static async Task TestMethod() => await Task.Delay(1000); + static async Task TestMethod() => await Task.Delay(1000).ConfigureAwait(false); } } diff --git a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(ValueTask,int).cs b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsValueTaskIntTests.cs similarity index 84% rename from tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(ValueTask,int).cs rename to tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsValueTaskIntTests.cs index 6324ae3..5105072 100644 --- a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(ValueTask,int).cs +++ b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsValueTaskIntTests.cs @@ -15,10 +15,10 @@ public async Task WithTimeoutAsync_IsValidTrue_Expected() { var timeoutInMilliseconds = 1000; - var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); - static async ValueTask TestMethod() => await Task.Delay(20); + static async ValueTask TestMethod() => await Task.Delay(20).ConfigureAwait(false); } [Test] @@ -26,10 +26,10 @@ public async Task WithTimeoutAsync_IsValidFalse_Expected() { var timeoutInMilliseconds = 20; - var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); - static async ValueTask TestMethod() => await Task.Delay(120); + static async ValueTask TestMethod() => await Task.Delay(120).ConfigureAwait(false); } [Test] @@ -37,7 +37,7 @@ public async Task WithTimeoutAsync_TaskAlreadyCompleted_Expected() { var timeoutInMilliseconds = 1000; - var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); static ValueTask TestMethod() => ValueTask.CompletedTask; @@ -48,10 +48,10 @@ public async Task WithTimeoutAsync_TimeoutInfinite_Expected() { var timeoutInMilliseconds = Timeout.Infinite; - var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); - static async ValueTask TestMethod() => await Task.Delay(1000); + static async ValueTask TestMethod() => await Task.Delay(1000).ConfigureAwait(false); } [Test] @@ -59,10 +59,10 @@ public async Task WithTimeoutAsync_TimeoutZero_Expected() { var timeoutInMilliseconds = 0; - var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var isValid = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); - static async ValueTask TestMethod() => await Task.Delay(1000); + static async ValueTask TestMethod() => await Task.Delay(1000).ConfigureAwait(false); } [Test] @@ -70,9 +70,9 @@ public async Task WithTimeoutAsync_TimeoutMinusTwo_ThrowArgumentOutOfRangeExcept { var timeoutInMilliseconds = -2; - var testCode = async () => await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var testCode = async () => await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.ThrowsAsync("timeoutInMilliseconds", testCode); - static async ValueTask TestMethod() => await Task.Delay(1000); + static async ValueTask TestMethod() => await Task.Delay(1000).ConfigureAwait(false); } } diff --git a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(ValueTaskOfT,int).cs b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsValueTaskOfTIntTests.cs similarity index 81% rename from tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(ValueTaskOfT,int).cs rename to tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsValueTaskOfTIntTests.cs index 78b668a..6b19911 100644 --- a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(ValueTaskOfT,int).cs +++ b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsValueTaskOfTIntTests.cs @@ -15,13 +15,13 @@ public async Task WithTimeoutAsync_IsValidTrue_Expected() { var timeoutInMilliseconds = 1000; - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); _ = await Assert.That(result).IsEqualTo(1); static async ValueTask TestMethod() { - await Task.Delay(20); + await Task.Delay(20).ConfigureAwait(false); return 1; } } @@ -31,13 +31,13 @@ public async Task WithTimeoutAsync_IsValidFalse_Expected() { var timeoutInMilliseconds = 20; - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); _ = await Assert.That(result).IsEqualTo(1); static async ValueTask TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } @@ -47,7 +47,7 @@ public async Task WithTimeoutAsync_TaskAlreadyCompleted_Expected() { var timeoutInMilliseconds = 20; - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); _ = await Assert.That(result).IsEqualTo(1); @@ -59,13 +59,13 @@ public async Task WithTimeoutAsync_TimeoutInfinite_Expected() { var timeoutInMilliseconds = Timeout.Infinite; - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); _ = await Assert.That(result).IsEqualTo(1); static async ValueTask TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } @@ -75,13 +75,13 @@ public async Task WithTimeoutAsync_TimeoutZero_Expected() { var timeoutInMilliseconds = 0; - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); _ = await Assert.That(result).IsEqualTo(1); static async ValueTask TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } @@ -91,12 +91,12 @@ public async Task WithTimeoutAsync_TimeoutMinusTwo_ThrowArgumentOutOfRangeExcept { var timeoutInMilliseconds = -2; - var testCode = async () => await TestMethod().WithTimeoutAsync(timeoutInMilliseconds); + var testCode = async () => await TestMethod().WithTimeoutAsync(timeoutInMilliseconds).ConfigureAwait(false); _ = await Assert.ThrowsAsync("timeoutInMilliseconds", testCode); static async ValueTask TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } diff --git a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(ValueTaskOfT,Timespan).cs b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsValueTaskOfTTimespanTests.cs similarity index 83% rename from tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(ValueTaskOfT,Timespan).cs rename to tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsValueTaskOfTTimespanTests.cs index 7d05ec0..c155b68 100644 --- a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(ValueTaskOfT,Timespan).cs +++ b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsValueTaskOfTTimespanTests.cs @@ -15,13 +15,13 @@ public async Task WithTimeoutAsync_IsValidTrue_Expected() { var timeout = TimeSpan.FromMilliseconds(1000); - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); _ = await Assert.That(result).IsEqualTo(1); static async ValueTask TestMethod() { - await Task.Delay(20); + await Task.Delay(20).ConfigureAwait(false); return 1; } } @@ -31,13 +31,13 @@ public async Task WithTimeoutAsync_IsValidFalse_Expected() { var timeout = TimeSpan.FromMilliseconds(20); - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); _ = await Assert.That(result).IsEqualTo(1); static async ValueTask TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } @@ -47,7 +47,7 @@ public async Task WithTimeoutAsync_TaskAlreadyCompleted_Expected() { var timeout = TimeSpan.FromMilliseconds(20); - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); _ = await Assert.That(result).IsEqualTo(1); @@ -59,13 +59,13 @@ public async Task WithTimeoutAsync_TimeoutInfinite_Expected() { var timeout = Timeout.InfiniteTimeSpan; - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); _ = await Assert.That(result).IsEqualTo(1); static async ValueTask TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } @@ -75,13 +75,13 @@ public async Task WithTimeoutAsync_TimeoutZero_Expected() { var timeout = TimeSpan.Zero; - var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout); + var (isValid, result) = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); _ = await Assert.That(result).IsEqualTo(1); static async ValueTask TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } @@ -91,12 +91,12 @@ public async Task WithTimeoutAsync_TimeoutMinusTwo_ThrowArgumentOutOfRangeExcept { var timeout = new TimeSpan(0, 0, 0, 0, -2); - var testCode = async () => await TestMethod().WithTimeoutAsync(timeout); + var testCode = async () => await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.ThrowsAsync("timeout", testCode); static async ValueTask TestMethod() { - await Task.Delay(1000); + await Task.Delay(1000).ConfigureAwait(false); return 1; } } diff --git a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(ValueTask,Timespan).cs b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsValueTaskTimespanTests.cs similarity index 87% rename from tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(ValueTask,Timespan).cs rename to tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsValueTaskTimespanTests.cs index 5b9ea5a..d90eb25 100644 --- a/tests/NetEvolve.Extensions.Tasks.Tests.Unit/WithTimeoutAsync(ValueTask,Timespan).cs +++ b/tests/NetEvolve.Extensions.Tasks.Tests.Unit/TaskExtensionsValueTaskTimespanTests.cs @@ -15,10 +15,10 @@ public async Task WithTimeoutAsync_IsValidTrue_Expected() { var timeout = TimeSpan.FromMilliseconds(1000); - var isValid = await TestMethod().WithTimeoutAsync(timeout); + var isValid = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); - static async ValueTask TestMethod() => await Task.Delay(20); + static async ValueTask TestMethod() => await Task.Delay(20).ConfigureAwait(false); } [Test] @@ -26,10 +26,10 @@ public async Task WithTimeoutAsync_IsValidFalse_Expected() { var timeout = TimeSpan.FromMilliseconds(20); - var isValid = await TestMethod().WithTimeoutAsync(timeout); + var isValid = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); - static async ValueTask TestMethod() => await Task.Delay(1000); + static async ValueTask TestMethod() => await Task.Delay(1000).ConfigureAwait(false); } [Test] @@ -37,7 +37,7 @@ public async Task WithTimeoutAsync_TaskAlreadyCompleted_Expected() { var timeout = TimeSpan.FromMilliseconds(1000); - var isValid = await TestMethod().WithTimeoutAsync(timeout); + var isValid = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); static ValueTask TestMethod() => ValueTask.CompletedTask; @@ -48,10 +48,10 @@ public async Task WithTimeoutAsync_TimeoutInfinite_Expected() { var timeout = Timeout.InfiniteTimeSpan; - var isValid = await TestMethod().WithTimeoutAsync(timeout); + var isValid = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsTrue(); - static async ValueTask TestMethod() => await Task.Delay(1000); + static async ValueTask TestMethod() => await Task.Delay(1000).ConfigureAwait(false); } [Test] @@ -59,10 +59,10 @@ public async Task WithTimeoutAsync_TimeoutZero_Expected() { var timeout = TimeSpan.Zero; - var isValid = await TestMethod().WithTimeoutAsync(timeout); + var isValid = await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.That(isValid).IsFalse(); - static async ValueTask TestMethod() => await Task.Delay(1000); + static async ValueTask TestMethod() => await Task.Delay(1000).ConfigureAwait(false); } [Test] @@ -70,9 +70,9 @@ public async Task WithTimeoutAsync_TimeoutMinusTwo_ThrowArgumentOutOfRangeExcept { var timeout = new TimeSpan(0, 0, 0, 0, -2); - var testCode = async () => await TestMethod().WithTimeoutAsync(timeout); + var testCode = async () => await TestMethod().WithTimeoutAsync(timeout).ConfigureAwait(false); _ = await Assert.ThrowsAsync("timeout", testCode); - static async ValueTask TestMethod() => await Task.Delay(1000); + static async ValueTask TestMethod() => await Task.Delay(1000).ConfigureAwait(false); } }