aspnetboilerplate
/
module-zero-core-template
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'master' of github.com:aspnetboilerplate/module-zero-core-template

This commit is contained in:
EduardoSantanaSeverino 2022-10-26 12:16:52 -04:00
Родитель 0582390447 2400d38b4f
Коммит 4324248564
35 изменённых файлов: 3968 добавлений и 1604 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
angular/angular.json
Просмотреть файл

@ -121,6 +121,7 @@
"main": "src/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"assets": [
"src/assets",
"src/favicon.ico",

15
angular/e2e/tsconfig.json
Просмотреть файл

@ -13,6 +13,17 @@
"target": "es6",
"typeRoots": [
"../node_modules/@types"
]
}
],
"baseUrl": ".",
"paths": {
"@abp/*": [ "../node_modules/abp-ng2-module/dist/src/*" ],
"@app/*": [ "./app/*" ],
"@shared/*": [ "./shared/*" ],
"@node_modules/*": [ "../node_modules/*" ]
}
},
"files": [
"../src/polyfills.ts",
"../src/test.ts"
],
}

101
angular/src/app/app.component.spec.ts
Просмотреть файл

@ -1,34 +1,97 @@
/* tslint:disable:no-unused-variable */
import { TestBed, async } from "@angular/core/testing";
import { AppComponent } from "./app.component";
import { LayoutStoreService } from "../shared/layout/layout-store.service";
import { AppSessionService } from "../shared/session/app-session.service";
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { TestBed, async } from '@angular/core/testing';
import { AppComponent } from './app.component';
import { CommonModule } from "@angular/common";
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
import { HttpClientJsonpModule } from "@angular/common/http";
import { HttpClientModule } from "@angular/common/http";
import { ModalModule } from "ngx-bootstrap/modal";
import { BsDropdownModule } from "ngx-bootstrap/dropdown";
import { CollapseModule } from "ngx-bootstrap/collapse";
import { TabsModule } from "ngx-bootstrap/tabs";
import { NgxPaginationModule } from "ngx-pagination";
import { RouterTestingModule } from "@angular/router/testing";
import { ServiceProxyModule } from "../shared/service-proxies/service-proxy.module";
import { SharedModule } from "../shared/shared.module";
import { HomeComponent } from "../app/home/home.component";
import { AboutComponent } from "../app/about/about.component";
describe('AppComponent', () => {
// layout
import { HeaderComponent } from "./layout/header.component";
import { HeaderLeftNavbarComponent } from "./layout/header-left-navbar.component";
import { HeaderLanguageMenuComponent } from "./layout/header-language-menu.component";
import { HeaderUserMenuComponent } from "./layout/header-user-menu.component";
import { FooterComponent } from "./layout/footer.component";
import { SidebarComponent } from "./layout/sidebar.component";
import { SidebarLogoComponent } from "./layout/sidebar-logo.component";
import { SidebarUserPanelComponent } from "./layout/sidebar-user-panel.component";
import { SidebarMenuComponent } from "./layout/sidebar-menu.component";
describe("AppComponent", () => {
beforeEach(() => {
TestBed.configureTestingModule({
declarations: [
AppComponent
AppComponent,
HomeComponent,
AboutComponent,
// layout
HeaderComponent,
HeaderLeftNavbarComponent,
HeaderLanguageMenuComponent,
HeaderUserMenuComponent,
FooterComponent,
SidebarComponent,
SidebarLogoComponent,
SidebarUserPanelComponent,
SidebarMenuComponent,
],
imports: [
BrowserAnimationsModule,
CommonModule,
FormsModule,
ReactiveFormsModule,
HttpClientModule,
HttpClientJsonpModule,
ModalModule.forChild(),
BsDropdownModule.forRoot(),
CollapseModule.forRoot(),
TabsModule.forRoot(),
RouterTestingModule,
ServiceProxyModule,
SharedModule.forRoot(),
NgxPaginationModule,
],
providers: [
LayoutStoreService,
{
provide: AppSessionService,
useValue: {
application: {
version: "",
releaseDate: {
format: function () {
return "";
},
},
},
getShownLoginName: function(){
return 'admin';
}
},
},
],
});
TestBed.compileComponents();
});
it('should create the app', async(() => {
it("should create the app", async(() => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app).toBeTruthy();
}));
it(`should have as title 'app works!'`, async(() => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app.title).toEqual('app works!');
}));
it('should render title in a h1 tag', async(() => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.debugElement.nativeElement;
expect(compiled.querySelector('h1').textContent).toContain('app works!');
}));
});

