Skip to content

Commit

Permalink
Remove the Dignite prefix from the module name
Browse files Browse the repository at this point in the history
  • Loading branch information
duguankui committed Jan 12, 2025
1 parent e8dd03e commit bcd1e5f
Show file tree
Hide file tree
Showing 114 changed files with 227 additions and 226 deletions.
2 changes: 1 addition & 1 deletion common.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>3.0.0-rc.22</Version>
<Version>3.0.0-rc.24</Version>
<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
<PackageIconUrl>https://dignite.com/assets/dignite_nupkg.png</PackageIconUrl>
<PackageProjectUrl>https://dignite.com/dignite-abp</PackageProjectUrl>
Expand Down
2 changes: 1 addition & 1 deletion framework/Dignite.Abp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dignite.Abp.DynamicForms",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dignite.Abp.MultiTenancyLocalization", "src\Dignite.Abp.MultiTenancyLocalization\Dignite.Abp.MultiTenancyLocalization.csproj", "{87EB042B-ACF7-4FA5-8553-15EBED66139E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dignite.Abp.AspNetCore.Mvc.MultiTenancyUI", "src\Dignite.Abp.AspNetCore.Mvc.MultiTenancyUI\Dignite.Abp.AspNetCore.Mvc.MultiTenancyUI.csproj", "{E3847E4D-F283-4BA6-BA15-F1C9E723DD74}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dignite.Abp.AspNetCore.Mvc.UI.MultiTenancyTheme", "src\Dignite.Abp.AspNetCore.Mvc.UI.MultiTenancyTheme\Dignite.Abp.AspNetCore.Mvc.UI.MultiTenancyTheme.csproj", "{E3847E4D-F283-4BA6-BA15-F1C9E723DD74}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dignite.Abp.Points", "src\Dignite.Abp.Points\Dignite.Abp.Points.csproj", "{19404858-29C0-4223-9393-E40F4C8F255E}"
EndProject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<AssemblyName>Dignite.Abp.AspNetCore.Mvc.UI</AssemblyName>
<PackageId>Dignite.Abp.AspNetCore.Mvc.UI</PackageId>
<AssemblyName>Dignite.Abp.AspNetCore.Mvc.UI.MultiTenancyTheme</AssemblyName>
<PackageId>Dignite.Abp.AspNetCore.Mvc.UI.MultiTenancyTheme</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<IsPackable>true</IsPackable>
<OutputType>Library</OutputType>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
using Volo.Abp.Modularity;
using Volo.Abp.MultiTenancy;

namespace Dignite.Abp.AspNetCore.Mvc.UI;
namespace Dignite.Abp.AspNetCore.Mvc.UI.MultiTenancyTheme;

[DependsOn(typeof(Volo.Abp.AspNetCore.Mvc.UI.AbpAspNetCoreMvcUiModule))]
public class AbpAspNetCoreMvcMultiTenancyUiModule : AbpModule
public class AbpAspNetCoreMvcUiMultiTenancyThemeModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Volo.Abp.DependencyInjection;
using Volo.Abp.MultiTenancy;

namespace Dignite.Abp.AspNetCore.Mvc.UI.Theming;
namespace Dignite.Abp.AspNetCore.Mvc.UI.MultiTenancyTheme;

/// <summary>
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ namespace Dignite.Abp.DynamicForms.Components.BlazoriseUI;

