From bb0e499b1a8e2985701a14e2536e608c7c35204a Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Tue, 26 Dec 2023 23:49:10 +0800 Subject: [PATCH] Upgrade to ABP 8.0.0 --- .github/workflows/publish.yml | 2 +- Directory.Build.props | 2 +- azure-pipelines.yml | 128 ------------------ common.props | 6 +- docs/README.md | 4 - .../MyProject.Application.csproj | 2 +- .../MyProject.DbMigrator.csproj | 6 +- .../MyProject.Domain.Shared.csproj | 2 +- .../MyProject.Domain/MyProject.Domain.csproj | 2 +- .../MyProjectDbContextModelSnapshot.cs | 88 +++++++++++- .../MyProject.EntityFrameworkCore.csproj | 4 +- .../MyProject.HttpApi.csproj | 2 +- .../src/MyProject.Web/MyProject.Web.csproj | 6 +- .../src/MyProject.Web/package.json | 2 +- .../aspnet-core/src/MyProject.Web/yarn.lock | 8 +- .../Gifts/GiftAppServiceTests.cs | 26 ---- .../MyProject.Application.Tests.csproj | 19 --- .../MyProjectApplicationTestBase.cs | 7 - .../MyProjectApplicationTestModule.cs | 13 -- .../Samples/SampleAppServiceTests.cs | 33 ----- .../UserGifts/UserGiftAppServiceTests.cs | 26 ---- .../Gifts/GiftDomainTests.cs | 23 ---- .../MyProject.Domain.Tests.csproj | 18 --- .../MyProjectDomainTestBase.cs | 7 - .../MyProjectDomainTestModule.cs | 13 -- .../Samples/SampleDomainTests.cs | 45 ------ .../UserGifts/UserGiftDomainTests.cs | 23 ---- .../Gifts/GiftRepositoryTests.cs | 31 ----- .../MyProjectEntityFrameworkCoreTestBase.cs | 9 -- .../MyProjectEntityFrameworkCoreTestModule.cs | 59 -------- .../Samples/SampleRepositoryTests.cs | 44 ------ .../UserGifts/UserGiftRepositoryTests.cs | 31 ----- ...MyProject.EntityFrameworkCore.Tests.csproj | 21 --- .../ClientDemoService.cs | 26 ---- .../ConsoleTestAppHostedService.cs | 26 ---- ...oject.HttpApi.Client.ConsoleTestApp.csproj | 28 ---- .../MyProjectConsoleApiClientModule.cs | 14 -- .../Program.cs | 21 --- .../appsettings.json | 18 --- .../MyProject.TestBase.csproj | 26 ---- .../MyProject.TestBase/MyProjectTestBase.cs | 61 --------- .../MyProjectTestBaseModule.cs | 48 ------- .../MyProjectTestDataSeedContributor.cs | 16 --- .../Security/FakeCurrentPrincipalAccessor.cs | 39 ------ .../MyProject.Web.Tests.csproj | 39 ------ .../MyProjectWebTestBase.cs | 44 ------ .../MyProjectWebTestModule.cs | 113 ---------------- .../MyProjectWebTestStartup.cs | 21 --- .../Pages/Gifts/IndexTests.cs | 22 --- .../MyProject.Web.Tests/Pages/Index_Tests.cs | 16 --- .../Pages/UserGifts/IndexTests.cs | 22 --- .../WebContentDirectoryFinder.cs | 47 ------- .../MyProject.Web.Tests/xunit.runner.json | 3 - ...ardManagement.Application.Contracts.csproj | 2 +- ...yAbp.GiftCardManagement.Application.csproj | 2 +- ...bp.GiftCardManagement.Domain.Shared.csproj | 4 +- .../EasyAbp.GiftCardManagement.Domain.csproj | 2 +- ...tCardManagement.EntityFrameworkCore.csproj | 2 +- ...p.GiftCardManagement.HttpApi.Client.csproj | 2 +- .../EasyAbp.GiftCardManagement.HttpApi.csproj | 2 +- .../EasyAbp.GiftCardManagement.MongoDB.csproj | 2 +- .../EasyAbp.GiftCardManagement.Web.csproj | 6 +- ...iftCardManagement.Application.Tests.csproj | 4 +- ...Abp.GiftCardManagement.Domain.Tests.csproj | 4 +- ...anagement.EntityFrameworkCore.Tests.csproj | 6 +- ...ement.HttpApi.Client.ConsoleTestApp.csproj | 4 +- ...bp.GiftCardManagement.MongoDB.Tests.csproj | 4 +- ...EasyAbp.GiftCardManagement.TestBase.csproj | 14 +- 68 files changed, 138 insertions(+), 1284 deletions(-) delete mode 100644 azure-pipelines.yml delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Application.Tests/Gifts/GiftAppServiceTests.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Application.Tests/MyProject.Application.Tests.csproj delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Application.Tests/MyProjectApplicationTestBase.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Application.Tests/MyProjectApplicationTestModule.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Application.Tests/Samples/SampleAppServiceTests.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Application.Tests/UserGifts/UserGiftAppServiceTests.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/Gifts/GiftDomainTests.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/MyProject.Domain.Tests.csproj delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/MyProjectDomainTestBase.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/MyProjectDomainTestModule.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/Samples/SampleDomainTests.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/UserGifts/UserGiftDomainTests.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/Gifts/GiftRepositoryTests.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectEntityFrameworkCoreTestBase.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectEntityFrameworkCoreTestModule.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepositoryTests.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/UserGifts/UserGiftRepositoryTests.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/MyProject.EntityFrameworkCore.Tests.csproj delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/MyProject.HttpApi.Client.ConsoleTestApp.csproj delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/MyProjectConsoleApiClientModule.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/Program.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/appsettings.json delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProject.TestBase.csproj delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProjectTestBase.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProjectTestBaseModule.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProjectTestDataSeedContributor.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.TestBase/Security/FakeCurrentPrincipalAccessor.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProject.Web.Tests.csproj delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProjectWebTestBase.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProjectWebTestModule.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProjectWebTestStartup.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Web.Tests/Pages/Gifts/IndexTests.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Web.Tests/Pages/Index_Tests.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Web.Tests/Pages/UserGifts/IndexTests.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Web.Tests/WebContentDirectoryFinder.cs delete mode 100644 sample/MyProject/aspnet-core/test/MyProject.Web.Tests/xunit.runner.json diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0dc36f8..fc7d0ef 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,7 +12,7 @@ jobs: - uses: NuGet/setup-nuget@v1 - uses: actions/setup-dotnet@v3 with: - dotnet-version: '7.0.x' + dotnet-version: '8.0.x' - name: read common.props id: commonProps diff --git a/Directory.Build.props b/Directory.Build.props index e81b043..8ccc1f7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - 7.4.0 + 8.0.0 \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index d19af8d..0000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,128 +0,0 @@ -# ASP.NET Core (.NET Framework) -# Build and test ASP.NET Core projects targeting the full .NET Framework. -# Add steps that publish symbols, save build artifacts, and more: -# https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core - -schedules: -- cron: "0 */6 * * *" - displayName: Daily midnight build - branches: - include: - - master - always: true - -trigger: - branches: - include: - - master - -stages: - -- stage: Stage1 - jobs: - - job: Job1 - pool: - vmImage: 'ubuntu-latest' - steps: - - task: UseDotNet@2 - inputs: - packageType: 'sdk' - version: '6.x' - - - task: DotNetCoreCLI@2 - displayName: 'restore' - inputs: - command: 'restore' - feedsToUse: 'select' - - - task: DotNetCoreCLI@2 - displayName: 'build' - inputs: - command: 'build' - - - task: CmdLine@2 - displayName: 'publish' - inputs: - script: | - dotnet publish - - -- stage: Stage2 - jobs: - - job: Job1 - pool: - vmImage: windows-2019 - steps: - - task: SqlDacpacDeploymentOnMachineGroup@0 - displayName: 'drop database' - inputs: - TaskType: 'sqlInline' - InlineSql: | - DECLARE @SQL VARCHAR(MAX); - SET @SQL='' - SELECT @SQL=@SQL+'; KILL '+RTRIM(SPID) - FROM master..sysprocesses - WHERE dbid=DB_ID('MyProject'); - EXEC(@SQL); - - drop DATABASE MyProject - ServerName: $(ServerName) - DatabaseName: $(DatabaseName) - AuthScheme: 'sqlServerAuthentication' - SqlUsername: $(SqlUsername) - SqlPassword: $(SqlPassword) - continueOnError: true - - -- stage: Stage3 - jobs: - - job: Job1 - pool: - vmImage: ubuntu-latest - steps: - - task: UseDotNet@2 - inputs: - packageType: 'sdk' - version: '6.x' - - task: CmdLine@2 - displayName: 'install dotnet-ef' - inputs: - script: 'dotnet tool install -g dotnet-ef' - - - task: CmdLine@2 - inputs: - script: | - echo commands - sed -i '0,/Default[^,]*/s//$(ConnectionStrings)"/g' sample/MyProject/aspnet-core/src/MyProject.Web/appsettings.json - echo commands executed - - - task: CmdLine@2 - inputs: - script: | - echo commands - sed -i '0,/Default[^,]*/s//$(ConnectionStrings)"/g' sample/MyProject/aspnet-core/src/MyProject.DbMigrator/appsettings.json - echo commands executed - - - task: CmdLine@2 - displayName: 'update database' - inputs: - script: | - dotnet ef database update --project sample/MyProject/aspnet-core/src/MyProject.EntityFrameworkCore/MyProject.EntityFrameworkCore.csproj -s sample/MyProject/aspnet-core/src/MyProject.Web/MyProject.Web.csproj - - - task: CmdLine@2 - displayName: 'DbMigrator' - inputs: - script: | - cd sample/MyProject/aspnet-core/src/MyProject.DbMigrator - - dotnet run - - - task: Docker@2 - displayName: 'build and push docker' - inputs: - containerRegistry: $(DockerRegistry) - repository: $(repository) - command: 'buildAndPush' - Dockerfile: 'sample/MyProject/aspnet-core/src/MyProject.Web/Dockerfile' - buildContext: . - tags: 'latest' \ No newline at end of file diff --git a/common.props b/common.props index db57345..dacb741 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 0.11.0 + 0.12.0 $(NoWarn);CS1591 true EasyAbp Team @@ -19,8 +19,8 @@ - - + + all runtime; build; native; contentfiles; analyzers diff --git a/docs/README.md b/docs/README.md index 7bc202e..bec7255 100644 --- a/docs/README.md +++ b/docs/README.md @@ -8,10 +8,6 @@ An abp application module where you can create gift cards and your app user can use them to exchange something. -## Online Demo - -We have launched an online demo for this module: [https://giftcard.samples.easyabp.io](https://giftcard.samples.easyabp.io) - ## Installation 1. Install the following NuGet packages. ([see how](https://github.com/EasyAbp/EasyAbpGuide/blob/master/docs/How-To.md#add-nuget-packages)) diff --git a/sample/MyProject/aspnet-core/src/MyProject.Application/MyProject.Application.csproj b/sample/MyProject/aspnet-core/src/MyProject.Application/MyProject.Application.csproj index d75ffce..b484e90 100644 --- a/sample/MyProject/aspnet-core/src/MyProject.Application/MyProject.Application.csproj +++ b/sample/MyProject/aspnet-core/src/MyProject.Application/MyProject.Application.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 MyProject diff --git a/sample/MyProject/aspnet-core/src/MyProject.DbMigrator/MyProject.DbMigrator.csproj b/sample/MyProject/aspnet-core/src/MyProject.DbMigrator/MyProject.DbMigrator.csproj index 518e170..60f5c4c 100644 --- a/sample/MyProject/aspnet-core/src/MyProject.DbMigrator/MyProject.DbMigrator.csproj +++ b/sample/MyProject/aspnet-core/src/MyProject.DbMigrator/MyProject.DbMigrator.csproj @@ -4,7 +4,7 @@ Exe - net7.0 + net8.0 @@ -17,10 +17,10 @@ - + - + diff --git a/sample/MyProject/aspnet-core/src/MyProject.Domain.Shared/MyProject.Domain.Shared.csproj b/sample/MyProject/aspnet-core/src/MyProject.Domain.Shared/MyProject.Domain.Shared.csproj index 7d76885..2b7a3e8 100644 --- a/sample/MyProject/aspnet-core/src/MyProject.Domain.Shared/MyProject.Domain.Shared.csproj +++ b/sample/MyProject/aspnet-core/src/MyProject.Domain.Shared/MyProject.Domain.Shared.csproj @@ -26,7 +26,7 @@ - + diff --git a/sample/MyProject/aspnet-core/src/MyProject.Domain/MyProject.Domain.csproj b/sample/MyProject/aspnet-core/src/MyProject.Domain/MyProject.Domain.csproj index ea5b349..1312426 100644 --- a/sample/MyProject/aspnet-core/src/MyProject.Domain/MyProject.Domain.csproj +++ b/sample/MyProject/aspnet-core/src/MyProject.Domain/MyProject.Domain.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 MyProject diff --git a/sample/MyProject/aspnet-core/src/MyProject.EntityFrameworkCore/Migrations/MyProjectDbContextModelSnapshot.cs b/sample/MyProject/aspnet-core/src/MyProject.EntityFrameworkCore/Migrations/MyProjectDbContextModelSnapshot.cs index 76517dc..06297f4 100644 --- a/sample/MyProject/aspnet-core/src/MyProject.EntityFrameworkCore/Migrations/MyProjectDbContextModelSnapshot.cs +++ b/sample/MyProject/aspnet-core/src/MyProject.EntityFrameworkCore/Migrations/MyProjectDbContextModelSnapshot.cs @@ -19,7 +19,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "7.0.1") + .HasAnnotation("ProductVersion", "8.0.0") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); @@ -35,6 +35,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -62,6 +63,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("nvarchar(max)"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -101,6 +103,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -131,6 +134,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("datetime2"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -176,6 +180,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -197,6 +202,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnName("DeletionTime"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -229,6 +235,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -250,6 +257,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnName("DeletionTime"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -316,6 +324,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -336,6 +345,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("datetime2"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -467,7 +477,6 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnName("ChangeType"); b.Property("EntityId") - .IsRequired() .HasMaxLength(128) .HasColumnType("nvarchar(128)") .HasColumnName("EntityId"); @@ -548,6 +557,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -557,6 +567,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnName("CreationTime"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -727,6 +738,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -736,6 +748,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("nvarchar(256)"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -799,6 +812,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -807,6 +821,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("int"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -898,6 +913,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -910,6 +926,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("datetime2"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -958,6 +975,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -994,6 +1012,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("int"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -1276,6 +1295,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -1306,6 +1326,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("int"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -1378,6 +1399,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -1410,6 +1432,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("bit"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -1519,6 +1542,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -1554,6 +1578,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("bit"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -1685,6 +1710,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -1722,6 +1748,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("bit"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -1961,6 +1988,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -1992,6 +2020,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("datetime2"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -2033,6 +2062,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -2056,6 +2086,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("datetime2"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -2094,6 +2125,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -2129,6 +2161,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("bit"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -2342,6 +2375,55 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("AbpSettings", (string)null); }); + modelBuilder.Entity("Volo.Abp.SettingManagement.SettingDefinitionRecord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("DefaultValue") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("Description") + .HasMaxLength(512) + .HasColumnType("nvarchar(512)"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("ExtraProperties") + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("IsEncrypted") + .HasColumnType("bit"); + + b.Property("IsInherited") + .HasColumnType("bit"); + + b.Property("IsVisibleToClients") + .HasColumnType("bit"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("Providers") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.HasKey("Id"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("AbpSettingDefinitions", (string)null); + }); + modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => { b.Property("Id") @@ -2349,6 +2431,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ConcurrencyStamp") .IsConcurrencyToken() + .IsRequired() .HasMaxLength(40) .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); @@ -2373,6 +2456,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("int"); b.Property("ExtraProperties") + .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); diff --git a/sample/MyProject/aspnet-core/src/MyProject.EntityFrameworkCore/MyProject.EntityFrameworkCore.csproj b/sample/MyProject/aspnet-core/src/MyProject.EntityFrameworkCore/MyProject.EntityFrameworkCore.csproj index a8f272d..6df89f2 100644 --- a/sample/MyProject/aspnet-core/src/MyProject.EntityFrameworkCore/MyProject.EntityFrameworkCore.csproj +++ b/sample/MyProject/aspnet-core/src/MyProject.EntityFrameworkCore/MyProject.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 MyProject @@ -22,7 +22,7 @@ - + runtime; build; native; contentfiles; analyzers compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native diff --git a/sample/MyProject/aspnet-core/src/MyProject.HttpApi/MyProject.HttpApi.csproj b/sample/MyProject/aspnet-core/src/MyProject.HttpApi/MyProject.HttpApi.csproj index 28761cb..5aac9c4 100644 --- a/sample/MyProject/aspnet-core/src/MyProject.HttpApi/MyProject.HttpApi.csproj +++ b/sample/MyProject/aspnet-core/src/MyProject.HttpApi/MyProject.HttpApi.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 MyProject diff --git a/sample/MyProject/aspnet-core/src/MyProject.Web/MyProject.Web.csproj b/sample/MyProject/aspnet-core/src/MyProject.Web/MyProject.Web.csproj index ffd086e..9228a31 100644 --- a/sample/MyProject/aspnet-core/src/MyProject.Web/MyProject.Web.csproj +++ b/sample/MyProject/aspnet-core/src/MyProject.Web/MyProject.Web.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 MyProject.Web $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true @@ -33,7 +33,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/sample/MyProject/aspnet-core/src/MyProject.Web/package.json b/sample/MyProject/aspnet-core/src/MyProject.Web/package.json index 2f90441..c5aa5d1 100644 --- a/sample/MyProject/aspnet-core/src/MyProject.Web/package.json +++ b/sample/MyProject/aspnet-core/src/MyProject.Web/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.1" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0" } } \ No newline at end of file diff --git a/sample/MyProject/aspnet-core/src/MyProject.Web/yarn.lock b/sample/MyProject/aspnet-core/src/MyProject.Web/yarn.lock index 6589cc3..fa2c666 100644 --- a/sample/MyProject/aspnet-core/src/MyProject.Web/yarn.lock +++ b/sample/MyProject/aspnet-core/src/MyProject.Web/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.4.1": - version "2.4.1" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.4.1.tgz#414d28d6347aecc7a0246ada8dfa2f447781613c" - integrity sha512-qbWEVchynWGGvGbXP/M6KGJHy0ip3DlIIvkBpaCld6n1aisizJ9lz8yatMb/BKVwejPqOROtOOCYRJiz4oI0WA== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~3.0.0": + version "3.0.0" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-3.0.0.tgz#311e9d9be628900fcdd8daf58d98e42dcf9d9e8a" + integrity sha512-OrM3o2HgFsw1R/Edq1/kS20JZ9VQ7qm8ge14Kd3kfo9uk6dS9D7XC45ZUfCQUquFqTNHyoOQYfHtra/7Z3U3QQ== dependencies: "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1" diff --git a/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/Gifts/GiftAppServiceTests.cs b/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/Gifts/GiftAppServiceTests.cs deleted file mode 100644 index 5d84423..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/Gifts/GiftAppServiceTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Shouldly; -using System.Threading.Tasks; -using Xunit; - -namespace MyProject.Gifts -{ - public class GiftAppServiceTests : MyProjectApplicationTestBase - { - private readonly IGiftAppService _giftAppService; - - public GiftAppServiceTests() - { - _giftAppService = GetRequiredService(); - } - - [Fact] - public async Task Test1() - { - // Arrange - - // Act - - // Assert - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/MyProject.Application.Tests.csproj b/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/MyProject.Application.Tests.csproj deleted file mode 100644 index 31e7b35..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/MyProject.Application.Tests.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - netcoreapp3.1 - MyProject - - - - - - - - - - - - diff --git a/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/MyProjectApplicationTestBase.cs b/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/MyProjectApplicationTestBase.cs deleted file mode 100644 index 65c157a..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/MyProjectApplicationTestBase.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace MyProject -{ - public abstract class MyProjectApplicationTestBase : MyProjectTestBase - { - - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/MyProjectApplicationTestModule.cs b/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/MyProjectApplicationTestModule.cs deleted file mode 100644 index 71aa06a..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/MyProjectApplicationTestModule.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Volo.Abp.Modularity; - -namespace MyProject -{ - [DependsOn( - typeof(MyProjectApplicationModule), - typeof(MyProjectDomainTestModule) - )] - public class MyProjectApplicationTestModule : AbpModule - { - - } -} \ No newline at end of file diff --git a/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/Samples/SampleAppServiceTests.cs b/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/Samples/SampleAppServiceTests.cs deleted file mode 100644 index 6c87ba1..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/Samples/SampleAppServiceTests.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Shouldly; -using System.Threading.Tasks; -using Volo.Abp.Identity; -using Xunit; - -namespace MyProject.Samples -{ - /* This is just an example test class. - * Normally, you don't test code of the modules you are using - * (like IIdentityUserAppService here). - * Only test your own application services. - */ - public class SampleAppServiceTests : MyProjectApplicationTestBase - { - private readonly IIdentityUserAppService _userAppService; - - public SampleAppServiceTests() - { - _userAppService = GetRequiredService(); - } - - [Fact] - public async Task Initial_Data_Should_Contain_Admin_User() - { - //Act - var result = await _userAppService.GetListAsync(new GetIdentityUsersInput()); - - //Assert - result.TotalCount.ShouldBeGreaterThan(0); - result.Items.ShouldContain(u => u.UserName == "admin"); - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/UserGifts/UserGiftAppServiceTests.cs b/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/UserGifts/UserGiftAppServiceTests.cs deleted file mode 100644 index 5b91ff3..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Application.Tests/UserGifts/UserGiftAppServiceTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Shouldly; -using System.Threading.Tasks; -using Xunit; - -namespace MyProject.UserGifts -{ - public class UserGiftAppServiceTests : MyProjectApplicationTestBase - { - private readonly IUserGiftAppService _userGiftAppService; - - public UserGiftAppServiceTests() - { - _userGiftAppService = GetRequiredService(); - } - - [Fact] - public async Task Test1() - { - // Arrange - - // Act - - // Assert - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/Gifts/GiftDomainTests.cs b/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/Gifts/GiftDomainTests.cs deleted file mode 100644 index 620cca4..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/Gifts/GiftDomainTests.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Shouldly; -using Xunit; - -namespace MyProject.Gifts -{ - public class GiftDomainTests : MyProjectDomainTestBase - { - public GiftDomainTests() - { - } - - [Fact] - public async Task Test1() - { - // Arrange - - // Assert - - // Assert - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/MyProject.Domain.Tests.csproj b/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/MyProject.Domain.Tests.csproj deleted file mode 100644 index ac1b7fa..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/MyProject.Domain.Tests.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - netcoreapp3.1 - MyProject - - - - - - - - - - - diff --git a/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/MyProjectDomainTestBase.cs b/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/MyProjectDomainTestBase.cs deleted file mode 100644 index 6c84e65..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/MyProjectDomainTestBase.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace MyProject -{ - public abstract class MyProjectDomainTestBase : MyProjectTestBase - { - - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/MyProjectDomainTestModule.cs b/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/MyProjectDomainTestModule.cs deleted file mode 100644 index b63ca29..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/MyProjectDomainTestModule.cs +++ /dev/null @@ -1,13 +0,0 @@ -using MyProject.EntityFrameworkCore; -using Volo.Abp.Modularity; - -namespace MyProject -{ - [DependsOn( - typeof(MyProjectEntityFrameworkCoreTestModule) - )] - public class MyProjectDomainTestModule : AbpModule - { - - } -} \ No newline at end of file diff --git a/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/Samples/SampleDomainTests.cs b/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/Samples/SampleDomainTests.cs deleted file mode 100644 index ae04d95..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/Samples/SampleDomainTests.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.Threading.Tasks; -using Shouldly; -using Volo.Abp.Identity; -using Xunit; - -namespace MyProject.Samples -{ - /* This is just an example test class. - * Normally, you don't test code of the modules you are using - * (like IdentityUserManager here). - * Only test your own domain services. - */ - public class SampleDomainTests : MyProjectDomainTestBase - { - private readonly IIdentityUserRepository _identityUserRepository; - private readonly IdentityUserManager _identityUserManager; - - public SampleDomainTests() - { - _identityUserRepository = GetRequiredService(); - _identityUserManager = GetRequiredService(); - } - - [Fact] - public async Task Should_Set_Email_Of_A_User() - { - IdentityUser adminUser; - - /* Need to manually start Unit Of Work because - * FirstOrDefaultAsync should be executed while db connection / context is available. - */ - await WithUnitOfWorkAsync(async () => - { - adminUser = await _identityUserRepository - .FindByNormalizedUserNameAsync("ADMIN"); - - await _identityUserManager.SetEmailAsync(adminUser, "newemail@abp.io"); - await _identityUserRepository.UpdateAsync(adminUser); - }); - - adminUser = await _identityUserRepository.FindByNormalizedUserNameAsync("ADMIN"); - adminUser.Email.ShouldBe("newemail@abp.io"); - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/UserGifts/UserGiftDomainTests.cs b/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/UserGifts/UserGiftDomainTests.cs deleted file mode 100644 index 844e1be..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Domain.Tests/UserGifts/UserGiftDomainTests.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Shouldly; -using Xunit; - -namespace MyProject.UserGifts -{ - public class UserGiftDomainTests : MyProjectDomainTestBase - { - public UserGiftDomainTests() - { - } - - [Fact] - public async Task Test1() - { - // Arrange - - // Assert - - // Assert - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/Gifts/GiftRepositoryTests.cs b/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/Gifts/GiftRepositoryTests.cs deleted file mode 100644 index 0231cdd..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/Gifts/GiftRepositoryTests.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Threading.Tasks; -using MyProject.Gifts; -using Volo.Abp.Domain.Repositories; -using Xunit; - -namespace MyProject.EntityFrameworkCore.Gifts -{ - public class GiftRepositoryTests : MyProjectEntityFrameworkCoreTestBase - { - private readonly IRepository _giftRepository; - - public GiftRepositoryTests() - { - _giftRepository = GetRequiredService>(); - } - - [Fact] - public async Task Test1() - { - await WithUnitOfWorkAsync(async () => - { - // Arrange - - // Act - - //Assert - }); - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectEntityFrameworkCoreTestBase.cs b/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectEntityFrameworkCoreTestBase.cs deleted file mode 100644 index 051a946..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectEntityFrameworkCoreTestBase.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Volo.Abp; - -namespace MyProject.EntityFrameworkCore -{ - public abstract class MyProjectEntityFrameworkCoreTestBase : MyProjectTestBase - { - - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectEntityFrameworkCoreTestModule.cs b/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectEntityFrameworkCoreTestModule.cs deleted file mode 100644 index 95b16e9..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectEntityFrameworkCoreTestModule.cs +++ /dev/null @@ -1,59 +0,0 @@ -using Microsoft.Data.Sqlite; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Storage; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp; -using Volo.Abp.EntityFrameworkCore; -using Volo.Abp.Modularity; -using Volo.Abp.Uow; - -namespace MyProject.EntityFrameworkCore -{ - [DependsOn( - typeof(MyProjectEntityFrameworkCoreDbMigrationsModule), - typeof(MyProjectTestBaseModule) - )] - public class MyProjectEntityFrameworkCoreTestModule : AbpModule - { - private SqliteConnection _sqliteConnection; - - public override void ConfigureServices(ServiceConfigurationContext context) - { - ConfigureInMemorySqlite(context.Services); - } - - private void ConfigureInMemorySqlite(IServiceCollection services) - { - services.AddAlwaysDisableUnitOfWorkTransaction(); - _sqliteConnection = CreateDatabaseAndGetConnection(); - - services.Configure(options => - { - options.Configure(context => { context.DbContextOptions.UseSqlite(_sqliteConnection); }); - }); - } - - public override void OnApplicationShutdown(ApplicationShutdownContext context) - { - _sqliteConnection.Dispose(); - } - - private static SqliteConnection CreateDatabaseAndGetConnection() - { - var connection = new SqliteConnection("Data Source=:memory:"); - connection.Open(); - - var options = new DbContextOptionsBuilder() - .UseSqlite(connection) - .Options; - - using (var context = new MyProjectMigrationsDbContext(options)) - { - context.GetService().CreateTables(); - } - - return connection; - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepositoryTests.cs b/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepositoryTests.cs deleted file mode 100644 index c2216c9..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepositoryTests.cs +++ /dev/null @@ -1,44 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using MyProject.Users; -using Shouldly; -using System; -using System.Linq; -using System.Threading.Tasks; -using Volo.Abp.Domain.Repositories; -using Xunit; - -namespace MyProject.EntityFrameworkCore.Samples -{ - /* This is just an example test class. - * Normally, you don't test ABP framework code - * (like default AppUser repository IRepository here). - * Only test your custom repository methods. - */ - public class SampleRepositoryTests : MyProjectEntityFrameworkCoreTestBase - { - private readonly IRepository _appUserRepository; - - public SampleRepositoryTests() - { - _appUserRepository = GetRequiredService>(); - } - - [Fact] - public async Task Should_Query_AppUser() - { - /* Need to manually start Unit Of Work because - * FirstOrDefaultAsync should be executed while db connection / context is available. - */ - await WithUnitOfWorkAsync(async () => - { - //Act - var adminUser = await _appUserRepository - .Where(u => u.UserName == "admin") - .FirstOrDefaultAsync(); - - //Assert - adminUser.ShouldNotBeNull(); - }); - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/UserGifts/UserGiftRepositoryTests.cs b/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/UserGifts/UserGiftRepositoryTests.cs deleted file mode 100644 index 9be70ba..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/EntityFrameworkCore/UserGifts/UserGiftRepositoryTests.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Threading.Tasks; -using MyProject.UserGifts; -using Volo.Abp.Domain.Repositories; -using Xunit; - -namespace MyProject.EntityFrameworkCore.UserGifts -{ - public class UserGiftRepositoryTests : MyProjectEntityFrameworkCoreTestBase - { - private readonly IRepository _userGiftRepository; - - public UserGiftRepositoryTests() - { - _userGiftRepository = GetRequiredService>(); - } - - [Fact] - public async Task Test1() - { - await WithUnitOfWorkAsync(async () => - { - // Arrange - - // Act - - //Assert - }); - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/MyProject.EntityFrameworkCore.Tests.csproj b/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/MyProject.EntityFrameworkCore.Tests.csproj deleted file mode 100644 index 679b97c..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.EntityFrameworkCore.Tests/MyProject.EntityFrameworkCore.Tests.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - netcoreapp3.1 - MyProject - - - - - - - - - - - - - - diff --git a/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs b/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs deleted file mode 100644 index 0fc8d77..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Identity; - -namespace MyProject.HttpApi.Client.ConsoleTestApp -{ - public class ClientDemoService : ITransientDependency - { - private readonly IProfileAppService _profileAppService; - - public ClientDemoService(IProfileAppService profileAppService) - { - _profileAppService = profileAppService; - } - - public async Task RunAsync() - { - var output = await _profileAppService.GetAsync(); - Console.WriteLine($"UserName : {output.UserName}"); - Console.WriteLine($"Email : {output.Email}"); - Console.WriteLine($"Name : {output.Name}"); - Console.WriteLine($"Surname : {output.Surname}"); - } - } -} \ No newline at end of file diff --git a/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs b/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs deleted file mode 100644 index 480c425..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Microsoft.Extensions.Hosting; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp; - -namespace MyProject.HttpApi.Client.ConsoleTestApp -{ - public class ConsoleTestAppHostedService : IHostedService - { - public async Task StartAsync(CancellationToken cancellationToken) - { - using (var application = await AbpApplicationFactory.CreateAsync()) - { - await application.InitializeAsync(); - - var demo = application.ServiceProvider.GetRequiredService(); - await demo.RunAsync(); - - await application.ShutdownAsync(); - } - } - - public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask; - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/MyProject.HttpApi.Client.ConsoleTestApp.csproj b/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/MyProject.HttpApi.Client.ConsoleTestApp.csproj deleted file mode 100644 index 78ba094..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/MyProject.HttpApi.Client.ConsoleTestApp.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - Exe - netcoreapp3.1 - - - - - - - - - PreserveNewest - Always - - - - - - - - - - - - - diff --git a/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/MyProjectConsoleApiClientModule.cs b/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/MyProjectConsoleApiClientModule.cs deleted file mode 100644 index d95356c..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/MyProjectConsoleApiClientModule.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Volo.Abp.Http.Client.IdentityModel; -using Volo.Abp.Modularity; - -namespace MyProject.HttpApi.Client.ConsoleTestApp -{ - [DependsOn( - typeof(MyProjectHttpApiClientModule), - typeof(AbpHttpClientIdentityModelModule) - )] - public class MyProjectConsoleApiClientModule : AbpModule - { - - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/Program.cs b/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/Program.cs deleted file mode 100644 index bf4a214..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/Program.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; - -namespace MyProject.HttpApi.Client.ConsoleTestApp -{ - class Program - { - static async Task Main(string[] args) - { - await CreateHostBuilder(args).RunConsoleAsync(); - } - - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureServices((hostContext, services) => - { - services.AddHostedService(); - }); - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/appsettings.json b/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/appsettings.json deleted file mode 100644 index 35ab6f2..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.HttpApi.Client.ConsoleTestApp/appsettings.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "RemoteServices": { - "Default": { - "BaseUrl": "https://localhost:44356" - } - }, - "IdentityClients": { - "Default": { - "GrantType": "password", - "ClientId": "MyProject_App", - "ClientSecret": "1q2w3e*", - "UserName": "admin", - "UserPassword": "1q2w3E*", - "Authority": "https://localhost:44356", - "Scope": "MyProject" - } - } -} \ No newline at end of file diff --git a/sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProject.TestBase.csproj b/sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProject.TestBase.csproj deleted file mode 100644 index 2a11c19..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProject.TestBase.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - netcoreapp3.1 - MyProject - - - - - - - - - - - - - - - - - - - diff --git a/sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProjectTestBase.cs b/sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProjectTestBase.cs deleted file mode 100644 index 7b06465..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProjectTestBase.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp; -using Volo.Abp.Modularity; -using Volo.Abp.Uow; -using Volo.Abp.Testing; - -namespace MyProject -{ - /* All test classes are derived from this class, directly or indirectly. - */ - public abstract class MyProjectTestBase : AbpIntegratedTest - where TStartupModule : IAbpModule - { - protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options) - { - options.UseAutofac(); - } - - protected virtual Task WithUnitOfWorkAsync(Func func) - { - return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); - } - - protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) - { - using (var scope = ServiceProvider.CreateScope()) - { - var uowManager = scope.ServiceProvider.GetRequiredService(); - - using (var uow = uowManager.Begin(options)) - { - await action(); - - await uow.CompleteAsync(); - } - } - } - - protected virtual Task WithUnitOfWorkAsync(Func> func) - { - return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); - } - - protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) - { - using (var scope = ServiceProvider.CreateScope()) - { - var uowManager = scope.ServiceProvider.GetRequiredService(); - - using (var uow = uowManager.Begin(options)) - { - var result = await func(); - await uow.CompleteAsync(); - return result; - } - } - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProjectTestBaseModule.cs b/sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProjectTestBaseModule.cs deleted file mode 100644 index dcf26f8..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProjectTestBaseModule.cs +++ /dev/null @@ -1,48 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp; -using Volo.Abp.Authorization; -using Volo.Abp.Autofac; -using Volo.Abp.BackgroundJobs; -using Volo.Abp.Data; -using Volo.Abp.Modularity; -using Volo.Abp.Threading; - -namespace MyProject -{ - [DependsOn( - typeof(AbpAutofacModule), - typeof(AbpTestBaseModule), - typeof(AbpAuthorizationModule), - typeof(MyProjectDomainModule) - )] - public class MyProjectTestBaseModule : AbpModule - { - public override void ConfigureServices(ServiceConfigurationContext context) - { - Configure(options => - { - options.IsJobExecutionEnabled = false; - }); - - context.Services.AddAlwaysAllowAuthorization(); - } - - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - SeedTestData(context); - } - - private static void SeedTestData(ApplicationInitializationContext context) - { - AsyncHelper.RunSync(async () => - { - using (var scope = context.ServiceProvider.CreateScope()) - { - await scope.ServiceProvider - .GetRequiredService() - .SeedAsync(); - } - }); - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProjectTestDataSeedContributor.cs b/sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProjectTestDataSeedContributor.cs deleted file mode 100644 index 09307d0..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.TestBase/MyProjectTestDataSeedContributor.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Data; -using Volo.Abp.DependencyInjection; - -namespace MyProject -{ - public class MyProjectTestDataSeedContributor : IDataSeedContributor, ITransientDependency - { - public Task SeedAsync(DataSeedContext context) - { - /* Seed additional test data... */ - - return Task.CompletedTask; - } - } -} \ No newline at end of file diff --git a/sample/MyProject/aspnet-core/test/MyProject.TestBase/Security/FakeCurrentPrincipalAccessor.cs b/sample/MyProject/aspnet-core/test/MyProject.TestBase/Security/FakeCurrentPrincipalAccessor.cs deleted file mode 100644 index 33a852c..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.TestBase/Security/FakeCurrentPrincipalAccessor.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Collections.Generic; -using System.Security.Claims; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Security.Claims; - -namespace MyProject.Security -{ - [Dependency(ReplaceServices = true)] - public class FakeCurrentPrincipalAccessor : ICurrentPrincipalAccessor, ISingletonDependency - { - public ClaimsPrincipal Principal => GetPrincipal(); - private ClaimsPrincipal _principal; - - private ClaimsPrincipal GetPrincipal() - { - if (_principal == null) - { - lock (this) - { - if (_principal == null) - { - _principal = new ClaimsPrincipal( - new ClaimsIdentity( - new List - { - new Claim(AbpClaimTypes.UserId,"2e701e62-0953-4dd3-910b-dc6cc93ccb0d"), - new Claim(AbpClaimTypes.UserName,"admin"), - new Claim(AbpClaimTypes.Email,"admin@abp.io") - } - ) - ); - } - } - } - - return _principal; - } - } -} \ No newline at end of file diff --git a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProject.Web.Tests.csproj b/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProject.Web.Tests.csproj deleted file mode 100644 index 24ee292..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProject.Web.Tests.csproj +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - netcoreapp3.1 - Exe - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - MyProject - true - true - true - true - - - - - - - - - - - - Always - PreserveNewest - - - - - - - - - - - - - diff --git a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProjectWebTestBase.cs b/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProjectWebTestBase.cs deleted file mode 100644 index 978c8ff..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProjectWebTestBase.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.Net; -using System.Net.Http; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Hosting; -using Newtonsoft.Json; -using Newtonsoft.Json.Serialization; -using Shouldly; -using Volo.Abp.AspNetCore.TestBase; - -namespace MyProject -{ - public abstract class MyProjectWebTestBase : AbpAspNetCoreIntegratedTestBase - { - protected override IHostBuilder CreateHostBuilder() - { - return base - .CreateHostBuilder() - .UseContentRoot(WebContentDirectoryFinder.CalculateContentRootFolder()); - } - - protected virtual async Task GetResponseAsObjectAsync(string url, HttpStatusCode expectedStatusCode = HttpStatusCode.OK) - { - var strResponse = await GetResponseAsStringAsync(url, expectedStatusCode); - return JsonConvert.DeserializeObject(strResponse, new JsonSerializerSettings - { - ContractResolver = new CamelCasePropertyNamesContractResolver() - }); - } - - protected virtual async Task GetResponseAsStringAsync(string url, HttpStatusCode expectedStatusCode = HttpStatusCode.OK) - { - var response = await GetResponseAsync(url, expectedStatusCode); - return await response.Content.ReadAsStringAsync(); - } - - protected virtual async Task GetResponseAsync(string url, HttpStatusCode expectedStatusCode = HttpStatusCode.OK) - { - var response = await Client.GetAsync(url); - response.StatusCode.ShouldBe(expectedStatusCode); - return response; - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProjectWebTestModule.cs b/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProjectWebTestModule.cs deleted file mode 100644 index fa791e4..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProjectWebTestModule.cs +++ /dev/null @@ -1,113 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using Localization.Resources.AbpUi; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Localization; -using Microsoft.AspNetCore.Mvc.ApplicationParts; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Options; -using MyProject.Localization; -using MyProject.Web; -using MyProject.Web.Menus; -using Volo.Abp; -using Volo.Abp.AspNetCore.TestBase; -using Volo.Abp.Localization; -using Volo.Abp.Modularity; -using Volo.Abp.UI.Navigation; -using Volo.Abp.Validation.Localization; - -namespace MyProject -{ - [DependsOn( - typeof(AbpAspNetCoreTestBaseModule), - typeof(MyProjectWebModule), - typeof(MyProjectApplicationTestModule) - )] - public class MyProjectWebTestModule : AbpModule - { - public override void PreConfigureServices(ServiceConfigurationContext context) - { - context.Services.PreConfigure(builder => - { - builder.PartManager.ApplicationParts.Add(new CompiledRazorAssemblyPart(typeof(MyProjectWebModule).Assembly)); - }); - } - - public override void ConfigureServices(ServiceConfigurationContext context) - { - ConfigureLocalizationServices(context.Services); - ConfigureNavigationServices(context.Services); - } - - private static void ConfigureLocalizationServices(IServiceCollection services) - { - var cultures = new List { new CultureInfo("en"), new CultureInfo("tr") }; - services.Configure(options => - { - options.DefaultRequestCulture = new RequestCulture("en"); - options.SupportedCultures = cultures; - options.SupportedUICultures = cultures; - }); - - services.Configure(options => - { - options.Resources - .Get() - .AddBaseTypes( - typeof(AbpValidationResource), - typeof(AbpUiResource) - ); - }); - } - - private static void ConfigureNavigationServices(IServiceCollection services) - { - services.Configure(options => - { - options.MenuContributors.Add(new MyProjectMenuContributor()); - }); - } - - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - var app = context.GetApplicationBuilder(); - var env = context.GetEnvironment(); - - app.Use(async (ctx, next) => - { - try - { - await next(); - } - catch (Exception e) - { - Console.WriteLine(e); - throw; - } - }); - - app.UseVirtualFiles(); - app.UseRouting(); - app.UseAuthentication(); - app.UseAuthorization(); - - app.UseAbpRequestLocalization(); - - app.Use(async (ctx, next) => - { - try - { - await next(); - } - catch (Exception e) - { - Console.WriteLine(e); - throw; - } - }); - - app.UseMvcWithDefaultRouteAndArea(); - } - } -} \ No newline at end of file diff --git a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProjectWebTestStartup.cs b/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProjectWebTestStartup.cs deleted file mode 100644 index bfc8d84..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/MyProjectWebTestStartup.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Volo.Abp; - -namespace MyProject -{ - public class MyProjectWebTestStartup - { - public void ConfigureServices(IServiceCollection services) - { - services.AddApplication(); - } - - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) - { - app.InitializeApplication(); - } - } -} \ No newline at end of file diff --git a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/Pages/Gifts/IndexTests.cs b/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/Pages/Gifts/IndexTests.cs deleted file mode 100644 index 3da5c3f..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/Pages/Gifts/IndexTests.cs +++ /dev/null @@ -1,22 +0,0 @@ - -using System.Threading.Tasks; -using Shouldly; -using Xunit; - -namespace MyProject.Pages.Gifts -{ - public class Index_Tests : MyProjectWebTestBase - { - [Fact] - public async Task Index_Page_Test() - { - // Arrange - - // Act - var response = await GetResponseAsStringAsync("/Gift"); - - // Assert - response.ShouldNotBeNull(); - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/Pages/Index_Tests.cs b/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/Pages/Index_Tests.cs deleted file mode 100644 index ba1567a..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/Pages/Index_Tests.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Threading.Tasks; -using Shouldly; -using Xunit; - -namespace MyProject.Pages -{ - public class Index_Tests : MyProjectWebTestBase - { - [Fact] - public async Task Welcome_Page() - { - var response = await GetResponseAsStringAsync("/"); - response.ShouldNotBeNull(); - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/Pages/UserGifts/IndexTests.cs b/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/Pages/UserGifts/IndexTests.cs deleted file mode 100644 index 6581211..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/Pages/UserGifts/IndexTests.cs +++ /dev/null @@ -1,22 +0,0 @@ - -using System.Threading.Tasks; -using Shouldly; -using Xunit; - -namespace MyProject.Pages.UserGifts -{ - public class Index_Tests : MyProjectWebTestBase - { - [Fact] - public async Task Index_Page_Test() - { - // Arrange - - // Act - var response = await GetResponseAsStringAsync("/UserGift"); - - // Assert - response.ShouldNotBeNull(); - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/WebContentDirectoryFinder.cs b/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/WebContentDirectoryFinder.cs deleted file mode 100644 index a3f858e..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/WebContentDirectoryFinder.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using System.IO; -using System.Linq; - -namespace MyProject -{ - /// - /// This class is used to find root path of the web project. Used for; - /// 1. unit tests (to find views). - /// 2. entity framework core command line commands (to find the conn string). - /// - public static class WebContentDirectoryFinder - { - public static string CalculateContentRootFolder() - { - var domainAssemblyDirectoryPath = Path.GetDirectoryName(typeof(MyProjectDomainModule).Assembly.Location); - if (domainAssemblyDirectoryPath == null) - { - throw new Exception($"Could not find location of {typeof(MyProjectDomainModule).Assembly.FullName} assembly!"); - } - - var directoryInfo = new DirectoryInfo(domainAssemblyDirectoryPath); - while (!DirectoryContains(directoryInfo.FullName, "MyProject.sln")) - { - if (directoryInfo.Parent == null) - { - throw new Exception("Could not find content root folder!"); - } - - directoryInfo = directoryInfo.Parent; - } - - var webFolder = Path.Combine(directoryInfo.FullName, $"src{Path.DirectorySeparatorChar}MyProject.Web"); - if (Directory.Exists(webFolder)) - { - return webFolder; - } - - throw new Exception("Could not find root folder of the web project!"); - } - - private static bool DirectoryContains(string directory, string fileName) - { - return Directory.GetFiles(directory).Any(filePath => string.Equals(Path.GetFileName(filePath), fileName)); - } - } -} diff --git a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/xunit.runner.json b/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/xunit.runner.json deleted file mode 100644 index 34b2fe2..0000000 --- a/sample/MyProject/aspnet-core/test/MyProject.Web.Tests/xunit.runner.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "shadowCopy": false -} \ No newline at end of file diff --git a/src/EasyAbp.GiftCardManagement.Application.Contracts/EasyAbp.GiftCardManagement.Application.Contracts.csproj b/src/EasyAbp.GiftCardManagement.Application.Contracts/EasyAbp.GiftCardManagement.Application.Contracts.csproj index a7da74a..9c69068 100644 --- a/src/EasyAbp.GiftCardManagement.Application.Contracts/EasyAbp.GiftCardManagement.Application.Contracts.csproj +++ b/src/EasyAbp.GiftCardManagement.Application.Contracts/EasyAbp.GiftCardManagement.Application.Contracts.csproj @@ -3,7 +3,7 @@ - netstandard2.0;netstandard2.1;net7.0 + netstandard2.0;netstandard2.1;net8.0 diff --git a/src/EasyAbp.GiftCardManagement.Application/EasyAbp.GiftCardManagement.Application.csproj b/src/EasyAbp.GiftCardManagement.Application/EasyAbp.GiftCardManagement.Application.csproj index e9fab17..a35d3fb 100644 --- a/src/EasyAbp.GiftCardManagement.Application/EasyAbp.GiftCardManagement.Application.csproj +++ b/src/EasyAbp.GiftCardManagement.Application/EasyAbp.GiftCardManagement.Application.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 diff --git a/src/EasyAbp.GiftCardManagement.Domain.Shared/EasyAbp.GiftCardManagement.Domain.Shared.csproj b/src/EasyAbp.GiftCardManagement.Domain.Shared/EasyAbp.GiftCardManagement.Domain.Shared.csproj index 1ddcadb..54a6ed9 100644 --- a/src/EasyAbp.GiftCardManagement.Domain.Shared/EasyAbp.GiftCardManagement.Domain.Shared.csproj +++ b/src/EasyAbp.GiftCardManagement.Domain.Shared/EasyAbp.GiftCardManagement.Domain.Shared.csproj @@ -3,7 +3,7 @@ - netstandard2.0;netstandard2.1;net7.0 + netstandard2.0;netstandard2.1;net8.0 true @@ -19,7 +19,7 @@ - + diff --git a/src/EasyAbp.GiftCardManagement.Domain/EasyAbp.GiftCardManagement.Domain.csproj b/src/EasyAbp.GiftCardManagement.Domain/EasyAbp.GiftCardManagement.Domain.csproj index b089ce4..276d356 100644 --- a/src/EasyAbp.GiftCardManagement.Domain/EasyAbp.GiftCardManagement.Domain.csproj +++ b/src/EasyAbp.GiftCardManagement.Domain/EasyAbp.GiftCardManagement.Domain.csproj @@ -3,7 +3,7 @@ - netstandard2.0;netstandard2.1;net7.0 + netstandard2.0;netstandard2.1;net8.0 diff --git a/src/EasyAbp.GiftCardManagement.EntityFrameworkCore/EasyAbp.GiftCardManagement.EntityFrameworkCore.csproj b/src/EasyAbp.GiftCardManagement.EntityFrameworkCore/EasyAbp.GiftCardManagement.EntityFrameworkCore.csproj index e44d748..6fb7e6b 100644 --- a/src/EasyAbp.GiftCardManagement.EntityFrameworkCore/EasyAbp.GiftCardManagement.EntityFrameworkCore.csproj +++ b/src/EasyAbp.GiftCardManagement.EntityFrameworkCore/EasyAbp.GiftCardManagement.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 diff --git a/src/EasyAbp.GiftCardManagement.HttpApi.Client/EasyAbp.GiftCardManagement.HttpApi.Client.csproj b/src/EasyAbp.GiftCardManagement.HttpApi.Client/EasyAbp.GiftCardManagement.HttpApi.Client.csproj index 44fde7a..c0df1de 100644 --- a/src/EasyAbp.GiftCardManagement.HttpApi.Client/EasyAbp.GiftCardManagement.HttpApi.Client.csproj +++ b/src/EasyAbp.GiftCardManagement.HttpApi.Client/EasyAbp.GiftCardManagement.HttpApi.Client.csproj @@ -3,7 +3,7 @@ - netstandard2.0;netstandard2.1;net7.0 + netstandard2.0;netstandard2.1;net8.0 diff --git a/src/EasyAbp.GiftCardManagement.HttpApi/EasyAbp.GiftCardManagement.HttpApi.csproj b/src/EasyAbp.GiftCardManagement.HttpApi/EasyAbp.GiftCardManagement.HttpApi.csproj index 1ab427a..f0380de 100644 --- a/src/EasyAbp.GiftCardManagement.HttpApi/EasyAbp.GiftCardManagement.HttpApi.csproj +++ b/src/EasyAbp.GiftCardManagement.HttpApi/EasyAbp.GiftCardManagement.HttpApi.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 diff --git a/src/EasyAbp.GiftCardManagement.MongoDB/EasyAbp.GiftCardManagement.MongoDB.csproj b/src/EasyAbp.GiftCardManagement.MongoDB/EasyAbp.GiftCardManagement.MongoDB.csproj index 91e8eb3..ad7f3dd 100644 --- a/src/EasyAbp.GiftCardManagement.MongoDB/EasyAbp.GiftCardManagement.MongoDB.csproj +++ b/src/EasyAbp.GiftCardManagement.MongoDB/EasyAbp.GiftCardManagement.MongoDB.csproj @@ -3,7 +3,7 @@ - netstandard2.0;netstandard2.1;net7.0 + netstandard2.0;netstandard2.1;net8.0 diff --git a/src/EasyAbp.GiftCardManagement.Web/EasyAbp.GiftCardManagement.Web.csproj b/src/EasyAbp.GiftCardManagement.Web/EasyAbp.GiftCardManagement.Web.csproj index 7c0c3bb..e24ff14 100644 --- a/src/EasyAbp.GiftCardManagement.Web/EasyAbp.GiftCardManagement.Web.csproj +++ b/src/EasyAbp.GiftCardManagement.Web/EasyAbp.GiftCardManagement.Web.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true Library @@ -12,7 +12,7 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/test/EasyAbp.GiftCardManagement.Application.Tests/EasyAbp.GiftCardManagement.Application.Tests.csproj b/test/EasyAbp.GiftCardManagement.Application.Tests/EasyAbp.GiftCardManagement.Application.Tests.csproj index 504f261..78363f1 100644 --- a/test/EasyAbp.GiftCardManagement.Application.Tests/EasyAbp.GiftCardManagement.Application.Tests.csproj +++ b/test/EasyAbp.GiftCardManagement.Application.Tests/EasyAbp.GiftCardManagement.Application.Tests.csproj @@ -1,14 +1,14 @@ - net7.0 + net8.0 EasyAbp.GiftCardManagement - + diff --git a/test/EasyAbp.GiftCardManagement.Domain.Tests/EasyAbp.GiftCardManagement.Domain.Tests.csproj b/test/EasyAbp.GiftCardManagement.Domain.Tests/EasyAbp.GiftCardManagement.Domain.Tests.csproj index 36ae0e5..e547805 100644 --- a/test/EasyAbp.GiftCardManagement.Domain.Tests/EasyAbp.GiftCardManagement.Domain.Tests.csproj +++ b/test/EasyAbp.GiftCardManagement.Domain.Tests/EasyAbp.GiftCardManagement.Domain.Tests.csproj @@ -1,12 +1,12 @@ - net7.0 + net8.0 EasyAbp.GiftCardManagement - + diff --git a/test/EasyAbp.GiftCardManagement.EntityFrameworkCore.Tests/EasyAbp.GiftCardManagement.EntityFrameworkCore.Tests.csproj b/test/EasyAbp.GiftCardManagement.EntityFrameworkCore.Tests/EasyAbp.GiftCardManagement.EntityFrameworkCore.Tests.csproj index 0e6800b..05017a2 100644 --- a/test/EasyAbp.GiftCardManagement.EntityFrameworkCore.Tests/EasyAbp.GiftCardManagement.EntityFrameworkCore.Tests.csproj +++ b/test/EasyAbp.GiftCardManagement.EntityFrameworkCore.Tests/EasyAbp.GiftCardManagement.EntityFrameworkCore.Tests.csproj @@ -1,13 +1,13 @@ - net7.0 + net8.0 EasyAbp.GiftCardManagement - - + + diff --git a/test/EasyAbp.GiftCardManagement.HttpApi.Client.ConsoleTestApp/EasyAbp.GiftCardManagement.HttpApi.Client.ConsoleTestApp.csproj b/test/EasyAbp.GiftCardManagement.HttpApi.Client.ConsoleTestApp/EasyAbp.GiftCardManagement.HttpApi.Client.ConsoleTestApp.csproj index 5e780f4..882f4ec 100644 --- a/test/EasyAbp.GiftCardManagement.HttpApi.Client.ConsoleTestApp/EasyAbp.GiftCardManagement.HttpApi.Client.ConsoleTestApp.csproj +++ b/test/EasyAbp.GiftCardManagement.HttpApi.Client.ConsoleTestApp/EasyAbp.GiftCardManagement.HttpApi.Client.ConsoleTestApp.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 EasyAbp.GiftCardManagement @@ -20,7 +20,7 @@ - + diff --git a/test/EasyAbp.GiftCardManagement.MongoDB.Tests/EasyAbp.GiftCardManagement.MongoDB.Tests.csproj b/test/EasyAbp.GiftCardManagement.MongoDB.Tests/EasyAbp.GiftCardManagement.MongoDB.Tests.csproj index 15421bd..e60a2ec 100644 --- a/test/EasyAbp.GiftCardManagement.MongoDB.Tests/EasyAbp.GiftCardManagement.MongoDB.Tests.csproj +++ b/test/EasyAbp.GiftCardManagement.MongoDB.Tests/EasyAbp.GiftCardManagement.MongoDB.Tests.csproj @@ -1,12 +1,12 @@ - net7.0 + net8.0 EasyAbp.GiftCardManagement - + diff --git a/test/EasyAbp.GiftCardManagement.TestBase/EasyAbp.GiftCardManagement.TestBase.csproj b/test/EasyAbp.GiftCardManagement.TestBase/EasyAbp.GiftCardManagement.TestBase.csproj index c5e0faf..1e780a7 100644 --- a/test/EasyAbp.GiftCardManagement.TestBase/EasyAbp.GiftCardManagement.TestBase.csproj +++ b/test/EasyAbp.GiftCardManagement.TestBase/EasyAbp.GiftCardManagement.TestBase.csproj @@ -1,17 +1,17 @@ - net7.0 + net8.0 EasyAbp.GiftCardManagement - - - - - - + + + + + +