Browse Source

Enable nullable annotations for Volo.Abp.AspNetCore.Mvc.UI.Bundling

pull/17094/head
liangshiwei 3 years ago
parent
commit
4051d52cea
  1. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj
  2. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlerBase.cs
  3. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Styles/CssRelativePath.cs
  4. 6
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleItemTagHelper.cs
  5. 4
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelper.cs
  6. 8
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs
  7. 4
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/BundleTagHelperContributorTypeItem.cs
  8. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/IBundleTagHelper.cs
  9. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/ScriptNonceTagHelper.cs

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj

@ -5,6 +5,8 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Bundling</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Bundling</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Bundling</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Bundling</PackageId>

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlerBase.cs

@ -146,7 +146,7 @@ public abstract class BundlerBase : IBundler, ITransientDependency
return false; return false;
} }
protected virtual IFileInfo GetMinFileInfoOrNull(string file) protected virtual IFileInfo? GetMinFileInfoOrNull(string file)
{ {
foreach (var suffix in _minFileSuffixes) foreach (var suffix in _minFileSuffixes)
{ {

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Styles/CssRelativePath.cs

@ -20,7 +20,7 @@ internal static class CssRelativePath
return cssFileContents; return cssFileContents;
} }
var cssDirectoryPath = Path.GetDirectoryName(absoluteInputFilePath); var cssDirectoryPath = Path.GetDirectoryName(absoluteInputFilePath)!;
foreach (Match match in matches) foreach (Match match in matches)
{ {

6
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleItemTagHelper.cs

@ -10,12 +10,12 @@ public abstract class AbpBundleItemTagHelper<TTagHelper, TTagHelperService> : Ab
/// <summary> /// <summary>
/// A file path. /// A file path.
/// </summary> /// </summary>
public string Src { get; set; } public string? Src { get; set; }
/// <summary> /// <summary>
/// A bundle contributor type. /// A bundle contributor type.
/// </summary> /// </summary>
public Type Type { get; set; } public Type? Type { get; set; }
protected AbpBundleItemTagHelper(TTagHelperService service) protected AbpBundleItemTagHelper(TTagHelperService service)
: base(service) : base(service)
@ -26,7 +26,7 @@ public abstract class AbpBundleItemTagHelper<TTagHelper, TTagHelperService> : Ab
{ {
if (Type != null) if (Type != null)
{ {
return Type.FullName; return Type.FullName!;
} }
if (Src != null) if (Src != null)

4
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelper.cs

@ -6,7 +6,7 @@ public abstract class AbpBundleTagHelper<TTagHelper, TService> : AbpTagHelper<TT
where TTagHelper : AbpTagHelper<TTagHelper, TService> where TTagHelper : AbpTagHelper<TTagHelper, TService>
where TService : class, IAbpTagHelperService<TTagHelper> where TService : class, IAbpTagHelperService<TTagHelper>
{ {
public string Name { get; set; } public string? Name { get; set; }
protected AbpBundleTagHelper(TService service) protected AbpBundleTagHelper(TService service)
: base(service) : base(service)
@ -14,7 +14,7 @@ public abstract class AbpBundleTagHelper<TTagHelper, TService> : AbpTagHelper<TT
} }
public virtual string GetNameOrNull() public virtual string? GetNameOrNull()
{ {
return Name; return Name;
} }

8
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs

@ -39,7 +39,7 @@ public abstract class AbpTagHelperResourceService : ITransientDependency
[NotNull] TagHelperContext context, [NotNull] TagHelperContext context,
[NotNull] TagHelperOutput output, [NotNull] TagHelperOutput output,
[NotNull] List<BundleTagHelperItem> bundleItems, [NotNull] List<BundleTagHelperItem> bundleItems,
[CanBeNull] string bundleName = null) string? bundleName = null)
{ {
Check.NotNull(viewContext, nameof(viewContext)); Check.NotNull(viewContext, nameof(viewContext));
Check.NotNull(context, nameof(context)); Check.NotNull(context, nameof(context));
@ -55,9 +55,9 @@ public abstract class AbpTagHelperResourceService : ITransientDependency
bundleName = GenerateBundleName(bundleItems); bundleName = GenerateBundleName(bundleItems);
} }
CreateBundle(bundleName, bundleItems); CreateBundle(bundleName!, bundleItems);
var bundleFiles = await GetBundleFilesAsync(bundleName); var bundleFiles = await GetBundleFilesAsync(bundleName!);
output.Content.Clear(); output.Content.Clear();
@ -68,7 +68,7 @@ public abstract class AbpTagHelperResourceService : ITransientDependency
if (file == null || !file.Exists) if (file == null || !file.Exists)
{ {
Logger.LogError($"Could not find the bundle file '{bundleFile}' for the bundle '{bundleName}'!"); Logger.LogError($"Could not find the bundle file '{bundleFile}' for the bundle '{bundleName}'!");
AddErrorScript(viewContext, tagHelper, context, output, bundleFile, bundleName); AddErrorScript(viewContext, tagHelper, context, output, bundleFile, bundleName!);
continue; continue;
} }

4
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/BundleTagHelperContributorTypeItem.cs

@ -6,7 +6,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers;
public class BundleTagHelperContributorTypeItem : BundleTagHelperItem public class BundleTagHelperContributorTypeItem : BundleTagHelperItem
{ {
[NotNull] [NotNull]
public Type Type { get; } public Type Type { get; } = default!;
public BundleTagHelperContributorTypeItem([NotNull] Type type) public BundleTagHelperContributorTypeItem([NotNull] Type type)
{ {
@ -15,7 +15,7 @@ public class BundleTagHelperContributorTypeItem : BundleTagHelperItem
public override string ToString() public override string ToString()
{ {
return Type.FullName; return Type.FullName!;
} }
public override void AddToConfiguration(BundleConfiguration configuration) public override void AddToConfiguration(BundleConfiguration configuration)

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/IBundleTagHelper.cs

@ -2,5 +2,5 @@
public interface IBundleTagHelper public interface IBundleTagHelper
{ {
string GetNameOrNull(); string? GetNameOrNull();
} }

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/ScriptNonceTagHelper.cs

@ -11,7 +11,7 @@ public class ScriptNonceTagHelper : AbpTagHelper
{ {
[HtmlAttributeNotBound] [HtmlAttributeNotBound]
[ViewContext] [ViewContext]
public ViewContext ViewContext { get; set; } public ViewContext ViewContext { get; set; } = default!;
public override void Process(TagHelperContext context, TagHelperOutput output) public override void Process(TagHelperContext context, TagHelperOutput output)
{ {
if (ViewContext.HttpContext.Items.TryGetValue(AbpAspNetCoreConsts.ScriptNonceKey, out var nonce) && nonce is string nonceString && !string.IsNullOrEmpty(nonceString)) if (ViewContext.HttpContext.Items.TryGetValue(AbpAspNetCoreConsts.ScriptNonceKey, out var nonce) && nonce is string nonceString && !string.IsNullOrEmpty(nonceString))

Loading…
Cancel
Save