2928
angular/src/shared/service-proxies/service-proxies.ts
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

17
angular/src/tsconfig.spec.json Normal file
Просмотреть файл

@ -0,0 +1,17 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./out-tsc/spec",
"types": [
"jasmine"
]
},
"files": [
"test.ts",
"polyfills.ts"
],
"include": [
"**/*.spec.ts",
"**/*.d.ts"
]
}

4
aspnet-core/.gitignore поставляемый
Просмотреть файл

@ -250,3 +250,7 @@ paket-files/
# JetBrains Rider
.idea/
*.sln.iml
src/AbpCompanyName.AbpProjectName.Web.Mvc/secrets.json
src/AbpCompanyName.AbpProjectName.Web.Host/secrets.json
src/AbpCompanyName.AbpProjectName.Migrator/secrets.json

2
aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<VersionPrefix>1.0.0.0</VersionPrefix>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AssemblyName>AbpCompanyName.AbpProjectName.Application</AssemblyName>
<PackageId>AbpCompanyName.AbpProjectName.Application</PackageId>

8
aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<VersionPrefix>1.0.0.0</VersionPrefix>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AssemblyName>AbpCompanyName.AbpProjectName.Core</AssemblyName>
<PackageId>AbpCompanyName.AbpProjectName.Core</PackageId>
@ -18,9 +18,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Abp.AutoMapper" Version="6.4.0" />
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="6.4.0" />
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
<PackageReference Include="Abp.AutoMapper" Version="7.3.0" />
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="7.3.0" />
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.4.0" />
</ItemGroup>
</Project>

10
aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameConsts.cs
Просмотреть файл

@ -1,4 +1,6 @@
namespace AbpCompanyName.AbpProjectName
using AbpCompanyName.AbpProjectName.Debugging;
namespace AbpCompanyName.AbpProjectName
{
public class AbpProjectNameConsts
{
@ -7,10 +9,12 @@
public const string ConnectionStringName = "Default";
public const bool MultiTenancyEnabled = true;
/// <summary>
/// Default pass phrase for SimpleStringCipher decrypt/encrypt operations
/// </summary>
public const string DefaultPassPhrase = "{{DEFAULT_PASS_PHRASE_HERE}}";
public static readonly string DefaultPassPhrase =
DebugHelper.IsDebug ? "gsKxGZ012HLL3MI5" : "{{DEFAULT_PASS_PHRASE_HERE}}";
}
}

2
aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameCoreModule.cs
Просмотреть файл

@ -1,6 +1,7 @@
using Abp.Localization;
using Abp.Modules;
using Abp.Reflection.Extensions;
using Abp.Runtime.Security;
using Abp.Timing;
using Abp.Zero;
using Abp.Zero.Configuration;
@ -38,6 +39,7 @@ namespace AbpCompanyName.AbpProjectName
Configuration.Localization.Languages.Add(new LanguageInfo("fa", "فارسی", "famfamfam-flags ir"));
Configuration.Settings.SettingEncryptionConfiguration.DefaultPassPhrase = AbpProjectNameConsts.DefaultPassPhrase;
SimpleStringCipher.DefaultPassPhrase = AbpProjectNameConsts.DefaultPassPhrase;
}
public override void Initialize()

2
aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AppVersionHelper.cs
Просмотреть файл

@ -13,7 +13,7 @@ namespace AbpCompanyName.AbpProjectName
/// Gets current version of the application.
/// It's also shown in the web page.
/// </summary>
public const string Version = "5.5.0.0";
public const string Version = "7.3.0.0";
/// <summary>
/// Gets release (last build) date of the application.

73
aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserManager.cs
Просмотреть файл