[DependsOn(
typeof(DigniteAbpBlazoriseUiModule),
typeof(DigniteAbpDynamicFormsComponentsModule)
typeof(AbpDynamicFormsComponentsModule)
)]
public class DigniteAbpDynamicFormsComponentsBlazoriseUiModule : AbpModule
public class AbpDynamicFormsComponentsBlazoriseUiModule : AbpModule
{
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using Volo.Abp.Modularity;

namespace Dignite.Abp.DynamicForms.Components;

[DependsOn(
typeof(AbpDynamicFormsModule)
)]
public class AbpDynamicFormsComponentsModule : AbpModule
{
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public abstract class FormConfigurationComponentBase<TFormControl, TFormConfigur

protected FormConfigurationComponentBase()
{
LocalizationResource = typeof(DigniteAbpDynamicFormsResource);
LocalizationResource = typeof(AbpDynamicFormsResource);
FormControlType = typeof(TFormControl);
FormConfiguration = new TFormConfiguration();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public abstract class FormControlComponentBase<TFormControl, TFormConfiguration,

protected FormControlComponentBase()
{
LocalizationResource = typeof(DigniteAbpDynamicFormsModule);
LocalizationResource = typeof(AbpDynamicFormsModule);
FormControlType = typeof(TFormControl);
FormConfiguration = new TFormConfiguration();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public abstract class FormViewComponentBase<TForm, TFormConfiguration> : AbpComp

protected FormViewComponentBase()
{
LocalizationResource = typeof(DigniteAbpDynamicFormsModule);
LocalizationResource = typeof(AbpDynamicFormsModule);
FormControlType = typeof(TForm);
FormConfiguration = new TFormConfiguration();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ namespace Dignite.Abp.DynamicForms;
[DependsOn(
typeof(AbpLocalizationModule)
)]
public class DigniteAbpDynamicFormsModule : AbpModule
public class AbpDynamicFormsModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
Configure<AbpVirtualFileSystemOptions>(options =>
{
options.FileSets.AddEmbedded<DigniteAbpDynamicFormsModule>();
options.FileSets.AddEmbedded<AbpDynamicFormsModule>();
});

Configure<AbpLocalizationOptions>(options =>
{
options.Resources
.Add<DigniteAbpDynamicFormsResource>("en")
.Add<AbpDynamicFormsResource>("en")
.AddVirtualJson("/Dignite/Abp/DynamicForms/Localization/Resources");
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ protected Type LocalizationResource {
}
}

private Type _localizationResource = typeof(DigniteAbpDynamicFormsResource);
private Type _localizationResource = typeof(AbpDynamicFormsResource);

public abstract string Name { get; }

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using Volo.Abp.Localization;

namespace Dignite.Abp.DynamicForms.Localization;

[LocalizationResourceName("AbpDynamicForm")]
public class AbpDynamicFormsResource
{
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<AssemblyName>Dignite.Abp.Localization</AssemblyName>
<PackageId>Dignite.Abp.Localization</PackageId>
<AssemblyName>Dignite.Abp.MultiTenancyLocalization</AssemblyName>
<PackageId>Dignite.Abp.MultiTenancyLocalization</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ namespace Dignite.Abp.Notifications.Components;
[DependsOn(
typeof(AbpAspNetCoreComponentsModule)
)]
public class DigniteAbpNotificationsComponentsModule: AbpModule
public class AbpNotificationsComponentsModule: AbpModule
{
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ namespace Dignite.Abp.Notifications;
[DependsOn(
typeof(AbpLocalizationModule)
)]
public class DigniteAbpNotificationsSharedModule : AbpModule
public class AbpNotificationsSharedModule : AbpModule
{
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
namespace Dignite.Abp.Notifications.SignalRNotifier;

[DependsOn(
typeof(DigniteAbpNotificationsSharedModule),
typeof(AbpNotificationsSharedModule),
typeof(AbpAspNetCoreSignalRModule)
)]
public class DigniteAbpNotificationsSignalRNotifierModule : AbpModule
public class AbpNotificationsSignalRNotifierModule : AbpModule
{
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
namespace Dignite.Abp.Notifications;

[DependsOn(
typeof(DigniteAbpNotificationsSharedModule),
typeof(AbpNotificationsSharedModule),
typeof(AbpFeaturesModule),
typeof(AbpTimingModule),
typeof(AbpBackgroundJobsAbstractionsModule),
typeof(AbpGuidsModule),
typeof(AbpEventBusModule)
)]
public class DigniteAbpNotificationsModule : AbpModule
public class AbpNotificationsModule : AbpModule
{
public override void PreConfigureServices(ServiceConfigurationContext context)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Dignite.Abp.Points;
[DependsOn(
typeof(AbpTimingModule)
)]
public class DigniteAbpPointsModule : AbpModule
public class AbpPointsModule : AbpModule
{
public override void PreConfigureServices(ServiceConfigurationContext context)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ namespace Dignite.Abp.DynamicForms.Components;
[DependsOn(
typeof(AbpTestBaseModule),
typeof(AbpAutofacModule),
typeof(DigniteAbpDynamicFormsComponentsBlazoriseUiModule)
typeof(AbpDynamicFormsComponentsBlazoriseUiModule)
)]
public class DigniteAbpDynamicFormsComponentsTestModule : AbpModule
public class AbpDynamicFormsComponentsTestModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace Dignite.Abp.DynamicForms.Components;

public class FieldComponentsTestBase : AbpIntegratedTest<DigniteAbpDynamicFormsComponentsTestModule>
public class FieldComponentsTestBase : AbpIntegratedTest<AbpDynamicFormsComponentsTestModule>
{
protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ namespace Dignite.Abp.DynamicForms;
[DependsOn(
typeof(AbpTestBaseModule),
typeof(AbpAutofacModule),
typeof(DigniteAbpDynamicFormsModule)
typeof(AbpDynamicFormsModule)
)]
public class DigniteAbpDynamicFormsTestModule : AbpModule
public class AbpDynamicFormsTestModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace Dignite.Abp.DynamicForms;

public class DynamicFormsTestBase : AbpIntegratedTest<DigniteAbpDynamicFormsTestModule>
public class DynamicFormsTestBase : AbpIntegratedTest<AbpDynamicFormsTestModule>
{
protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ namespace Dignite.Abp.Notifications;
typeof(AbpTestBaseModule),
typeof(AbpAutofacModule),
typeof(AbpBackgroundJobsModule),
typeof(DigniteAbpNotificationsModule)
typeof(AbpNotificationsModule)
)]
public class DigniteAbpNotificationsTestModule : AbpModule
public class AbpNotificationsTestModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace Dignite.Abp.Notifications;

public class NotificationsTestBase : AbpIntegratedTest<DigniteAbpNotificationsTestModule>
public class NotificationsTestBase : AbpIntegratedTest<AbpNotificationsTestModule>
{
protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ namespace Dignite.Abp.Points;
[DependsOn(
typeof(AbpTestBaseModule),
typeof(AbpAutofacModule),
typeof(DigniteAbpPointsModule)
typeof(AbpPointsModule)
)]
public class DigniteAbpPointsTestModule : AbpModule
public class AbpPointsTestModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace Dignite.Abp.Points;

public class PointsTestBase : AbpIntegratedTest<DigniteAbpPointsTestModule>
public class PointsTestBase : AbpIntegratedTest<AbpPointsTestModule>
{
protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options)
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Dignite.Abp.AspNetCore.Components.CkEditor.Server;
[DependsOn(
typeof(AbpAspNetCoreComponentsServerThemingModule)
)]
public class DigniteAbpAspNetCoreComponentsCkEditorServerModule: AbpModule
public class AbpAspNetCoreComponentsCkEditorServerModule: AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ namespace Dignite.Abp.AspNetCore.Components.CkEditor.WebAssembly;
[DependsOn(
typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule)
)]
public class DigniteAbpAspNetCoreComponentsCkEditorWebAssemblyModule : AbpModule
public class AbpAspNetCoreComponentsCkEditorWebAssemblyModule : AbpModule
{
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@
namespace Dignite.Abp.DynamicForms.CkEditor;

[DependsOn(
typeof(DigniteAbpDynamicFormsModule)
typeof(AbpDynamicFormsModule)
)]
public class DigniteAbpDynamicFormsCkEditorModule : AbpModule
public class AbpDynamicFormsCkEditorModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
Configure<AbpVirtualFileSystemOptions>(options =>
{
options.FileSets.AddEmbedded<DigniteAbpDynamicFormsCkEditorModule>();
options.FileSets.AddEmbedded<AbpDynamicFormsCkEditorModule>();
});

Configure<AbpLocalizationOptions>(options =>
{
options.Resources
.Add<DigniteAbpDynamicFormsCkEditorResource>("en")
.AddVirtualJson("/Dignite/Abp/DynamicForms/CkEditor/Localization/Resources")
.AddBaseTypes(typeof(DigniteAbpDynamicFormsResource)); //Inherit from an existing resource
.AddBaseTypes(typeof(AbpDynamicFormsResource)); //Inherit from an existing resource
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ namespace Dignite.Abp.DynamicForms.Components.BlazoriseUI.CkEditor;

[DependsOn(
typeof(DigniteAbpBlazoriseUiModule),
typeof(DigniteAbpDynamicFormsComponentsModule),
typeof(DigniteAbpDynamicFormsCkEditorModule)
typeof(AbpDynamicFormsComponentsModule),
typeof(AbpDynamicFormsCkEditorModule)
)]
public class DigniteAbpDynamicFormsComponentsCkEditorModule : AbpModule
public class AbpDynamicFormsComponentsCkEditorModule : AbpModule
{
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
namespace Dignite.Abp.DynamicForms.Components.BlazoriseUI.FileExplorer;

[DependsOn(
typeof(DigniteAbpDynamicFormsComponentsModule),
typeof(DigniteAbpDynamicFormsFileExplorerModule),
typeof(AbpDynamicFormsComponentsModule),
typeof(AbpDynamicFormsFileExplorerModule),
typeof(FileExplorerBlazorModule)
)]
public class DigniteAbpDynamicFormsComponentsFileExplorerModule : AbpModule
public class AbpDynamicFormsComponentsFileExplorerModule : AbpModule
{
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ public partial class FileExplorerFormConfigurationComponent
{
public FileExplorerFormConfigurationComponent()
{
LocalizationResource = typeof(DigniteAbpDynamicFormsFileExplorerResource);
LocalizationResource = typeof(AbpDynamicFormsFileExplorerResource);
}
}
Loading

0 comments on commit bcd1e5f

Please sign in to comment.