Browse Source

Enable nullable annotations for Volo.Abp.Minify

pull/17020/head
liangshiwei 3 years ago
parent
commit
08af959b4a
  1. 2
      framework/src/Volo.Abp.Minify/Volo.Abp.Minify.csproj
  2. 4
      framework/src/Volo.Abp.Minify/Volo/Abp/Minify/IMinifier.cs
  3. 2
      framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyCssMinifier.cs
  4. 2
      framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyException.cs
  5. 2
      framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyHtmlMinifier.cs
  6. 2
      framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyJavascriptMinifier.cs
  7. 8
      framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyMinifierBase.cs

2
framework/src/Volo.Abp.Minify/Volo.Abp.Minify.csproj

@ -5,6 +5,8 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<AssemblyName>Volo.Abp.Minify</AssemblyName>
<PackageId>Volo.Abp.Minify</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

4
framework/src/Volo.Abp.Minify/Volo/Abp/Minify/IMinifier.cs

@ -6,6 +6,6 @@ public interface IMinifier
{
string Minify(
string source,
[CanBeNull] string fileName = null,
[CanBeNull] string originalFileName = null);
string? fileName = null,
string? originalFileName = null);
}

2
framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyCssMinifier.cs

@ -5,7 +5,7 @@ namespace Volo.Abp.Minify.NUglify;
public class NUglifyCssMinifier : NUglifyMinifierBase, ICssMinifier
{
protected override UglifyResult UglifySource(string source, string fileName)
protected override UglifyResult UglifySource(string source, string? fileName)
{
return Uglify.Css(source, fileName);
}

2
framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyException.cs

@ -7,7 +7,7 @@ namespace Volo.Abp.Minify.NUglify;
public class NUglifyException : AbpException
{
public List<UglifyError> Errors { get; set; }
public List<UglifyError>? Errors { get; set; }
public NUglifyException(string message, List<UglifyError> errors)
: base(message)

2
framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyHtmlMinifier.cs

@ -5,7 +5,7 @@ namespace Volo.Abp.Minify.NUglify;
public class NUglifyHtmlMinifier : NUglifyMinifierBase, IHtmlMinifier
{
protected override UglifyResult UglifySource(string source, string fileName)
protected override UglifyResult UglifySource(string source, string? fileName)
{
return Uglify.Html(source, sourceFileName: fileName);
}

2
framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyJavascriptMinifier.cs

@ -5,7 +5,7 @@ namespace Volo.Abp.Minify.NUglify;
public class NUglifyJavascriptMinifier : NUglifyMinifierBase, IJavascriptMinifier
{
protected override UglifyResult UglifySource(string source, string fileName)
protected override UglifyResult UglifySource(string source, string? fileName)
{
return Uglify.Js(source, fileName);
}

8
framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyMinifierBase.cs

@ -8,7 +8,7 @@ namespace Volo.Abp.Minify.NUglify;
public abstract class NUglifyMinifierBase : IMinifier, ITransientDependency
{
private static void CheckErrors(UglifyResult result, string originalFileName)
private static void CheckErrors(UglifyResult result, string? originalFileName)
{
if (result.HasErrors)
{
@ -28,8 +28,8 @@ public abstract class NUglifyMinifierBase : IMinifier, ITransientDependency
public string Minify(
string source,
string fileName = null,
string originalFileName = null)
string? fileName = null,
string? originalFileName = null)
{
try
{
@ -50,5 +50,5 @@ public abstract class NUglifyMinifierBase : IMinifier, ITransientDependency
}
}
protected abstract UglifyResult UglifySource(string source, string fileName);
protected abstract UglifyResult UglifySource(string source, string? fileName);
}

Loading…
Cancel
Save