@ -11,47 +11,50 @@ using Abp.Domain.Uow;
using Abp.Organizations;
using Abp.Runtime.Caching;
using AbpCompanyName.AbpProjectName.Authorization.Roles;
using Abp.Authorization.Roles;
namespace AbpCompanyName.AbpProjectName.Authorization.Users
{
public class UserManager : AbpUserManager<Role, User>
{
public UserManager(
RoleManager roleManager,
UserStore store,
IOptions<IdentityOptions> optionsAccessor,
IPasswordHasher<User> passwordHasher,
IEnumerable<IUserValidator<User>> userValidators,
IEnumerable<IPasswordValidator<User>> passwordValidators,
ILookupNormalizer keyNormalizer,
IdentityErrorDescriber errors,
IServiceProvider services,
ILogger<UserManager<User>> logger,
IPermissionManager permissionManager,
IUnitOfWorkManager unitOfWorkManager,
ICacheManager cacheManager,
IRepository<OrganizationUnit, long> organizationUnitRepository,
IRepository<UserOrganizationUnit, long> userOrganizationUnitRepository,
IOrganizationUnitSettings organizationUnitSettings,
ISettingManager settingManager)
: base(
roleManager,
store,
optionsAccessor,
passwordHasher,
userValidators,
passwordValidators,
keyNormalizer,
errors,
services,
logger,
permissionManager,
unitOfWorkManager,
cacheManager,
organizationUnitRepository,
userOrganizationUnitRepository,
organizationUnitSettings,
settingManager)
RoleManager roleManager,
UserStore store,
IOptions<IdentityOptions> optionsAccessor,
IPasswordHasher<User> passwordHasher,
IEnumerable<IUserValidator<User>> userValidators,
IEnumerable<IPasswordValidator<User>> passwordValidators,
ILookupNormalizer keyNormalizer,
IdentityErrorDescriber errors,
IServiceProvider services,
ILogger<UserManager<User>> logger,
IPermissionManager permissionManager,
IUnitOfWorkManager unitOfWorkManager,
ICacheManager cacheManager,
IRepository<OrganizationUnit, long> organizationUnitRepository,
IRepository<UserOrganizationUnit, long> userOrganizationUnitRepository,
IOrganizationUnitSettings organizationUnitSettings,
ISettingManager settingManager,
IRepository<UserLogin, long> userLoginRepository)
: base(
roleManager,
store,
optionsAccessor,
passwordHasher,
userValidators,
passwordValidators,
keyNormalizer,
errors,
services,
logger,
permissionManager,
unitOfWorkManager,
cacheManager,
organizationUnitRepository,
userOrganizationUnitRepository,
organizationUnitSettings,
settingManager,
userLoginRepository)
{
}
}

2
aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Configuration/AppConfigurations.cs
Просмотреть файл

@ -38,7 +38,7 @@ namespace AbpCompanyName.AbpProjectName.Configuration
if (addUserSecrets)
{
builder.AddUserSecrets(typeof(AppConfigurations).GetAssembly());
builder.AddUserSecrets(typeof(AppConfigurations).GetAssembly(), optional: true);
}
return builder.Build();

18
aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Debugging/DebugHelper.cs Normal file
Просмотреть файл

@ -0,0 +1,18 @@
namespace AbpCompanyName.AbpProjectName.Debugging
{
public static class DebugHelper
{
public static bool IsDebug
{
get
{
#pragma warning disable
#if DEBUG
return true;
#endif
return false;
#pragma warning restore
}
}
}
}

26
aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName-lt.xml
Просмотреть файл

@ -85,7 +85,7 @@
<text name="TenantIdIsNotActive{0}">Savininkas su Id {0} yra neaktyvus</text>
<text name="UnknownTenantId{0}">Nežinomas savininko Id {0}</text>
<text name="ThisFieldIsRequired">Šis laukas yra privalomas</text>
<text name="ThisFieldIsRequired">Šis laukas yra privalomas</text>
<text name="PleaseWait">Prašome palaukti...</text>
<text name="Administration">Administration</text>
<text name="ClearAll">Išvalyti visus</text>
@ -104,6 +104,28 @@
<text name="AreYouSureWantToDelete">Ar tikrai norite pašalinti {0}?</text>
<text name="StartTyping">Pradėkite rašyti</text>
<text name="Skins">Apvalkalai</text>
<text name="Settings">Nustatymai</text>
<text name="Settings">Nustatymai</text>
<text name="Filter">Filtruoti</text>
<text name="CurrentPassword">Dabartinis slaptažodis</text>
<text name="NewPassword">Naujas slaptažodis</text>
<text name="ConfirmNewPassword">Pakartoti naują slaptažodį</text>
<text name="PasswordsDoNotMatch">Slaptažodžiai nesutampa</text>
<text name="PasswordsMustBeAtLeast8CharactersContainLowercaseUppercaseNumber">Slaptažodžiai turi būti bent 8 simbolių, turėti mažųjų, didžiųjų raidžių ir skaičių</text>
<text name="UserDeleteWarningMessage">Vartotojas {0} bus pašalintas.</text>
<text name="RoleDeleteWarningMessage">Rolė {0} bus pašalinta ir atskirta nuo visų priskirtų vartotojų.</text>
<text name="TenantDeleteWarningMessage">Savininkas {0} bus pašalintas.</text>
<text name="SearchWithThreeDot">Ieškoti...</text>
<text name="PleaseEnterAtLeastNCharacter">Įveskite bent {0} simbolius</text>
<text name="PleaseEnterNoMoreThanNCharacter">Įveskite ne daugiau nei {0} simbolius</text>
<text name="InvalidEmailAddress">Nevalidus el. pašto adresas</text>
<text name="InvalidPattern">Nevalidus</text>
<text name="PairsDoNotMatch">Nesutampa</text>
<text name="All">Visi</text>
<text name="TotalRecordsCount">Iš viso: {0}</text>
<text name="Search">Ieškoti</text>
<text name="Clear">Išvalyti</text>
<text name="ResetPasswordStepOneInfo">1. Įveskite savo administratoriaus slaptažodį</text>
<text name="ResetPasswordStepTwoInfo">2. Nusikopijuokite šį atsitiktinį slaptažodį, kad persiųstumėte vartotojui</text>
<text name="UsersActivation">Vartotojų aktyvacija</text>
</texts>
</localizationDictionary>

