Browse Source
Merge pull request #9032 from marodev/cosmetics/technical-debt
Reduce technical debt
pull/9072/head
Halil İbrahim Kalkan
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
6 additions and
13 deletions
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/TagHelpers/AbpComponentDemoSectionTagHelper.cs
-
framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs
-
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlerBase.cs
-
framework/src/Volo.Abp.Threading/Volo/Abp/Threading/AmbientDataContextAmbientScopeProvider.cs
-
framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/AbpAspNetCoreMvcUiBootstrapDemoTestBase.cs
|
|
|
@ -120,9 +120,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S |
|
|
|
|
|
|
|
return sourceBuilder.ToString(); |
|
|
|
} |
|
|
|
else if (sourceBuilder != null) |
|
|
|
else |
|
|
|
{ |
|
|
|
sourceBuilder.AppendLine(line); |
|
|
|
sourceBuilder?.AppendLine(line); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -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; |
|
|
|
} |
|
|
|
|
|
|
|
@ -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); |
|
|
|
} |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
@ -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" |
|
|
|
); |
|
|
|
} |
|
|
|
|
|
|
|
|