From af6f655cf531791fe403c6e461bfc9c8ec2b6e1d Mon Sep 17 00:00:00 2001 From: marodev Date: Sun, 16 May 2021 10:34:19 +0200 Subject: [PATCH 1/6] Fix ReSharper's "MergeSequentialChecks" --- .../src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlerBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlerBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlerBase.cs index 97ef628d5a..074b7f6980 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlerBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlerBase.cs @@ -75,7 +75,7 @@ namespace Volo.Abp.Cli.Bundling var pathFragments = definition.Source.Split('/').ToList(); var basePath = $"{pathFragments[0]}/{pathFragments[1]}"; var node = staticAssetsDefinitions.SelectSingleNode($"//ContentRoot[@BasePath='{basePath}']"); - if (node == null || node.Attributes == null) + if (node?.Attributes == null) { throw new AbpException("Not found: " + definition.Source); } From 103956e3ba5ddc7453ae82655b56df22c7cb1e79 Mon Sep 17 00:00:00 2001 From: marodev Date: Sun, 16 May 2021 10:35:54 +0200 Subject: [PATCH 2/6] Fix ReSharper's "UseNullPropagation" --- .../Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs | 5 +---- .../Quartz/QuartzBackgroundWorkerAdapter.cs | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs index 328024cc2b..5c67a8f469 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs @@ -120,10 +120,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S return sourceBuilder.ToString(); } - else if (sourceBuilder != null) - { - sourceBuilder.AppendLine(line); - } + else sourceBuilder?.AppendLine(line); } throw new AbpException($"Could not find {Title} demo section inside {ViewPath}"); diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs index 0b75f389fe..ea29bbeeb5 100644 --- a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs +++ b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs @@ -75,10 +75,7 @@ namespace Volo.Abp.BackgroundWorkers.Quartz } case PeriodicBackgroundWorkerBase syncWorker: { - if (_doWorkMethod != null) - { - _doWorkMethod.Invoke(syncWorker, new object[] {workerContext}); - } + _doWorkMethod?.Invoke(syncWorker, new object[]{workerContext}); break; } From 46876428f12d6c410a3c73f507482108c90ccb18 Mon Sep 17 00:00:00 2001 From: marodev Date: Sun, 16 May 2021 10:37:22 +0200 Subject: [PATCH 3/6] Fix ReSharper's "UsePatternMatching" --- .../Abp/Threading/AmbientDataContextAmbientScopeProvider.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.Threading/Volo/Abp/Threading/AmbientDataContextAmbientScopeProvider.cs b/framework/src/Volo.Abp.Threading/Volo/Abp/Threading/AmbientDataContextAmbientScopeProvider.cs index 822361638e..1d83278bf1 100644 --- a/framework/src/Volo.Abp.Threading/Volo/Abp/Threading/AmbientDataContextAmbientScopeProvider.cs +++ b/framework/src/Volo.Abp.Threading/Volo/Abp/Threading/AmbientDataContextAmbientScopeProvider.cs @@ -62,8 +62,7 @@ namespace Volo.Abp.Threading private ScopeItem GetCurrentItem(string contextKey) { - var objKey = _dataContext.GetData(contextKey) as string; - return objKey != null ? ScopeDictionary.GetOrDefault(objKey) : null; + return _dataContext.GetData(contextKey) is string objKey ? ScopeDictionary.GetOrDefault(objKey) : null; } private class ScopeItem From c240dc53e9d1cda13368cb2ed7060cd909f06a48 Mon Sep 17 00:00:00 2001 From: marodev Date: Sun, 16 May 2021 10:39:16 +0200 Subject: [PATCH 4/6] Fix ReSharper's "UseStringInterpolation" --- .../Demo/AbpAspNetCoreMvcUiBootstrapDemoTestBase.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/AbpAspNetCoreMvcUiBootstrapDemoTestBase.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/AbpAspNetCoreMvcUiBootstrapDemoTestBase.cs index 15473df986..d7a8a88c2a 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/AbpAspNetCoreMvcUiBootstrapDemoTestBase.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/AbpAspNetCoreMvcUiBootstrapDemoTestBase.cs @@ -18,10 +18,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo { return CalculateContentRootPath( "Volo.Abp.sln", - string.Format( - "test{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo", - Path.DirectorySeparatorChar - ) + $"test{Path.DirectorySeparatorChar}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo" ); } From 4274e303e4021fae0c728d1c6bf60b12787fdf3e Mon Sep 17 00:00:00 2001 From: marodev Date: Sun, 16 May 2021 10:42:18 +0200 Subject: [PATCH 5/6] Fix whitespace --- .../BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs index ea29bbeeb5..a37807e473 100644 --- a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs +++ b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs @@ -75,7 +75,7 @@ namespace Volo.Abp.BackgroundWorkers.Quartz } case PeriodicBackgroundWorkerBase syncWorker: { - _doWorkMethod?.Invoke(syncWorker, new object[]{workerContext}); + _doWorkMethod?.Invoke(syncWorker, new object[] {workerContext}); break; } From 4092497c47794a7e63a0c265bc5164e293d5b81f Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 17 May 2021 08:37:21 +0800 Subject: [PATCH 6/6] Update AbpComponentDemoSectionTagHelper.cs --- .../Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs index 5c67a8f469..beaa8126fc 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs @@ -120,7 +120,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S return sourceBuilder.ToString(); } - else sourceBuilder?.AppendLine(line); + else + { + sourceBuilder?.AppendLine(line); + } } throw new AbpException($"Could not find {Title} demo section inside {ViewPath}");