8
aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@ -16,12 +16,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

1954
aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/20220622074714_Upgrade_To_ABP_7.3.Designer.cs сгенерированный Normal file
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

35
aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/20220622074714_Upgrade_To_ABP_7.3.cs Normal file
Просмотреть файл

@ -0,0 +1,35 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace AbpCompanyName.AbpProjectName.Migrations
{
public partial class Upgrade_To_ABP_73 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "TargetNotifiers",
table: "AbpUserNotifications",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "TargetNotifiers",
table: "AbpNotifications",
type: "nvarchar(max)",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "TargetNotifiers",
table: "AbpUserNotifications");
migrationBuilder.DropColumn(
name: "TargetNotifiers",
table: "AbpNotifications");
}
}
}

177
aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/AbpProjectNameDbContextModelSnapshot.cs
Просмотреть файл

@ -6,6 +6,8 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace AbpCompanyName.AbpProjectName.Migrations
{
[DbContext(typeof(AbpProjectNameDbContext))]
@ -15,16 +17,18 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
#pragma warning disable 612, 618
modelBuilder
.UseIdentityColumns()
.HasAnnotation("Relational:MaxIdentifierLength", 128)
.HasAnnotation("ProductVersion", "5.0.3");
.HasAnnotation("ProductVersion", "6.0.4")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
modelBuilder.Entity("Abp.Application.Editions.Edition", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.UseIdentityColumn();
.HasColumnType("int");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2");
@ -66,8 +70,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2");
@ -103,8 +108,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<string>("BrowserInfo")
.HasMaxLength(512)
@ -178,8 +184,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2");
@ -215,8 +222,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<string>("ClaimType")
.HasMaxLength(256)
@ -250,8 +258,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2");
@ -310,8 +319,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<string>("ClaimType")
.HasMaxLength(256)
@ -345,8 +355,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<string>("LoginProvider")
.IsRequired()
@ -383,8 +394,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<string>("BrowserInfo")
.HasMaxLength(512)
@ -431,8 +443,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2");
@ -465,8 +478,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2");
@ -498,8 +512,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<DateTime?>("ExpireDate")
.HasColumnType("datetime2");
@ -535,8 +550,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2");
@ -580,8 +596,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2");
@ -623,8 +640,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.UseIdentityColumn();
.HasColumnType("int");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
b.Property<int>("DynamicPropertyId")
.HasColumnType("int");
@ -651,8 +669,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<int>("DynamicEntityPropertyId")
.HasColumnType("int");
@ -678,8 +697,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.UseIdentityColumn();
.HasColumnType("int");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
b.Property<string>("DisplayName")
.HasColumnType("nvarchar(max)");
@ -710,8 +730,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<int>("DynamicPropertyId")
.HasColumnType("int");
@ -734,8 +755,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<DateTime>("ChangeTime")
.HasColumnType("datetime2");
@ -770,8 +792,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<string>("BrowserInfo")
.HasMaxLength(512)
@ -822,8 +845,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<long>("EntityChangeId")
.HasColumnType("bigint");
@ -864,8 +888,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.UseIdentityColumn();
.HasColumnType("int");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2");
@ -919,8 +944,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2");
@ -1008,6 +1034,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
b.Property<byte>("Severity")
.HasColumnType("tinyint");
b.Property<string>("TargetNotifiers")
.HasColumnType("nvarchar(max)");
b.Property<string>("TenantIds")
.HasMaxLength(131072)
.HasColumnType("nvarchar(max)");
@ -1126,6 +1155,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
b.Property<int>("State")
.HasColumnType("int");
b.Property<string>("TargetNotifiers")
.HasColumnType("nvarchar(max)");
b.Property<int?>("TenantId")
.HasColumnType("int");
@ -1146,8 +1178,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<string>("Code")
.IsRequired()
@ -1199,8 +1232,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2");
@ -1334,8 +1368,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.UseIdentityColumn();
.HasColumnType("int");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
@ -1408,8 +1443,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
.HasColumnType("bigint");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
b.Property<int>("AccessFailedCount")
.HasColumnType("int");
@ -1535,8 +1571,9 @@ namespace AbpCompanyName.AbpProjectName.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.UseIdentityColumn();
.HasColumnType("int");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
b.Property<string>("ConnectionString")
.HasMaxLength(1024)
@ -1608,17 +1645,6 @@ namespace AbpCompanyName.AbpProjectName.Migrations
b.HasDiscriminator().HasValue("EditionFeatureSetting");
});
modelBuilder.Entity("Abp.MultiTenancy.TenantFeatureSetting", b =>
{
b.HasBaseType("Abp.Application.Features.FeatureSetting");
b.HasIndex("TenantId", "Name");
b.ToTable("AbpFeatures");
b.HasDiscriminator().HasValue("TenantFeatureSetting");
});
modelBuilder.Entity("Abp.Authorization.Roles.RolePermissionSetting", b =>
{
b.HasBaseType("Abp.Authorization.PermissionSetting");
@ -1647,6 +1673,17 @@ namespace AbpCompanyName.AbpProjectName.Migrations
b.HasDiscriminator().HasValue("UserPermissionSetting");
});
modelBuilder.Entity("Abp.MultiTenancy.TenantFeatureSetting", b =>
{
b.HasBaseType("Abp.Application.Features.FeatureSetting");
b.HasIndex("TenantId", "Name");
b.ToTable("AbpFeatures");
b.HasDiscriminator().HasValue("TenantFeatureSetting");
});
modelBuilder.Entity("Abp.Authorization.Roles.RoleClaim", b =>
{
b.HasOne("AbpCompanyName.AbpProjectName.Authorization.Roles.Role", null)

4
aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AssemblyName>AbpCompanyName.AbpProjectName.Migrator</AssemblyName>
<OutputType>Exe</OutputType>
@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Abp.Castle.Log4Net" Version="6.4.0" />
<PackageReference Include="Abp.Castle.Log4Net" Version="7.3.0" />
</ItemGroup>
<ItemGroup>

12
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<VersionPrefix>1.0.0.0</VersionPrefix>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AssemblyName>AbpCompanyName.AbpProjectName.Web.Core</AssemblyName>
<PackageId>AbpCompanyName.AbpProjectName.Web.Core</PackageId>
@ -26,11 +26,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
<PackageReference Include="Abp.AspNetCore" Version="6.4.0" />
<PackageReference Include="Abp.ZeroCore" Version="6.4.0" />
<PackageReference Include="Abp.AspNetCore.SignalR" Version="6.4.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
<PackageReference Include="Abp.AspNetCore" Version="7.3.0" />
<PackageReference Include="Abp.ZeroCore" Version="7.3.0" />
<PackageReference Include="Abp.AspNetCore.SignalR" Version="7.3.0" />
</ItemGroup>
</Project>

2
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Controllers/TokenAuthController.cs
Просмотреть файл

@ -230,7 +230,7 @@ namespace AbpCompanyName.AbpProjectName.Controllers
private string GetEncryptedAccessToken(string accessToken)
{
return SimpleStringCipher.Instance.Encrypt(accessToken, AbpProjectNameConsts.DefaultPassPhrase);
return SimpleStringCipher.Instance.Encrypt(accessToken);
}
}
}

