TenantResolveOptions to AbpTenantResolveOptions

framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs

@@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<TenantResolveOptions>(options =>
+            Configure<AbpTenantResolveOptions>(options =>
             {
                 options.TenantResolvers.Add(new QueryStringTenantResolveContributor());
                 options.TenantResolvers.Add(new RouteTenantResolveContributor());

framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs

@@ -5,7 +5,7 @@ namespace Volo.Abp.MultiTenancy
 {
     public static class MultiTenancyOptionsExtensions
     {
-        public static void AddDomainTenantResolver(this TenantResolveOptions options, string domainFormat)
+        public static void AddDomainTenantResolver(this AbpTenantResolveOptions options, string domainFormat)
         {
             options.TenantResolvers.InsertAfter(
                 r => r is CurrentUserTenantResolveContributor,

framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveOptions.cs → framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpTenantResolveOptions.cs

@@ -3,12 +3,12 @@ using JetBrains.Annotations;
 
 namespace Volo.Abp.MultiTenancy
 {
-    public class TenantResolveOptions
+    public class AbpTenantResolveOptions
     {
         [NotNull]
         public List<ITenantResolveContributor> TenantResolvers { get; }
 
-        public TenantResolveOptions()
+        public AbpTenantResolveOptions()
         {
             TenantResolvers = new List<ITenantResolveContributor>
             {

framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolver.cs

@@ -10,9 +10,9 @@ namespace Volo.Abp.MultiTenancy
     public class TenantResolver : ITenantResolver, ITransientDependency
     {
         private readonly IServiceProvider _serviceProvider;
-        private readonly TenantResolveOptions _options;
+        private readonly AbpTenantResolveOptions _options;
 
-        public TenantResolver(IOptions<TenantResolveOptions> options, IServiceProvider serviceProvider)
+        public TenantResolver(IOptions<AbpTenantResolveOptions> options, IServiceProvider serviceProvider)
         {
             _serviceProvider = serviceProvider;
             _options = options.Value;

framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs

@@ -35,7 +35,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
                     };
                 });
 
-                services.Configure<TenantResolveOptions>(options =>
+                services.Configure<AbpTenantResolveOptions>(options =>
                 {
                     options.AddDomainTenantResolver("{0}.abp.io");
                 });