Browse Source

Enable nullable annotations for Volo.Abp.AspNetCore.TestBase

pull/17096/head
liangshiwei 3 years ago
parent
commit
054778b97f
  1. 2
      framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj
  2. 12
      framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreAsyncIntegratedTestBase.cs
  3. 2
      framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/TestServerAccessor.cs

2
framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj

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

12
framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreAsyncIntegratedTestBase.cs

@ -16,20 +16,20 @@ namespace Volo.Abp.AspNetCore.TestBase;
public class AbpAspNetCoreAsyncIntegratedTestBase<TModule> public class AbpAspNetCoreAsyncIntegratedTestBase<TModule>
where TModule : IAbpModule where TModule : IAbpModule
{ {
protected WebApplication WebApplication { get; set; } protected WebApplication WebApplication { get; set; } = default!;
protected TestServer Server { get; set; } protected TestServer Server { get; set; } = default!;
protected HttpClient Client { get; set; } protected HttpClient Client { get; set; } = default!;
protected IServiceProvider ServiceProvider { get; set; } protected IServiceProvider ServiceProvider { get; set; } = default!;
protected virtual T GetService<T>() protected virtual T? GetService<T>()
{ {
return ServiceProvider.GetService<T>(); return ServiceProvider.GetService<T>();
} }
protected virtual T GetRequiredService<T>() protected virtual T GetRequiredService<T>() where T : notnull
{ {
return ServiceProvider.GetRequiredService<T>(); return ServiceProvider.GetRequiredService<T>();
} }

2
framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/TestServerAccessor.cs

@ -5,5 +5,5 @@ namespace Volo.Abp.AspNetCore.TestBase;
public class TestServerAccessor : ITestServerAccessor, ISingletonDependency public class TestServerAccessor : ITestServerAccessor, ISingletonDependency
{ {
public TestServer Server { get; set; } public TestServer Server { get; set; } = default!;
} }

Loading…
Cancel
Save