6
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>AbpCompanyName.AbpProjectName.Web.Host</AssemblyName>
@ -37,8 +37,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Abp.Castle.Log4Net" Version="6.4.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0">
<PackageReference Include="Abp.Castle.Log4Net" Version="7.3.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

2
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/AuthConfigurer.cs
Просмотреть файл

@ -71,7 +71,7 @@ namespace AbpCompanyName.AbpProjectName.Web.Host.Startup
}
// Set auth token from cookie
context.Token = SimpleStringCipher.Instance.Decrypt(qsAuthToken, AbpProjectNameConsts.DefaultPassPhrase);
context.Token = SimpleStringCipher.Instance.Decrypt(qsAuthToken);
return Task.CompletedTask;
}
}

21
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Program.cs
Просмотреть файл

@ -1,7 +1,7 @@
using Microsoft.AspNetCore;
using Abp.AspNetCore.Dependency;
using Abp.Dependency;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using System.IO;
using Microsoft.Extensions.Hosting;
namespace AbpCompanyName.AbpProjectName.Web.Host.Startup
{
@ -9,14 +9,15 @@ namespace AbpCompanyName.AbpProjectName.Web.Host.Startup
{
public static void Main(string[] args)
{
BuildWebHost(args).Run();
CreateHostBuilder(args).Build().Run();
}
public static IWebHost BuildWebHost(string[] args)
{
return WebHost.CreateDefaultBuilder(args)
.UseStartup<Startup>()
.Build();
}
internal static IHostBuilder CreateHostBuilder(string[] args) =>
Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder =>
{
webBuilder.UseStartup<Startup>();
})
.UseCastleWindsor(IocManager.Instance.IocContainer);
}
}

6
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs
Просмотреть файл

@ -38,7 +38,7 @@ namespace AbpCompanyName.AbpProjectName.Web.Host.Startup
_appConfiguration = env.GetAppConfiguration();
}
public IServiceProvider ConfigureServices(IServiceCollection services)
public void ConfigureServices(IServiceCollection services)
{
//MVC
services.AddControllersWithViews(
@ -78,7 +78,7 @@ namespace AbpCompanyName.AbpProjectName.Web.Host.Startup
ConfigureSwagger(services);
// Configure Abp and Dependency Injection
return services.AddAbp<AbpProjectNameWebHostModule>(
services.AddAbpWithoutCreatingServiceProvider<AbpProjectNameWebHostModule>(
// Configure Log4Net logging
options => options.IocManager.IocContainer.AddFacility<LoggingFacility>(
f => f.UseAbpLog4Net().WithConfig(_hostingEnvironment.IsDevelopment()
@ -89,7 +89,7 @@ namespace AbpCompanyName.AbpProjectName.Web.Host.Startup
);
}
public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
{
app.UseAbp(options => { options.UseAbpRequestLocalization = false; }); // Initializes ABP framework.

14
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj
Просмотреть файл

@ -6,7 +6,7 @@
<PackageId>AbpCompanyName.AbpProjectName.Web.Mvc</PackageId>
<UserSecretsId>AbpCompanyName-AbpProjectName-56C2EF2F-ABD6-4EFC-AAF2-2E81C34E8FB1</UserSecretsId>
<RootNamespace>AbpCompanyName.AbpProjectName.Web</RootNamespace>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@ -35,16 +35,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BuildBundlerMinifier" Version="3.2.447" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0">
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="PaulMiami.AspNetCore.Mvc.Recaptcha" Version="1.2.2" />
<PackageReference Include="Abp.HangFire" Version="6.4.0" />
<PackageReference Include="Abp.RedisCache" Version="6.4.0" />
<PackageReference Include="Abp.Castle.Log4Net" Version="6.4.0" />
<PackageReference Include="Abp.HangFire" Version="7.3.0" />
<PackageReference Include="Abp.RedisCache" Version="7.3.0" />
<PackageReference Include="Abp.Castle.Log4Net" Version="7.3.0" />
</ItemGroup>
<ItemGroup>

19
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Program.cs
Просмотреть файл

@ -1,5 +1,7 @@
using Microsoft.AspNetCore;
using Abp.AspNetCore.Dependency;
using Abp.Dependency;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting;
namespace AbpCompanyName.AbpProjectName.Web.Startup
{
@ -7,14 +9,15 @@ namespace AbpCompanyName.AbpProjectName.Web.Startup
{
public static void Main(string[] args)
{
BuildWebHost(args).Run();
CreateHostBuilder(args).Build().Run();
}
public static IWebHost BuildWebHost(string[] args)
{
return WebHost.CreateDefaultBuilder(args)
.UseStartup<Startup>()
.Build();
}
internal static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder =>
{
webBuilder.UseStartup<Startup>();
})
.UseCastleWindsor(IocManager.Instance.IocContainer);
}
}

12
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Startup.cs
Просмотреть файл

@ -1,4 +1,6 @@
using System;
using System.Text.Encodings.Web;
using System.Text.Unicode;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
@ -17,6 +19,7 @@ using Abp.AspNetCore.SignalR.Hubs;
using Abp.Dependency;
using Abp.Json;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.WebEncoders;
using Newtonsoft.Json.Serialization;
@ -33,7 +36,7 @@ namespace AbpCompanyName.AbpProjectName.Web.Startup
_appConfiguration = env.GetAppConfiguration();
}
public IServiceProvider ConfigureServices(IServiceCollection services)
public void ConfigureServices(IServiceCollection services)
{
// MVC
services.AddControllersWithViews(
@ -55,12 +58,17 @@ namespace AbpCompanyName.AbpProjectName.Web.Startup
IdentityRegistrar.Register(services);
AuthConfigurer.Configure(services, _appConfiguration);
services.Configure<WebEncoderOptions>(options =>
{
options.TextEncoderSettings = new TextEncoderSettings(UnicodeRanges.All);
});
services.AddScoped<IWebResourceManager, WebResourceManager>();
services.AddSignalR();
// Configure Abp and Dependency Injection
return services.AddAbp<AbpProjectNameWebMvcModule>(
services.AddAbpWithoutCreatingServiceProvider<AbpProjectNameWebMvcModule>(
// Configure Log4Net logging
options => options.IocManager.IocContainer.AddFacility<LoggingFacility>(
f => f.UseAbpLog4Net().WithConfig(

15
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Scripts.cshtml
Просмотреть файл

@ -1,6 +1,9 @@
@using System.Globalization
@using Abp.AspNetCore.Mvc.Caching
@using Abp.CachedUniqueKeys
@inject AbpCompanyName.AbpProjectName.Timing.AppTimes AppTimes
@inject ICachedUniqueKeyPerUser CachedUniqueKeyPerUser
@inject IGetScriptsResponsePerUserConfiguration GetScriptsResponsePerUserConfiguration
<environment names="Development">
@*core scripts start*@
@ -81,4 +84,12 @@
<!-- Dynamic scripts of ABP system (They are created on runtime and can not be bundled) -->
<script src="~/AbpServiceProxies/GetAll?v=@(AppTimes.StartupTime.Ticks)" type="text/javascript"></script>
<script src="~/AbpScripts/GetScripts?v=@(AppTimes.StartupTime.Ticks)" type="text/javascript"></script>
@if (GetScriptsResponsePerUserConfiguration.IsEnabled)
{
<script src="@(ApplicationPath)AbpScripts/GetScripts?v=@(await CachedUniqueKeyPerUser.GetKeyAsync(GetScriptsResponsePerUserCache.CacheName))" type="text/javascript"></script>
}
else
{
<script src="@(ApplicationPath)AbpScripts/GetScripts?v=@(AppTimes.StartupTime.Ticks)" type="text/javascript"></script>
}

14
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Layout/_Scripts.cshtml
Просмотреть файл

@ -1,5 +1,9 @@
@using System.Globalization
@using Abp.AspNetCore.Mvc.Caching
@using Abp.CachedUniqueKeys
@inject AbpCompanyName.AbpProjectName.Timing.AppTimes AppTimes
@inject ICachedUniqueKeyPerUser CachedUniqueKeyPerUser
@inject IGetScriptsResponsePerUserConfiguration GetScriptsResponsePerUserConfiguration
<environment names="Development">
@*core scripts start*@
@ -92,4 +96,12 @@
<!-- Dynamic scripts of ABP system (They are created on runtime and can not be bundled) -->
<script src="~/AbpServiceProxies/GetAll?v=@(AppTimes.StartupTime.Ticks)" type="text/javascript"></script>
<script src="~/AbpScripts/GetScripts?v=@(AppTimes.StartupTime.Ticks)" type="text/javascript"></script>
@if (GetScriptsResponsePerUserConfiguration.IsEnabled)
{
<script src="@(ApplicationPath)AbpScripts/GetScripts?v=@(await CachedUniqueKeyPerUser.GetKeyAsync(GetScriptsResponsePerUserCache.CacheName))" type="text/javascript"></script>
}
else
{
<script src="@(ApplicationPath)AbpScripts/GetScripts?v=@(AppTimes.StartupTime.Ticks)" type="text/javascript"></script>
}

32
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bundleconfig.json
Просмотреть файл

@ -53,33 +53,41 @@
"outputFileName": "wwwroot/view-resources/Views/_Bundles/shared-layout.min.js",
"inputFiles": [
"wwwroot/libs/jquery/jquery.js",
"wwwroot/libs/bootstrap/dist/js/bootstrap.bundle.js",
"wwwroot/libs/datatables/js/jquery.dataTables.min.js",
"wwwroot/Common/helpers.js",
"wwwroot/Common/datatables.ajax.js",
"wwwroot/libs/datatables/js/dataTables.bootstrap4.min.js",
"wwwroot/libs/datatables/js/dataTables.responsive.min.js",
"wwwroot/libs/datatables/js/responsive.bootstrap4.min.js",
"wwwroot/libs/datatables/js/dataTables.buttons.js",
"wwwroot/libs/datatables/js/buttons.bootstrap4.js",
"wwwroot/libs/admin-lte/dist/js/adminlte.js",
"wwwroot/libs/jquery-validate/jquery.validate.js",
"wwwroot/libs/jquery-validate/jquery.validate.unobtrusive.js",
"wwwroot/libs/block-ui/jquery.blockUI.js",
"wwwroot/libs/spin/spin.js",
"wwwroot/libs-ext/spin/jquery.spin.js",
"wwwroot/libs/sweetalert/sweetalert.min.js",
"wwwroot/libs/toastr/toastr.min.js",
"wwwroot/libs/push.js/push.js",
"wwwroot/libs/moment/moment-with-locales.js",
"wwwroot/libs/signalr/dist/browser/signalr.js",
"wwwroot/libs/abp-web-resources/Abp/Framework/scripts/abp.js",
"wwwroot/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js",
"wwwroot/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js",
"wwwroot/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js",
"wwwroot/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js",
"wwwroot/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js",
"wwwroot/libs/datatables/js/jquery.dataTables.min.js",
"wwwroot/libs/datatables/js/dataTables.bootstrap4.min.js",
"wwwroot/libs/datatables/js/dataTables.responsive.min.js",
"wwwroot/libs/datatables/js/responsive.bootstrap4.min.js",
"wwwroot/libs/datatables/js/dataTables.buttons.js",
"wwwroot/libs/datatables/js/buttons.bootstrap4.js",
"wwwroot/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr-client.js",
"wwwroot/libs/jquery-validate/jquery.validate.js",
"wwwroot/libs/jquery-validate/jquery.validate.unobtrusive.js",
"wwwroot/libs/push.js/push.js",
"wwwroot/js/abp.dataTable.js",
"wwwroot/js/main.js",
"wwwroot/view-resources/Views/Shared/_Layout.js",
"wwwroot/libs/signalr/dist/browser/signalr.js",
"wwwroot/libs/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr-client.js"
"wwwroot/view-resources/Views/Shared/_Layout.js"
]
},
{

2
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/libman.json
Просмотреть файл

@ -182,7 +182,7 @@
"destination": "wwwroot/libs/jquery-validate"
},
{
"library": "push.js@1.0.9",
"library": "push.js@1.0.12",
"destination": "wwwroot/libs/push.js"
}
//other libs end

14
aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<VersionPrefix>1.0.0.0</VersionPrefix>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AssemblyName>AbpCompanyName.AbpProjectName.Tests</AssemblyName>
<PackageId>AbpCompanyName.AbpProjectName.Tests</PackageId>
@ -18,17 +18,17 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="NSubstitute" Version="4.2.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="NSubstitute" Version="4.3.0" />
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Abp.TestBase" Version="6.4.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
<PackageReference Include="Abp.TestBase" Version="7.3.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.4" />
<PackageReference Include="Castle.Core" Version="4.4.1" />
</ItemGroup>

14
aspnet-core/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<VersionPrefix>1.0.0.0</VersionPrefix>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AssemblyName>AbpCompanyName.AbpProjectName.Web.Tests</AssemblyName>
<PackageId>AbpCompanyName.AbpProjectName.Web.Tests</PackageId>
@ -18,17 +18,17 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="NSubstitute" Version="4.2.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="NSubstitute" Version="4.3.0" />
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="AngleSharp" Version="0.14.0" />
<PackageReference Include="Abp.AspNetCore.TestBase" Version="6.4.0" />
<PackageReference Include="AngleSharp" Version="0.16.1" />
<PackageReference Include="Abp.AspNetCore.TestBase" Version="7.3.0" />
</ItemGroup>
</Project>