Browse Source

Merge pull request #65 from volosoft/EngincanV/net-6

Upgrade EventHub to ABP 5.0-beta.1
pull/67/head
Halil İbrahim Kalkan 5 years ago
committed by GitHub
parent
commit
2af69796bb
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .github/workflows/dotnet.yml
  2. 2
      global.json
  3. 6
      src/EventHub.Admin.Application.Contracts/EventHub.Admin.Application.Contracts.csproj
  4. 8
      src/EventHub.Admin.Application/EventHub.Admin.Application.csproj
  5. 6
      src/EventHub.Admin.HttpApi.Client/EventHub.Admin.HttpApi.Client.csproj
  6. 4
      src/EventHub.Admin.HttpApi.Host/Dockerfile
  7. 18
      src/EventHub.Admin.HttpApi.Host/EventHub.Admin.HttpApi.Host.csproj
  8. 8
      src/EventHub.Admin.HttpApi/EventHub.Admin.HttpApi.csproj
  9. 16
      src/EventHub.Admin.Web/EventHub.Admin.Web.csproj
  10. 1
      src/EventHub.Admin.Web/Pages/EventManagement.razor.cs
  11. 18
      src/EventHub.Admin.Web/wwwroot/global.css
  12. 792
      src/EventHub.Admin.Web/wwwroot/global.js
  13. 4
      src/EventHub.Admin.Web/wwwroot/index.html
  14. 2
      src/EventHub.Application.Contracts/EventHub.Application.Contracts.csproj
  15. 4
      src/EventHub.Application/EventHub.Application.csproj
  16. 4
      src/EventHub.BackgroundServices/Dockerfile
  17. 12
      src/EventHub.BackgroundServices/EventHub.BackgroundServices.csproj
  18. 4
      src/EventHub.DbMigrator/Dockerfile
  19. 6
      src/EventHub.DbMigrator/EventHub.DbMigrator.csproj
  20. 16
      src/EventHub.Domain.Shared/EventHub.Domain.Shared.csproj
  21. 2
      src/EventHub.Domain/Data/IdentityServerDataSeedContributor.cs
  22. 22
      src/EventHub.Domain/EventHub.Domain.csproj
  23. 1
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContext.cs
  24. 1
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContextModelCreatingExtensions.cs
  25. 5
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubEntityFrameworkCoreModule.cs
  26. 23
      src/EventHub.EntityFrameworkCore/EventHub.EntityFrameworkCore.csproj
  27. 2634
      src/EventHub.EntityFrameworkCore/Migrations/20211008110036_Added_IsActive_To_IdentityUser.Designer.cs
  28. 773
      src/EventHub.EntityFrameworkCore/Migrations/20211008110036_Added_IsActive_To_IdentityUser.cs
  29. 200
      src/EventHub.EntityFrameworkCore/Migrations/EventHubDbContextModelSnapshot.cs
  30. 2
      src/EventHub.HttpApi.Client/EventHub.HttpApi.Client.csproj
  31. 4
      src/EventHub.HttpApi.Host/Dockerfile
  32. 18
      src/EventHub.HttpApi.Host/EventHub.HttpApi.Host.csproj
  33. 4
      src/EventHub.HttpApi/EventHub.HttpApi.csproj
  34. 4
      src/EventHub.IdentityServer/Dockerfile
  35. 20
      src/EventHub.IdentityServer/EventHub.IdentityServer.csproj
  36. 3
      src/EventHub.IdentityServer/EventHubIdentityServerModule.cs
  37. 2
      src/EventHub.IdentityServer/package.json
  38. 1
      src/EventHub.IdentityServer/wwwroot/libs/sweetalert/sweetalert.min.js
  39. 3122
      src/EventHub.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.all.js
  40. 2
      src/EventHub.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.all.min.js
  41. 1316
      src/EventHub.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.css
  42. 3120
      src/EventHub.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.js
  43. 1
      src/EventHub.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.min.css
  44. 1
      src/EventHub.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.min.js
  45. 261
      src/EventHub.IdentityServer/yarn.lock
  46. 8
      src/EventHub.Web.Theme/EventHub.Web.Theme.csproj
  47. 4
      src/EventHub.Web/Dockerfile
  48. 23
      src/EventHub.Web/EventHub.Web.csproj
  49. 1
      src/EventHub.Web/Pages/Events/Edit.cshtml.cs
  50. 1
      src/EventHub.Web/Pages/Events/Index.cshtml.cs
  51. 1
      src/EventHub.Web/Pages/Events/New.cshtml.cs
  52. 1
      src/EventHub.Web/Pages/Index.cshtml.cs
  53. 2
      src/EventHub.Web/package.json
  54. 1
      src/EventHub.Web/wwwroot/libs/sweetalert/sweetalert.min.js
  55. 3122
      src/EventHub.Web/wwwroot/libs/sweetalert2/sweetalert2.all.js
  56. 2
      src/EventHub.Web/wwwroot/libs/sweetalert2/sweetalert2.all.min.js
  57. 1316
      src/EventHub.Web/wwwroot/libs/sweetalert2/sweetalert2.css
  58. 3120
      src/EventHub.Web/wwwroot/libs/sweetalert2/sweetalert2.js
  59. 1
      src/EventHub.Web/wwwroot/libs/sweetalert2/sweetalert2.min.css
  60. 1
      src/EventHub.Web/wwwroot/libs/sweetalert2/sweetalert2.min.js
  61. 261
      src/EventHub.Web/yarn.lock
  62. 2
      test/EventHub.Application.Tests/EventHub.Application.Tests.csproj
  63. 2
      test/EventHub.Domain.Tests/EventHub.Domain.Tests.csproj
  64. 4
      test/EventHub.EntityFrameworkCore.Tests/EventHub.EntityFrameworkCore.Tests.csproj
  65. 8
      test/EventHub.TestBase/EventHub.TestBase.csproj

2
.github/workflows/dotnet.yml

@ -24,7 +24,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build

2
global.json

@ -1,6 +1,6 @@
{
"sdk": {
"version": "5.0.201",
"version": "6.0.100-rc.1.21458.32",
"rollForward": "latestFeature"
}
}

6
src/EventHub.Admin.Application.Contracts/EventHub.Admin.Application.Contracts.csproj

@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="5.0.0-beta.1" />
</ItemGroup>
</Project>

8
src/EventHub.Admin.Application/EventHub.Admin.Application.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>EventHub.Admin</RootNamespace>
</PropertyGroup>
@ -13,9 +13,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Account.Application" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.Application" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="5.0.0-beta.1" />
</ItemGroup>
</Project>

6
src/EventHub.Admin.HttpApi.Client/EventHub.Admin.HttpApi.Client.csproj

@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="5.0.0-beta.1" />
</ItemGroup>
</Project>

4
src/EventHub.Admin.HttpApi.Host/Dockerfile

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:5.0
COPY bin/Release/net5.0/publish/ app/
FROM mcr.microsoft.com/dotnet/aspnet:6.0
COPY bin/Release/net6.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EventHub.Admin.HttpApi.Host.dll"]

18
src/EventHub.Admin.HttpApi.Host/EventHub.Admin.HttpApi.Host.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>EventHub.Admin</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>EventHub-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
@ -12,14 +12,14 @@
<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.*" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.*" />
<PackageReference Include="Volo.Abp.Autofac" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="4.4.0-rc.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-rc.*" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.0.0-beta.1" />
</ItemGroup>
<ItemGroup>

8
src/EventHub.Admin.HttpApi/EventHub.Admin.HttpApi.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>EventHub.Admin</RootNamespace>
</PropertyGroup>
@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="5.0.0-beta.1" />
</ItemGroup>
</Project>

16
src/EventHub.Admin.Web/EventHub.Admin.Web.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
</PropertyGroup>
@ -10,16 +10,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.5" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.*" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.*" />
<PackageReference Include="Blazorise.Bootstrap" Version="0.9.4.1" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.4.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0-rc.*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="5.0.0-beta.1" />
</ItemGroup>
<ItemGroup>

1
src/EventHub.Admin.Web/Pages/EventManagement.razor.cs

@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Components.Web;
using System.IO;
using System.Globalization;
using EventHub.Events;
using NUglify.Helpers;
using Volo.Abp;
using Volo.Abp.Content;

18
src/EventHub.Admin.Web/wwwroot/global.css

File diff suppressed because one or more lines are too long

792
src/EventHub.Admin.Web/wwwroot/global.js

File diff suppressed because one or more lines are too long

4
src/EventHub.Admin.Web/wwwroot/index.html

@ -8,7 +8,7 @@
<base href="/" />
<!--ABP:Styles-->
<link href="global.css?_v=637453952859170535" rel="stylesheet"/>
<link href="global.css?_v=637693024777665879" rel="stylesheet"/>
<link href="main.css" rel="stylesheet"/>
<!--/ABP:Styles-->
</head>
@ -22,7 +22,7 @@
</div>
<!--ABP:Scripts-->
<script src="global.js?_v=637453952867128601"></script>
<script src="global.js?_v=637693024783699144"></script>
<!--/ABP:Scripts-->
</body>

2
src/EventHub.Application.Contracts/EventHub.Application.Contracts.csproj

@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="5.0.0-beta.1" />
</ItemGroup>
</Project>

4
src/EventHub.Application/EventHub.Application.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>EventHub</RootNamespace>
</PropertyGroup>
@ -13,7 +13,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="5.0.0-beta.1" />
</ItemGroup>
</Project>

4
src/EventHub.BackgroundServices/Dockerfile

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:5.0
COPY bin/Release/net5.0/ app/
FROM mcr.microsoft.com/dotnet/aspnet:6.0
COPY bin/Release/net6.0/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EventHub.BackgroundServices.dll"]

12
src/EventHub.BackgroundServices/EventHub.BackgroundServices.csproj

@ -4,7 +4,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>EventHub</RootNamespace>
<UserSecretsId>EventHub-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
</PropertyGroup>
@ -14,18 +14,18 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.BackgroundWorkers" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.BackgroundWorkers" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="5.0.0-beta.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.*" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0-rc.*" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.*" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0-rc.*" />
</ItemGroup>
<ItemGroup>

4
src/EventHub.DbMigrator/Dockerfile

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:5.0
COPY bin/Release/net5.0/ app/
FROM mcr.microsoft.com/dotnet/aspnet:6.0
COPY bin/Release/net6.0/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EventHub.DbMigrator.dll"]

6
src/EventHub.DbMigrator/EventHub.DbMigrator.csproj

@ -4,7 +4,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
@ -23,11 +23,11 @@
<PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-rc.*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-beta.1" />
<ProjectReference Include="..\EventHub.Application.Contracts\EventHub.Application.Contracts.csproj" />
<ProjectReference Include="..\EventHub.Admin.Application.Contracts\EventHub.Admin.Application.Contracts.csproj" />
<ProjectReference Include="..\EventHub.EntityFrameworkCore\EventHub.EntityFrameworkCore.csproj" />

16
src/EventHub.Domain.Shared/EventHub.Domain.Shared.csproj

@ -9,13 +9,13 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.BlobStoring.Database.Domain.Shared" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.BlobStoring.Database.Domain.Shared" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="5.0.0-beta.1" />
</ItemGroup>
<ItemGroup>
@ -24,7 +24,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0-rc.*" />
</ItemGroup>
</Project>

2
src/EventHub.Domain/Data/IdentityServerDataSeedContributor.cs

@ -114,7 +114,7 @@ namespace EventHub.Data
private async Task<ApiScope> CreateApiScopeAsync(string name)
{
var apiScope = await _apiScopeRepository.GetByNameAsync(name);
var apiScope = await _apiScopeRepository.FindByNameAsync(name);
if (apiScope == null)
{
apiScope = await _apiScopeRepository.InsertAsync(

22
src/EventHub.Domain/EventHub.Domain.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>EventHub</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
@ -13,15 +13,15 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.BlobStoring.Database.Domain" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Emailing" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.BlobStoring.Database.Domain" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Emailing" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="5.0.0-beta.1" />
</ItemGroup>
<ItemGroup>
@ -30,7 +30,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0-rc.*" />
</ItemGroup>
</Project>

1
src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContext.cs

@ -4,6 +4,7 @@ using EventHub.Events.Registrations;
using EventHub.Organizations;
using EventHub.Organizations.Memberships;
using Microsoft.EntityFrameworkCore;
using System;
using Volo.Abp.AuditLogging.EntityFrameworkCore;
using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;

1
src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContextModelCreatingExtensions.cs

@ -4,6 +4,7 @@ using EventHub.Events.Registrations;
using EventHub.Organizations;
using EventHub.Organizations.Memberships;
using Microsoft.EntityFrameworkCore;
using System;
using Volo.Abp;
using Volo.Abp.EntityFrameworkCore.Modeling;
using Volo.Abp.Identity;

5
src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubEntityFrameworkCoreModule.cs

@ -9,6 +9,7 @@ using Volo.Abp.PermissionManagement.EntityFrameworkCore;
using Volo.Abp.SettingManagement.EntityFrameworkCore;
using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore.PostgreSql;
using System;
namespace EventHub.EntityFrameworkCore
{
@ -28,6 +29,10 @@ namespace EventHub.EntityFrameworkCore
public override void PreConfigureServices(ServiceConfigurationContext context)
{
EventHubEfCoreEntityExtensionMappings.Configure();
//allows to use DateTime with timezone (by default)
//See: https://www.npgsql.org/efcore/release-notes/6.0.html#opting-out-of-the-new-timestamp-mapping-logic
AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
}
public override void ConfigureServices(ServiceConfigurationContext context)

23
src/EventHub.EntityFrameworkCore/EventHub.EntityFrameworkCore.csproj

@ -1,26 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>EventHub</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0-rc.*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="5.0.0-beta.1" />
<ProjectReference Include="..\EventHub.Domain\EventHub.Domain.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="5.0.0-beta.1" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0-rc.*" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="5.0.0-beta.1" />
</ItemGroup>
</Project>

2634
src/EventHub.EntityFrameworkCore/Migrations/20211008110036_Added_IsActive_To_IdentityUser.Designer.cs

File diff suppressed because it is too large

773
src/EventHub.EntityFrameworkCore/Migrations/20211008110036_Added_IsActive_To_IdentityUser.cs

@ -0,0 +1,773 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace EventHub.Migrations
{
public partial class Added_IsActive_To_IdentityUser : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<DateTime>(
name: "Expiration",
table: "IdentityServerPersistedGrants",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "IdentityServerPersistedGrants",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "ConsumedTime",
table: "IdentityServerPersistedGrants",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "IdentityServerIdentityResources",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "IdentityServerIdentityResources",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "IdentityServerIdentityResources",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "Expiration",
table: "IdentityServerDeviceFlowCodes",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "IdentityServerDeviceFlowCodes",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "Expiration",
table: "IdentityServerClientSecrets",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "IdentityServerClients",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "IdentityServerClients",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "IdentityServerClients",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "IdentityServerApiScopes",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "IdentityServerApiScopes",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "IdentityServerApiScopes",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "Expiration",
table: "IdentityServerApiResourceSecrets",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "IdentityServerApiResources",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "IdentityServerApiResources",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "IdentityServerApiResources",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "EhOrganizations",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "EhOrganizations",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "EhOrganizations",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "EhOrganizationMemberships",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "StartTime",
table: "EhEvents",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "EhEvents",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "EndTime",
table: "EhEvents",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "EhEvents",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "EhEvents",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "EhEventRegistrations",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "AbpUsers",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "AbpUsers",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "AbpUsers",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AddColumn<bool>(
name: "IsActive",
table: "AbpUsers",
type: "boolean",
nullable: false,
defaultValue: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "AbpUserOrganizationUnits",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "AbpSecurityLogs",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "AbpOrganizationUnits",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "AbpOrganizationUnits",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "AbpOrganizationUnits",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "AbpOrganizationUnitRoles",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "ChangeTime",
table: "AbpEntityChanges",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "NextTryTime",
table: "AbpBackgroundJobs",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "LastTryTime",
table: "AbpBackgroundJobs",
type: "timestamp with time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "AbpBackgroundJobs",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "ExecutionTime",
table: "AbpAuditLogs",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "ExecutionTime",
table: "AbpAuditLogActions",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp without time zone");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "IsActive",
table: "AbpUsers");
migrationBuilder.AlterColumn<DateTime>(
name: "Expiration",
table: "IdentityServerPersistedGrants",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "IdentityServerPersistedGrants",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "ConsumedTime",
table: "IdentityServerPersistedGrants",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "IdentityServerIdentityResources",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "IdentityServerIdentityResources",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "IdentityServerIdentityResources",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "Expiration",
table: "IdentityServerDeviceFlowCodes",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "IdentityServerDeviceFlowCodes",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "Expiration",
table: "IdentityServerClientSecrets",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "IdentityServerClients",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "IdentityServerClients",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "IdentityServerClients",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "IdentityServerApiScopes",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "IdentityServerApiScopes",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "IdentityServerApiScopes",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "Expiration",
table: "IdentityServerApiResourceSecrets",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "IdentityServerApiResources",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "IdentityServerApiResources",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "IdentityServerApiResources",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "EhOrganizations",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "EhOrganizations",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "EhOrganizations",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "EhOrganizationMemberships",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "StartTime",
table: "EhEvents",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "EhEvents",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "EndTime",
table: "EhEvents",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "EhEvents",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "EhEvents",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "EhEventRegistrations",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "AbpUsers",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "AbpUsers",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "AbpUsers",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "AbpUserOrganizationUnits",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "AbpSecurityLogs",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "LastModificationTime",
table: "AbpOrganizationUnits",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "DeletionTime",
table: "AbpOrganizationUnits",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "AbpOrganizationUnits",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "AbpOrganizationUnitRoles",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "ChangeTime",
table: "AbpEntityChanges",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "NextTryTime",
table: "AbpBackgroundJobs",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "LastTryTime",
table: "AbpBackgroundJobs",
type: "timestamp without time zone",
nullable: true,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "CreationTime",
table: "AbpBackgroundJobs",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "ExecutionTime",
table: "AbpAuditLogs",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
migrationBuilder.AlterColumn<DateTime>(
name: "ExecutionTime",
table: "AbpAuditLogActions",
type: "timestamp without time zone",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
}
}
}

200
src/EventHub.EntityFrameworkCore/Migrations/EventHubDbContextModelSnapshot.cs

@ -7,6 +7,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Volo.Abp.EntityFrameworkCore;
#nullable disable
namespace EventHub.Migrations
{
[DbContext(typeof(EventHubDbContext))]
@ -17,9 +19,10 @@ namespace EventHub.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
.HasAnnotation("Relational:MaxIdentifierLength", 63)
.HasAnnotation("ProductVersion", "5.0.8")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
.HasAnnotation("ProductVersion", "6.0.0-rc.1.21452.10")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("EventHub.Countries.Country", b =>
{
@ -35,7 +38,7 @@ namespace EventHub.Migrations
b.HasIndex("Name");
b.ToTable("EhCountries");
b.ToTable("EhCountries", (string)null);
});
modelBuilder.Entity("EventHub.Events.Event", b =>
@ -63,7 +66,7 @@ namespace EventHub.Migrations
.HasColumnType("text");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
@ -75,7 +78,7 @@ namespace EventHub.Migrations
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("DeletionTime");
b.Property<string>("Description")
@ -84,7 +87,7 @@ namespace EventHub.Migrations
.HasColumnType("character varying(2000)");
b.Property<DateTime>("EndTime")
.HasColumnType("timestamp without time zone");
.HasColumnType("timestamp with time zone");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
@ -115,7 +118,7 @@ namespace EventHub.Migrations
.HasColumnType("character varying(16)");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
@ -130,7 +133,7 @@ namespace EventHub.Migrations
.HasColumnType("uuid");
b.Property<DateTime>("StartTime")
.HasColumnType("timestamp without time zone");
.HasColumnType("timestamp with time zone");
b.Property<int>("TimingChangeCount")
.HasColumnType("integer");
@ -164,7 +167,7 @@ namespace EventHub.Migrations
b.HasIndex("OrganizationId", "StartTime");
b.ToTable("EhEvents");
b.ToTable("EhEvents", (string)null);
});
modelBuilder.Entity("EventHub.Events.Registrations.EventRegistration", b =>
@ -179,7 +182,7 @@ namespace EventHub.Migrations
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
@ -202,7 +205,7 @@ namespace EventHub.Migrations
b.HasIndex("EventId", "UserId");
b.ToTable("EhEventRegistrations");
b.ToTable("EhEventRegistrations", (string)null);
});
modelBuilder.Entity("EventHub.Organizations.Memberships.OrganizationMembership", b =>
@ -217,7 +220,7 @@ namespace EventHub.Migrations
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
@ -240,7 +243,7 @@ namespace EventHub.Migrations
b.HasIndex("OrganizationId", "UserId");
b.ToTable("EhOrganizationMemberships");
b.ToTable("EhOrganizationMemberships", (string)null);
});
modelBuilder.Entity("EventHub.Organizations.Organization", b =>
@ -255,7 +258,7 @@ namespace EventHub.Migrations
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
@ -267,7 +270,7 @@ namespace EventHub.Migrations
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("DeletionTime");
b.Property<string>("Description")
@ -300,7 +303,7 @@ namespace EventHub.Migrations
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
@ -335,7 +338,7 @@ namespace EventHub.Migrations
b.HasIndex("OwnerUserId");
b.ToTable("EhOrganizations");
b.ToTable("EhOrganizations", (string)null);
});
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
@ -393,7 +396,7 @@ namespace EventHub.Migrations
.HasColumnName("ExecutionDuration");
b.Property<DateTime>("ExecutionTime")
.HasColumnType("timestamp without time zone");
.HasColumnType("timestamp with time zone");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
@ -443,7 +446,7 @@ namespace EventHub.Migrations
b.HasIndex("TenantId", "UserId", "ExecutionTime");
b.ToTable("AbpAuditLogs");
b.ToTable("AbpAuditLogs", (string)null);
});
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
@ -461,7 +464,7 @@ namespace EventHub.Migrations
.HasColumnName("ExecutionDuration");
b.Property<DateTime>("ExecutionTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("ExecutionTime");
b.Property<string>("ExtraProperties")
@ -493,7 +496,7 @@ namespace EventHub.Migrations
b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime");
b.ToTable("AbpAuditLogActions");
b.ToTable("AbpAuditLogActions", (string)null);
});
modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
@ -507,7 +510,7 @@ namespace EventHub.Migrations
.HasColumnName("AuditLogId");
b.Property<DateTime>("ChangeTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("ChangeTime");
b.Property<byte>("ChangeType")
@ -543,7 +546,7 @@ namespace EventHub.Migrations
b.HasIndex("TenantId", "EntityTypeFullName", "EntityId");
b.ToTable("AbpEntityChanges");
b.ToTable("AbpEntityChanges", (string)null);
});
modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
@ -585,7 +588,7 @@ namespace EventHub.Migrations
b.HasIndex("EntityChangeId");
b.ToTable("AbpEntityPropertyChanges");
b.ToTable("AbpEntityPropertyChanges", (string)null);
});
modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b =>
@ -601,7 +604,7 @@ namespace EventHub.Migrations
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<string>("ExtraProperties")
@ -624,10 +627,10 @@ namespace EventHub.Migrations
.HasColumnType("character varying(128)");
b.Property<DateTime?>("LastTryTime")
.HasColumnType("timestamp without time zone");
.HasColumnType("timestamp with time zone");
b.Property<DateTime>("NextTryTime")
.HasColumnType("timestamp without time zone");
.HasColumnType("timestamp with time zone");
b.Property<byte>("Priority")
.ValueGeneratedOnAdd()
@ -643,7 +646,7 @@ namespace EventHub.Migrations
b.HasIndex("IsAbandoned", "NextTryTime");
b.ToTable("AbpBackgroundJobs");
b.ToTable("AbpBackgroundJobs", (string)null);
});
modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b =>
@ -684,7 +687,7 @@ namespace EventHub.Migrations
b.HasIndex("TenantId", "ContainerId", "Name");
b.ToTable("AbpBlobs");
b.ToTable("AbpBlobs", (string)null);
});
modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", b =>
@ -716,7 +719,7 @@ namespace EventHub.Migrations
b.HasIndex("TenantId", "Name");
b.ToTable("AbpBlobContainers");
b.ToTable("AbpBlobContainers", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
@ -762,7 +765,7 @@ namespace EventHub.Migrations
b.HasKey("Id");
b.ToTable("AbpClaimTypes");
b.ToTable("AbpClaimTypes", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
@ -787,7 +790,7 @@ namespace EventHub.Migrations
b.HasIndex("SourceUserId", "SourceTenantId", "TargetUserId", "TargetTenantId")
.IsUnique();
b.ToTable("AbpLinkUsers");
b.ToTable("AbpLinkUsers", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
@ -835,7 +838,7 @@ namespace EventHub.Migrations
b.HasIndex("NormalizedName");
b.ToTable("AbpRoles");
b.ToTable("AbpRoles", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
@ -863,7 +866,7 @@ namespace EventHub.Migrations
b.HasIndex("RoleId");
b.ToTable("AbpRoleClaims");
b.ToTable("AbpRoleClaims", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
@ -902,7 +905,7 @@ namespace EventHub.Migrations
.HasColumnType("character varying(64)");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone");
.HasColumnType("timestamp with time zone");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
@ -937,7 +940,7 @@ namespace EventHub.Migrations
b.HasIndex("TenantId", "UserId");
b.ToTable("AbpSecurityLogs");
b.ToTable("AbpSecurityLogs", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
@ -958,7 +961,7 @@ namespace EventHub.Migrations
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
@ -970,7 +973,7 @@ namespace EventHub.Migrations
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("DeletionTime");
b.Property<string>("Email")
@ -989,6 +992,9 @@ namespace EventHub.Migrations
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<bool>("IsActive")
.HasColumnType("boolean");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
@ -1002,7 +1008,7 @@ namespace EventHub.Migrations
.HasColumnName("IsExternal");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
@ -1088,7 +1094,7 @@ namespace EventHub.Migrations
b.HasIndex("UserName");
b.ToTable("AbpUsers");
b.ToTable("AbpUsers", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
@ -1116,7 +1122,7 @@ namespace EventHub.Migrations
b.HasIndex("UserId");
b.ToTable("AbpUserClaims");
b.ToTable("AbpUserClaims", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
@ -1145,7 +1151,7 @@ namespace EventHub.Migrations
b.HasIndex("LoginProvider", "ProviderKey");
b.ToTable("AbpUserLogins");
b.ToTable("AbpUserLogins", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
@ -1157,7 +1163,7 @@ namespace EventHub.Migrations
.HasColumnType("uuid");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
@ -1172,7 +1178,7 @@ namespace EventHub.Migrations
b.HasIndex("UserId", "OrganizationUnitId");
b.ToTable("AbpUserOrganizationUnits");
b.ToTable("AbpUserOrganizationUnits", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
@ -1191,7 +1197,7 @@ namespace EventHub.Migrations
b.HasIndex("RoleId", "UserId");
b.ToTable("AbpUserRoles");
b.ToTable("AbpUserRoles", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
@ -1216,7 +1222,7 @@ namespace EventHub.Migrations
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AbpUserTokens");
b.ToTable("AbpUserTokens", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
@ -1237,7 +1243,7 @@ namespace EventHub.Migrations
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
@ -1249,7 +1255,7 @@ namespace EventHub.Migrations
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("DeletionTime");
b.Property<string>("DisplayName")
@ -1269,7 +1275,7 @@ namespace EventHub.Migrations
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
@ -1289,7 +1295,7 @@ namespace EventHub.Migrations
b.HasIndex("ParentId");
b.ToTable("AbpOrganizationUnits");
b.ToTable("AbpOrganizationUnits", (string)null);
});
modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
@ -1301,7 +1307,7 @@ namespace EventHub.Migrations
.HasColumnType("uuid");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
@ -1316,7 +1322,7 @@ namespace EventHub.Migrations
b.HasIndex("RoleId", "OrganizationUnitId");
b.ToTable("AbpOrganizationUnitRoles");
b.ToTable("AbpOrganizationUnitRoles", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResource", b =>
@ -1336,7 +1342,7 @@ namespace EventHub.Migrations
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
@ -1348,7 +1354,7 @@ namespace EventHub.Migrations
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("DeletionTime");
b.Property<string>("Description")
@ -1373,7 +1379,7 @@ namespace EventHub.Migrations
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
@ -1390,7 +1396,7 @@ namespace EventHub.Migrations
b.HasKey("Id");
b.ToTable("IdentityServerApiResources");
b.ToTable("IdentityServerApiResources", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b =>
@ -1404,7 +1410,7 @@ namespace EventHub.Migrations
b.HasKey("ApiResourceId", "Type");
b.ToTable("IdentityServerApiResourceClaims");
b.ToTable("IdentityServerApiResourceClaims", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceProperty", b =>
@ -1422,7 +1428,7 @@ namespace EventHub.Migrations
b.HasKey("ApiResourceId", "Key", "Value");
b.ToTable("IdentityServerApiResourceProperties");
b.ToTable("IdentityServerApiResourceProperties", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceScope", b =>
@ -1436,7 +1442,7 @@ namespace EventHub.Migrations
b.HasKey("ApiResourceId", "Scope");
b.ToTable("IdentityServerApiResourceScopes");
b.ToTable("IdentityServerApiResourceScopes", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceSecret", b =>
@ -1457,11 +1463,11 @@ namespace EventHub.Migrations
.HasColumnType("character varying(1000)");
b.Property<DateTime?>("Expiration")
.HasColumnType("timestamp without time zone");
.HasColumnType("timestamp with time zone");
b.HasKey("ApiResourceId", "Type", "Value");
b.ToTable("IdentityServerApiResourceSecrets");
b.ToTable("IdentityServerApiResourceSecrets", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.ApiScopes.ApiScope", b =>
@ -1477,7 +1483,7 @@ namespace EventHub.Migrations
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
@ -1489,7 +1495,7 @@ namespace EventHub.Migrations
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("DeletionTime");
b.Property<string>("Description")
@ -1517,7 +1523,7 @@ namespace EventHub.Migrations
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
@ -1537,7 +1543,7 @@ namespace EventHub.Migrations
b.HasKey("Id");
b.ToTable("IdentityServerApiScopes");
b.ToTable("IdentityServerApiScopes", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.ApiScopes.ApiScopeClaim", b =>
@ -1551,7 +1557,7 @@ namespace EventHub.Migrations
b.HasKey("ApiScopeId", "Type");
b.ToTable("IdentityServerApiScopeClaims");
b.ToTable("IdentityServerApiScopeClaims", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.ApiScopes.ApiScopeProperty", b =>
@ -1569,7 +1575,7 @@ namespace EventHub.Migrations
b.HasKey("ApiScopeId", "Key", "Value");
b.ToTable("IdentityServerApiScopeProperties");
b.ToTable("IdentityServerApiScopeProperties", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.Client", b =>
@ -1646,7 +1652,7 @@ namespace EventHub.Migrations
.HasColumnType("integer");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
@ -1658,7 +1664,7 @@ namespace EventHub.Migrations
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("DeletionTime");
b.Property<string>("Description")
@ -1698,7 +1704,7 @@ namespace EventHub.Migrations
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
@ -1753,7 +1759,7 @@ namespace EventHub.Migrations
b.HasIndex("ClientId");
b.ToTable("IdentityServerClients");
b.ToTable("IdentityServerClients", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b =>
@ -1771,7 +1777,7 @@ namespace EventHub.Migrations
b.HasKey("ClientId", "Type", "Value");
b.ToTable("IdentityServerClientClaims");
b.ToTable("IdentityServerClientClaims", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b =>
@ -1785,7 +1791,7 @@ namespace EventHub.Migrations
b.HasKey("ClientId", "Origin");
b.ToTable("IdentityServerClientCorsOrigins");
b.ToTable("IdentityServerClientCorsOrigins", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b =>
@ -1799,7 +1805,7 @@ namespace EventHub.Migrations
b.HasKey("ClientId", "GrantType");
b.ToTable("IdentityServerClientGrantTypes");
b.ToTable("IdentityServerClientGrantTypes", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b =>
@ -1813,7 +1819,7 @@ namespace EventHub.Migrations
b.HasKey("ClientId", "Provider");
b.ToTable("IdentityServerClientIdPRestrictions");
b.ToTable("IdentityServerClientIdPRestrictions", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b =>
@ -1827,7 +1833,7 @@ namespace EventHub.Migrations
b.HasKey("ClientId", "PostLogoutRedirectUri");
b.ToTable("IdentityServerClientPostLogoutRedirectUris");
b.ToTable("IdentityServerClientPostLogoutRedirectUris", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b =>
@ -1845,7 +1851,7 @@ namespace EventHub.Migrations
b.HasKey("ClientId", "Key", "Value");
b.ToTable("IdentityServerClientProperties");
b.ToTable("IdentityServerClientProperties", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b =>
@ -1859,7 +1865,7 @@ namespace EventHub.Migrations
b.HasKey("ClientId", "RedirectUri");
b.ToTable("IdentityServerClientRedirectUris");
b.ToTable("IdentityServerClientRedirectUris", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b =>
@ -1873,7 +1879,7 @@ namespace EventHub.Migrations
b.HasKey("ClientId", "Scope");
b.ToTable("IdentityServerClientScopes");
b.ToTable("IdentityServerClientScopes", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b =>
@ -1894,11 +1900,11 @@ namespace EventHub.Migrations
.HasColumnType("character varying(2000)");
b.Property<DateTime?>("Expiration")
.HasColumnType("timestamp without time zone");
.HasColumnType("timestamp with time zone");
b.HasKey("ClientId", "Type", "Value");
b.ToTable("IdentityServerClientSecrets");
b.ToTable("IdentityServerClientSecrets", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.Devices.DeviceFlowCodes", b =>
@ -1919,7 +1925,7 @@ namespace EventHub.Migrations
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
@ -1942,7 +1948,7 @@ namespace EventHub.Migrations
b.Property<DateTime?>("Expiration")
.IsRequired()
.HasColumnType("timestamp without time zone");
.HasColumnType("timestamp with time zone");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
@ -1970,7 +1976,7 @@ namespace EventHub.Migrations
b.HasIndex("UserCode");
b.ToTable("IdentityServerDeviceFlowCodes");
b.ToTable("IdentityServerDeviceFlowCodes", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.Grants.PersistedGrant", b =>
@ -1991,10 +1997,10 @@ namespace EventHub.Migrations
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime?>("ConsumedTime")
.HasColumnType("timestamp without time zone");
.HasColumnType("timestamp with time zone");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone");
.HasColumnType("timestamp with time zone");
b.Property<string>("Data")
.IsRequired()
@ -2006,7 +2012,7 @@ namespace EventHub.Migrations
.HasColumnType("character varying(200)");
b.Property<DateTime?>("Expiration")
.HasColumnType("timestamp without time zone");
.HasColumnType("timestamp with time zone");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
@ -2036,7 +2042,7 @@ namespace EventHub.Migrations
b.HasIndex("SubjectId", "SessionId", "Type");
b.ToTable("IdentityServerPersistedGrants");
b.ToTable("IdentityServerPersistedGrants", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", b =>
@ -2052,7 +2058,7 @@ namespace EventHub.Migrations
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
@ -2064,7 +2070,7 @@ namespace EventHub.Migrations
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("DeletionTime");
b.Property<string>("Description")
@ -2092,7 +2098,7 @@ namespace EventHub.Migrations
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("timestamp without time zone")
.HasColumnType("timestamp with time zone")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
@ -2112,7 +2118,7 @@ namespace EventHub.Migrations
b.HasKey("Id");
b.ToTable("IdentityServerIdentityResources");
b.ToTable("IdentityServerIdentityResources", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResourceClaim", b =>
@ -2126,7 +2132,7 @@ namespace EventHub.Migrations
b.HasKey("IdentityResourceId", "Type");
b.ToTable("IdentityServerIdentityResourceClaims");
b.ToTable("IdentityServerIdentityResourceClaims", (string)null);
});
modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResourceProperty", b =>
@ -2144,7 +2150,7 @@ namespace EventHub.Migrations
b.HasKey("IdentityResourceId", "Key", "Value");
b.ToTable("IdentityServerIdentityResourceProperties");
b.ToTable("IdentityServerIdentityResourceProperties", (string)null);
});
modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
@ -2176,7 +2182,7 @@ namespace EventHub.Migrations
b.HasIndex("Name", "ProviderName", "ProviderKey");
b.ToTable("AbpPermissionGrants");
b.ToTable("AbpPermissionGrants", (string)null);
});
modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
@ -2207,7 +2213,7 @@ namespace EventHub.Migrations
b.HasIndex("Name", "ProviderName", "ProviderKey");
b.ToTable("AbpSettings");
b.ToTable("AbpSettings", (string)null);
});
modelBuilder.Entity("EventHub.Events.Event", b =>

2
src/EventHub.HttpApi.Client/EventHub.HttpApi.Client.csproj

@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Http.Client" Version="5.0.0-beta.1" />
</ItemGroup>
</Project>

4
src/EventHub.HttpApi.Host/Dockerfile

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:5.0
COPY bin/Release/net5.0/publish/ app/
FROM mcr.microsoft.com/dotnet/aspnet:6.0
COPY bin/Release/net6.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EventHub.HttpApi.Host.dll"]

18
src/EventHub.HttpApi.Host/EventHub.HttpApi.Host.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>EventHub</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>EventHub-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
@ -12,14 +12,14 @@
<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.*" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.*" />
<PackageReference Include="Volo.Abp.Autofac" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="4.4.0-rc.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-rc.*" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.0.0-beta.1" />
</ItemGroup>
<ItemGroup>

4
src/EventHub.HttpApi/EventHub.HttpApi.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>EventHub</RootNamespace>
</PropertyGroup>
@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="5.0.0-beta.1" />
</ItemGroup>
</Project>

4
src/EventHub.IdentityServer/Dockerfile

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:5.0
COPY bin/Release/net5.0/publish/ app/
FROM mcr.microsoft.com/dotnet/aspnet:6.0
COPY bin/Release/net6.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EventHub.IdentityServer.dll"]

20
src/EventHub.IdentityServer/EventHub.IdentityServer.csproj

@ -3,13 +3,12 @@
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>EventHub</RootNamespace>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<PreserveCompilationContext>true</PreserveCompilationContext>
<MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>EventHub-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
@ -38,17 +37,18 @@
<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.*" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0-rc.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-rc.*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.Application" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Account.Application" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="5.0.0-beta.1" />
</ItemGroup>
<ItemGroup>

3
src/EventHub.IdentityServer/EventHubIdentityServerModule.cs

@ -41,6 +41,9 @@ namespace EventHub
typeof(AbpCachingStackExchangeRedisModule),
typeof(AbpAccountWebIdentityServerModule),
typeof(AbpAccountApplicationModule),
//we need to add AbpAccountHttpApiModule temporarily. (https://github.com/volosoft/volo/pull/7925).
//It should be removed with 5.0-beta.2.
typeof(AbpAccountHttpApiModule),
typeof(EventHubWebThemeModule),
typeof(EventHubEntityFrameworkCoreModule),
typeof(AbpAspNetCoreSerilogModule)

2
src/EventHub.IdentityServer/package.json

@ -3,7 +3,7 @@
"name": "my-app-identityserver",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~4.4.0-rc.1",
"@abp/aspnetcore.mvc.ui.theme.basic": "~5.0.0-beta.1",
"owl.carousel": "^2.3.4"
}
}

1
src/EventHub.IdentityServer/wwwroot/libs/sweetalert/sweetalert.min.js

File diff suppressed because one or more lines are too long

3122
src/EventHub.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.all.js

File diff suppressed because one or more lines are too long

2
src/EventHub.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.all.min.js

File diff suppressed because one or more lines are too long

1316
src/EventHub.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.css

File diff suppressed because it is too large

3120
src/EventHub.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.js

File diff suppressed because it is too large

1
src/EventHub.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.min.css

File diff suppressed because one or more lines are too long

1
src/EventHub.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.min.js

File diff suppressed because one or more lines are too long

261
src/EventHub.IdentityServer/yarn.lock

@ -2,37 +2,37 @@
# yarn lockfile v1
"@abp/aspnetcore.mvc.ui.theme.basic@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.4.0-rc.1.tgz#327a26fd71183ea2b4264ce12e4558310e8243b3"
integrity sha512-YycorI8c5EUx0Wi50R+Vrvd3m52RTntDB51y0u+2/UebEP9TkJfw0BowLDRqISLKQ1cqnrh5U+JlwPIUFD9hTA==
dependencies:
"@abp/aspnetcore.mvc.ui.theme.shared" "~4.4.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.shared@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.4.0-rc.1.tgz#fe3b8aab3db2a5406b68db0355942e1267c1c81e"
integrity sha512-QA861zNC2nrNxy5P7A7YtJrA6cRz6yvGIZEnasqYUQ3pqrmkV526AoPJrxIYfn8gjs2FiUHcEIirYx9IriL0Pg==
dependencies:
"@abp/aspnetcore.mvc.ui" "~4.4.0-rc.1"
"@abp/bootstrap" "~4.4.0-rc.1"
"@abp/bootstrap-datepicker" "~4.4.0-rc.1"
"@abp/datatables.net-bs4" "~4.4.0-rc.1"
"@abp/font-awesome" "~4.4.0-rc.1"
"@abp/jquery-form" "~4.4.0-rc.1"
"@abp/jquery-validation-unobtrusive" "~4.4.0-rc.1"
"@abp/lodash" "~4.4.0-rc.1"
"@abp/luxon" "~4.4.0-rc.1"
"@abp/malihu-custom-scrollbar-plugin" "~4.4.0-rc.1"
"@abp/select2" "~4.4.0-rc.1"
"@abp/sweetalert" "~4.4.0-rc.1"
"@abp/timeago" "~4.4.0-rc.1"
"@abp/toastr" "~4.4.0-rc.1"
"@abp/aspnetcore.mvc.ui@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.4.0-rc.1.tgz#c086d5b1b4fa2b977779ed6e666e897879c7f3cf"
integrity sha512-cBzMQYmPJiXxo3z6PhLV5Sq61sWTN5e4139tpQepma4ctYBlV1+jQnNxmfCRVQio98YDk72kdkOtt7qQtP+TlA==
"@abp/aspnetcore.mvc.ui.theme.basic@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.0.0-beta.1.tgz#2c78c2bd977a67f6c2ed77cfcd404cf9533eaaae"
integrity sha512-b8Boztxd5NbaDlXQvgHXHtw8ZNgM4tEgo14kw/bN3mcLx05fWLGd8Lzfdi7i+Ju6U3rKbgi+0MSbga93A0KSmg==
dependencies:
"@abp/aspnetcore.mvc.ui.theme.shared" "~5.0.0-beta.1"
"@abp/aspnetcore.mvc.ui.theme.shared@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.0.0-beta.1.tgz#25596652bb3f7b6bac5bbd966a731144cd9646c6"
integrity sha512-N4SHu6rn8alK4jdve00IscngrfvqJNEjrwQclXNmP9c4NtPuVM9emZdxBzKF8jFb6Hz8HiwM9H3xV/SjKCS/7A==
dependencies:
"@abp/aspnetcore.mvc.ui" "~5.0.0-beta.1"
"@abp/bootstrap" "~5.0.0-beta.1"
"@abp/bootstrap-datepicker" "~5.0.0-beta.1"
"@abp/datatables.net-bs4" "~5.0.0-beta.1"
"@abp/font-awesome" "~5.0.0-beta.1"
"@abp/jquery-form" "~5.0.0-beta.1"
"@abp/jquery-validation-unobtrusive" "~5.0.0-beta.1"
"@abp/lodash" "~5.0.0-beta.1"
"@abp/luxon" "~5.0.0-beta.1"
"@abp/malihu-custom-scrollbar-plugin" "~5.0.0-beta.1"
"@abp/select2" "~5.0.0-beta.1"
"@abp/sweetalert2" "~5.0.0-beta.1"
"@abp/timeago" "~5.0.0-beta.1"
"@abp/toastr" "~5.0.0-beta.1"
"@abp/aspnetcore.mvc.ui@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.0.0-beta.1.tgz#30c14386899596bf91e8871810dbaa1a0e51e996"
integrity sha512-pabiGHghC62eg95RfAncEt0+yGdBxdMmyqCXV+Be4JjaMz/hGZIDOPIYnaqCayZtyMmIRqG6IAwi99DqBjkQAQ==
dependencies:
ansi-colors "^4.1.1"
extend-object "^1.0.0"
@ -41,145 +41,145 @@
merge-stream "^2.0.0"
micromatch "^4.0.2"
"@abp/bootstrap-datepicker@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.4.0-rc.1.tgz#9885772427e4dbcc98d76a404a6a85e84e32671f"
integrity sha512-Rb27WGmTTk4duDkQP8wO6N1xjSgXvmgW7zbKsoyzBPrySDsT+MyCXKWyslyEBg0Fk4HUhiRARVRAecOBnFq+dg==
"@abp/bootstrap-datepicker@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.0.0-beta.1.tgz#727e0f7305a94c95ece152ffff011bcff621f46d"
integrity sha512-txhdlJqyO2D9MkGLYgrsiDaC58cb2eCpk2uxoqqQeVWvuRPo/L+9rCBk+bu6J37FGJtU8aabtHJyR5xnYbv0TQ==
dependencies:
bootstrap-datepicker "^1.9.0"
"@abp/bootstrap@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.4.0-rc.1.tgz#cf5caf4e33e3afcd763603622c22c1585f49d21b"
integrity sha512-TytaRAVAxH/zIA3xLv/Kt909dou4EO57lnqz/wNorzoBxXdwmSDcIGx7IZkmQwXih8Sj+opC4QORJ6w02FMprA==
"@abp/bootstrap@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.0.0-beta.1.tgz#075a15459ff8e3896b6553786e6c8f091c6ffcad"
integrity sha512-W8z6qSAsRoXmG0++xH6Bk1oRc90hFqVcjKI+5XgBQhUUCn2qBruBYOKFxPg2GeT2f1k9K5TrCEnnVrh0sOP9/A==
dependencies:
"@abp/core" "~4.4.0-rc.1"
"@abp/core" "~5.0.0-beta.1"
bootstrap "^4.6.0"
bootstrap-v4-rtl "4.6.0-1"
"@abp/core@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.4.0-rc.1.tgz#cf31b5a0136e388d6d300b5274ccaedd6f886b42"
integrity sha512-q8yh3nQhBV85hfn3D0K3yWoj7wxvTw7ZjYA3+YpIClyG3/W4+PB/eAC7+VjybMxX4BMpt/694kYHNd7s78DxRA==
"@abp/core@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.0.0-beta.1.tgz#6cff06b13529ab9d7a6ddc4e89dc40616e6b7739"
integrity sha512-TK1CnurJIK/SXfsNTk6HSpxdaJgVxwvqNd4F3fxCC0Uj8s5viD3TAGk39Hkp4909WGfNrRq8BEUNvTYM/rP6gg==
dependencies:
"@abp/utils" "^4.4.0-rc.1"
"@abp/utils" "^5.0.0-beta.1"
"@abp/datatables.net-bs4@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.4.0-rc.1.tgz#8b597f4205c5cf6eeab252968767f27bead51cbf"
integrity sha512-Tuoa5qOv4XPo7EJHU9lzFYFn0DFVG3jFTaCxruKLybPXnNCmyzgwLuQmD0U2hI/oRGb0JILcD6QCfOqfOs7Jsg==
"@abp/datatables.net-bs4@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-5.0.0-beta.1.tgz#110d7d8cf1c15db7432d8f0649f4317ba8de10dd"
integrity sha512-CPodZP9pqLdwnFZ77/mcSfuhyK1WMi/c+9VWpGXFQSGaABNKPP2UIdAChwUcBRdGkZRa/IhXx3CCr1ZMLpJsMQ==
dependencies:
"@abp/datatables.net" "~4.4.0-rc.1"
"@abp/datatables.net" "~5.0.0-beta.1"
datatables.net-bs4 "^1.10.21"
"@abp/datatables.net@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.4.0-rc.1.tgz#c8996770323bd4310c4d2b057d5ceb396aa159f2"
integrity sha512-67Gy/nNE3z8XfGUdQGpA491r6NOPpyBChrqnenhsMiNq65ZJVcJDgtc5KLc8hDXMvNFtuTXNRBgLpK8Xs5R/LQ==
"@abp/datatables.net@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.0.0-beta.1.tgz#8e784a011d33de154554f3239c448fcfd8adb713"
integrity sha512-mRMYqTCoYLmDLvL+CvmwUS4JqCqdkn6mxHd7zgkaR04xlGLEmNae5aGbs1wURJ86MOWrHbfkx66lQjkul3zbQw==
dependencies:
"@abp/jquery" "~4.4.0-rc.1"
"@abp/jquery" "~5.0.0-beta.1"
datatables.net "^1.10.21"
"@abp/font-awesome@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.4.0-rc.1.tgz#8305b6e26b22afd29a71407c033362bdf3cf6eec"
integrity sha512-vmPn7Kvy2F1WHFzypymnGKQtYCkYSZMH288wuhdvqEPosHsmK583eqFuoF1kXE4T2D84nhyXC/mGxv2053NvQQ==
"@abp/font-awesome@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.0.0-beta.1.tgz#3ae721c447a009601226c381a20dc4adabe154e1"
integrity sha512-fsMqwApogZ1rAogStQxBX/Nh8akXPW/Alm8UayfK6TXIkPPjBz5RQSHfdlosG7M/U3mwUNGcLlaDvQXsE/nqow==
dependencies:
"@abp/core" "~4.4.0-rc.1"
"@abp/core" "~5.0.0-beta.1"
"@fortawesome/fontawesome-free" "^5.13.0"
"@abp/jquery-form@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.4.0-rc.1.tgz#ba4c468014cd3f95641daf856e024ad5153268a4"
integrity sha512-hWEousKP7h4C8IQj9a/4aYSCi7HXiBQemRt9tCyERQMMD1lz22+PYVrFJvnVJT0nh/t9tbfKzpW6pRHorQu4fA==
"@abp/jquery-form@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.0.0-beta.1.tgz#d13f4cffce48125547b9da57cfc407f9a35a89e6"
integrity sha512-RYE90XIDxWkvxO5ukuZ2PHk6aA/o7NQKLcR9WsN1G2xTU/frrNPgtruGRTIj7Nx3BPUeMp7EAN2rYZwglcnO5g==
dependencies:
"@abp/jquery" "~4.4.0-rc.1"
"@abp/jquery" "~5.0.0-beta.1"
jquery-form "^4.3.0"
"@abp/jquery-validation-unobtrusive@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.4.0-rc.1.tgz#399c82f2d5818f484998a90776a19fd89fb09ff4"
integrity sha512-GSQaOp3xjhQp91C6rbPFpTC78yv6wqy8N21ZV0Ncl1f5jTMi34XBD2ysT5ruhzjDhEEmihULwzGZdkNTBCmmkw==
"@abp/jquery-validation-unobtrusive@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.0.0-beta.1.tgz#93ff6ee92bccdde77816bfb434e967fd142f6b83"
integrity sha512-LZE1KIALGBCINdWrHzoGczekUFtKwbXbLIgb4ZgiipO5Xja7py/iVvts10QWqUzhnBk+kmbHbj+KnjdqP4Z8pQ==
dependencies:
"@abp/jquery-validation" "~4.4.0-rc.1"
"@abp/jquery-validation" "~5.0.0-beta.1"
jquery-validation-unobtrusive "^3.2.11"
"@abp/jquery-validation@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.4.0-rc.1.tgz#f27e0ecf9787a7b4a733067f28dd757bbd2a1b86"
integrity sha512-nATvgXwLoZVJrOV8NGo2QyOrLbblethTBiJ8TgonOXJAiWOQlIKNgsVKeyy8/nF3W48NqDgsZagt1JNXNEbcYg==
"@abp/jquery-validation@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.0.0-beta.1.tgz#2964ca1266b087e4c4c0e768bfc4bfe0284e4ff5"
integrity sha512-ZDNdkPy2ZNu0EYDNH20Oh9R3bICCYv9CbEj4zZ8Qavixo9VTkybY3BW0nYjcu1yb1P92gZPp80W8vyfxSo//kw==
dependencies:
"@abp/jquery" "~4.4.0-rc.1"
"@abp/jquery" "~5.0.0-beta.1"
jquery-validation "^1.19.2"
"@abp/jquery@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.4.0-rc.1.tgz#de1d8824b422ac96e4a07ee167058c00411786d9"
integrity sha512-StOe74MNhXqTNAdnCkrG/UM77keR9TYEiZ2vLOW23cteOgV8ohhJXH7xhNKfFkiQBla88utt7Txyx8VNA12E/Q==
"@abp/jquery@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.0.0-beta.1.tgz#360e7a164b6b4ce615a5ad91a1c78ef6893648f3"
integrity sha512-v2t+76L45tlbpGeVR39GurZl60Rj1pR/TdUidpP6zwnpx1Y3I+CvlJNDwTESeE/ixTOT3PyFbXoMEi6hI+v39A==
dependencies:
"@abp/core" "~4.4.0-rc.1"
"@abp/core" "~5.0.0-beta.1"
jquery "~3.6.0"
"@abp/lodash@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.4.0-rc.1.tgz#1a07a87e9f360a4a1f2ed4fd19743145aa411e33"
integrity sha512-Gm10DDUTulWIw4XnPDXiy7A2xfGPD1UueRqLhrJ0JT0mgnys6Kaib49tsnzDhPJBv07Oufnw+p57Aq+YUOF4fg==
"@abp/lodash@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.0.0-beta.1.tgz#618797bde42b17f91d7f99fdd5f24cb5e8a361b3"
integrity sha512-WsUjzHRZ6RkSMd5PTw0oWijDbbq/Wgonv8++ufUZi1WK5spZi9ohjcYM4io3Ms3fG+g4pWznaicYraMpV5tcsQ==
dependencies:
"@abp/core" "~4.4.0-rc.1"
"@abp/core" "~5.0.0-beta.1"
lodash "^4.17.15"
"@abp/luxon@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.4.0-rc.1.tgz#5c3f4ac1fcdfb80d79a4dd50381eaff38637949f"
integrity sha512-bfLgQJE3WAEIC3HxfCFTdMNWNs/nCe9pDGN8qsiUmQ0P0ZEQzkXvNSRe9idQP2Cbn/0q0+y44oa9v2sLT1LGsQ==
"@abp/luxon@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.0.0-beta.1.tgz#fc81fcbfb592d3baf7b9856b3cecf5b86df4bfdf"
integrity sha512-t4lhJ/wr1rAVH1/bnzmc8niZYvolTuXUB0h6A6UYaw205QyNtimzusYkTwkc+Z3xHFUrkLCoG7J2SVoCJuioaA==
dependencies:
"@abp/core" "~4.4.0-rc.1"
"@abp/core" "~5.0.0-beta.1"
luxon "^1.24.1"
"@abp/malihu-custom-scrollbar-plugin@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.4.0-rc.1.tgz#370a459024f62abfb58c73cc63c42e3183374e82"
integrity sha512-bzlQDE9u99nPw0XOqORSUd57IwN2N7EmJgSrsZ1kY5YRqA1KXZFMoUBxuBHvYR38+IAN6h79wF2yMxT79dTU6w==
"@abp/malihu-custom-scrollbar-plugin@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.0.0-beta.1.tgz#7af43d30af9b1f741fd9d9559d100aa4a5c52ae9"
integrity sha512-B195PC4/75W0EXjGEQUd/ZARb/eGWj8DX7hq3K+J+lUWzWu46dZy8s5bBij78HqxS91/q6nbxU35Z+E9xl6ICg==
dependencies:
"@abp/core" "~4.4.0-rc.1"
"@abp/core" "~5.0.0-beta.1"
malihu-custom-scrollbar-plugin "^3.1.5"
"@abp/select2@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.4.0-rc.1.tgz#219e3999bae4bae26bfaf2290e9cc6b79f3632eb"
integrity sha512-qhJZOt6e9mTggS8Qn779OtUZADwbvtErZa4xgRgwS4lzBJEpQjZzfBVnKQZ7K74MOn7nHRFvC4dTEDbzhcfukg==
"@abp/select2@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.0.0-beta.1.tgz#15988165fcfed2ebc2b8d097965e2dc1984af35e"
integrity sha512-SF+NkWDJNz1EeEimW5luaCMPTNN1oPzEWs47usPJo8m7HfijEvF3rymJ8jL5zWIOo05Tx3HUurLSVz0qu4vZsw==
dependencies:
"@abp/core" "~4.4.0-rc.1"
"@abp/core" "~5.0.0-beta.1"
select2 "^4.0.13"
"@abp/sweetalert@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.4.0-rc.1.tgz#35f678daca1bb9839e8789c0a8da58c7423f5faa"
integrity sha512-lY7lYcR9fs+k468Cr9l5kZaH6+FAqc765teSsJrIAdr1fxnDPzZWxoSSqNc3a8mEg125c2NwOD8L+AYOGqMFiQ==
"@abp/sweetalert2@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.0.0-beta.1.tgz#c6a1185f39d3207f67753e7c486eddcefc7fd0da"
integrity sha512-ADotpiMkIzHLy/ufK0q49V9hgF8oKE0rLRzVZV2dHBpmFR7YRcPdbb5AN9CiXDk6ol8nsocEEAwRmgD3eJG63w==
dependencies:
"@abp/core" "~4.4.0-rc.1"
sweetalert "^2.1.2"
"@abp/core" "~5.0.0-beta.1"
sweetalert2 "^11.0.18"
"@abp/timeago@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.4.0-rc.1.tgz#ba6c9c01727016b06e70eacfbc218bbe033b3a93"
integrity sha512-fxRMdYrnZTC2FbBXJfX5nlKVILXFmxRdZ4PW+DhSolsDSG2FR3yesbqS2SWoLuGvr81oBIkXbECaf7S/oWA2Iw==
"@abp/timeago@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.0.0-beta.1.tgz#0f7bb8cd85b7e90d7d5c0a0940b9102e3f4f1e42"
integrity sha512-QwYZyeDRW+X8BGecBcK1SgsClVWNYfPgvct+WkQhTIRxzbP/c1c+1irj69sNdN3df2WLnmjfu3sBw2hzz5ykbg==
dependencies:
"@abp/jquery" "~4.4.0-rc.1"
"@abp/jquery" "~5.0.0-beta.1"
timeago "^1.6.7"
"@abp/toastr@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.4.0-rc.1.tgz#a559665b3516f0f1eaba1c2b6fdd91d47cf25b62"
integrity sha512-7BUywNmL/hXzR4hpcQejcA9YMsLGRisqdOTpZy7abkD4wicuchHy1tr9cBSLbDIgA8oMIqM9ubh3VvPoe6pl4A==
"@abp/toastr@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.0.0-beta.1.tgz#d420fc5db6b15f6d623d3928bb6913996511937f"
integrity sha512-82LfDrZQagtv4QLb643VTra4pxleOq5xYwhpOK1Ifop2K5CRgElxKfWvY2EtxdGkpCO2arvkOzjRNbxnecHB2w==
dependencies:
"@abp/jquery" "~4.4.0-rc.1"
"@abp/jquery" "~5.0.0-beta.1"
toastr "^2.1.4"
"@abp/utils@^4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.4.0-rc.1.tgz#704764e60aae7beec2fc3ac9fff6217c1c70ddf6"
integrity sha512-HOmxzOKueogv5mZ6b7SLzBlANYmtL3R8XFypPTky98qYYYWktSxgDkEnyvpe20+yuxKkzVW7sf/swKWEt2onIQ==
"@abp/utils@^5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.0.0-beta.1.tgz#e1bf9240738276081c89a67073d9d85205fdf14c"
integrity sha512-suzKxHUautizxt5XdlJ8ONIaVMcAHrb2dp1kEnXnFRW1ip+7ZQ9/nxJj+GtY1MhHX2yPmlUQP2K8f2upJh9aoA==
dependencies:
just-compare "^1.3.0"
@ -777,11 +777,6 @@ es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
es5-ext "^0.10.35"
es6-symbol "^3.1.1"
es6-object-assign@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=
es6-symbol@^3.1.1, es6-symbol@~3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
@ -2054,11 +2049,6 @@ process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
promise-polyfill@^6.0.2:
version "6.1.0"
resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-6.1.0.tgz#dfa96943ea9c121fca4de9b5868cb39d3472e057"
integrity sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=
pump@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
@ -2474,13 +2464,10 @@ sver-compat@^1.5.0:
es6-iterator "^2.0.1"
es6-symbol "^3.1.1"
sweetalert@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/sweetalert/-/sweetalert-2.1.2.tgz#010baaa80d0dbdc86f96bfcaa96b490728594b79"
integrity sha512-iWx7X4anRBNDa/a+AdTmvAzQtkN1+s4j/JJRWlHpYE8Qimkohs8/XnFcWeYHH2lMA8LRCa5tj2d244If3S/hzA==
dependencies:
es6-object-assign "^1.1.0"
promise-polyfill "^6.0.2"
sweetalert2@^11.0.18:
version "11.1.7"
resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-11.1.7.tgz#0ff2851eae77a76a3fe0ab289d3c32493e811b6d"
integrity sha512-7MHQVtKCTORfA9e58g9ZOfT3X58DkSBtvoCQJnqSHobXXb5C7aB8Yg/tAccTFnefCUBU41PoStjXMkzG3bNeig==
tar@^4:
version "4.4.10"

8
src/EventHub.Web.Theme/EventHub.Web.Theme.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@ -30,12 +30,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="5.0.0-beta.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0-rc.*" />
</ItemGroup>
</Project>

4
src/EventHub.Web/Dockerfile

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:5.0
COPY bin/Release/net5.0/publish/ app/
FROM mcr.microsoft.com/dotnet/aspnet:6.0
COPY bin/Release/net6.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EventHub.Web.dll"]

23
src/EventHub.Web/EventHub.Web.csproj

@ -3,12 +3,11 @@
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<PreserveCompilationContext>true</PreserveCompilationContext>
<MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>EventHub-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
@ -23,19 +22,19 @@
<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.*" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0-rc.*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="5.0.0-beta.1" />
</ItemGroup>
<ItemGroup>

1
src/EventHub.Web/Pages/Events/Edit.cshtml.cs

@ -13,7 +13,6 @@ using JetBrains.Annotations;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using NUglify.Helpers;
using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form;
using Volo.Abp.Content;
using Volo.Abp.Users;

1
src/EventHub.Web/Pages/Events/Index.cshtml.cs

@ -5,7 +5,6 @@ using System.Linq;
using System.Threading.Tasks;
using EventHub.Events;
using Microsoft.AspNetCore.Mvc;
using NUglify.Helpers;
namespace EventHub.Web.Pages.Events
{

1
src/EventHub.Web/Pages/Events/New.cshtml.cs

@ -13,7 +13,6 @@ using JetBrains.Annotations;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using NUglify.Helpers;
using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form;
using Volo.Abp.Content;
using Volo.Abp.Users;

1
src/EventHub.Web/Pages/Index.cshtml.cs

@ -5,7 +5,6 @@ using System.Linq;
using System.Threading.Tasks;
using EventHub.Events;
using Microsoft.AspNetCore.Authentication;
using NUglify.Helpers;
namespace EventHub.Web.Pages
{

2
src/EventHub.Web/package.json

@ -3,7 +3,7 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~4.4.0-rc.1",
"@abp/aspnetcore.mvc.ui.theme.basic": "~5.0.0-beta.1",
"daterangepicker": "^3.1.0",
"owl.carousel": "^2.3.4"
}

1
src/EventHub.Web/wwwroot/libs/sweetalert/sweetalert.min.js

File diff suppressed because one or more lines are too long

3122
src/EventHub.Web/wwwroot/libs/sweetalert2/sweetalert2.all.js

File diff suppressed because one or more lines are too long

2
src/EventHub.Web/wwwroot/libs/sweetalert2/sweetalert2.all.min.js

File diff suppressed because one or more lines are too long

1316
src/EventHub.Web/wwwroot/libs/sweetalert2/sweetalert2.css

File diff suppressed because it is too large

3120
src/EventHub.Web/wwwroot/libs/sweetalert2/sweetalert2.js

File diff suppressed because it is too large

1
src/EventHub.Web/wwwroot/libs/sweetalert2/sweetalert2.min.css

File diff suppressed because one or more lines are too long

1
src/EventHub.Web/wwwroot/libs/sweetalert2/sweetalert2.min.js

File diff suppressed because one or more lines are too long

261
src/EventHub.Web/yarn.lock

@ -2,37 +2,37 @@
# yarn lockfile v1
"@abp/aspnetcore.mvc.ui.theme.basic@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.4.0-rc.1.tgz#327a26fd71183ea2b4264ce12e4558310e8243b3"
integrity sha512-YycorI8c5EUx0Wi50R+Vrvd3m52RTntDB51y0u+2/UebEP9TkJfw0BowLDRqISLKQ1cqnrh5U+JlwPIUFD9hTA==
dependencies:
"@abp/aspnetcore.mvc.ui.theme.shared" "~4.4.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.shared@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.4.0-rc.1.tgz#fe3b8aab3db2a5406b68db0355942e1267c1c81e"
integrity sha512-QA861zNC2nrNxy5P7A7YtJrA6cRz6yvGIZEnasqYUQ3pqrmkV526AoPJrxIYfn8gjs2FiUHcEIirYx9IriL0Pg==
dependencies:
"@abp/aspnetcore.mvc.ui" "~4.4.0-rc.1"
"@abp/bootstrap" "~4.4.0-rc.1"
"@abp/bootstrap-datepicker" "~4.4.0-rc.1"
"@abp/datatables.net-bs4" "~4.4.0-rc.1"
"@abp/font-awesome" "~4.4.0-rc.1"
"@abp/jquery-form" "~4.4.0-rc.1"
"@abp/jquery-validation-unobtrusive" "~4.4.0-rc.1"
"@abp/lodash" "~4.4.0-rc.1"
"@abp/luxon" "~4.4.0-rc.1"
"@abp/malihu-custom-scrollbar-plugin" "~4.4.0-rc.1"
"@abp/select2" "~4.4.0-rc.1"
"@abp/sweetalert" "~4.4.0-rc.1"
"@abp/timeago" "~4.4.0-rc.1"
"@abp/toastr" "~4.4.0-rc.1"
"@abp/aspnetcore.mvc.ui@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.4.0-rc.1.tgz#c086d5b1b4fa2b977779ed6e666e897879c7f3cf"
integrity sha512-cBzMQYmPJiXxo3z6PhLV5Sq61sWTN5e4139tpQepma4ctYBlV1+jQnNxmfCRVQio98YDk72kdkOtt7qQtP+TlA==
"@abp/aspnetcore.mvc.ui.theme.basic@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.0.0-beta.1.tgz#2c78c2bd977a67f6c2ed77cfcd404cf9533eaaae"
integrity sha512-b8Boztxd5NbaDlXQvgHXHtw8ZNgM4tEgo14kw/bN3mcLx05fWLGd8Lzfdi7i+Ju6U3rKbgi+0MSbga93A0KSmg==
dependencies:
"@abp/aspnetcore.mvc.ui.theme.shared" "~5.0.0-beta.1"
"@abp/aspnetcore.mvc.ui.theme.shared@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.0.0-beta.1.tgz#25596652bb3f7b6bac5bbd966a731144cd9646c6"
integrity sha512-N4SHu6rn8alK4jdve00IscngrfvqJNEjrwQclXNmP9c4NtPuVM9emZdxBzKF8jFb6Hz8HiwM9H3xV/SjKCS/7A==
dependencies:
"@abp/aspnetcore.mvc.ui" "~5.0.0-beta.1"
"@abp/bootstrap" "~5.0.0-beta.1"
"@abp/bootstrap-datepicker" "~5.0.0-beta.1"
"@abp/datatables.net-bs4" "~5.0.0-beta.1"
"@abp/font-awesome" "~5.0.0-beta.1"
"@abp/jquery-form" "~5.0.0-beta.1"
"@abp/jquery-validation-unobtrusive" "~5.0.0-beta.1"
"@abp/lodash" "~5.0.0-beta.1"
"@abp/luxon" "~5.0.0-beta.1"
"@abp/malihu-custom-scrollbar-plugin" "~5.0.0-beta.1"
"@abp/select2" "~5.0.0-beta.1"
"@abp/sweetalert2" "~5.0.0-beta.1"
"@abp/timeago" "~5.0.0-beta.1"
"@abp/toastr" "~5.0.0-beta.1"
"@abp/aspnetcore.mvc.ui@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.0.0-beta.1.tgz#30c14386899596bf91e8871810dbaa1a0e51e996"
integrity sha512-pabiGHghC62eg95RfAncEt0+yGdBxdMmyqCXV+Be4JjaMz/hGZIDOPIYnaqCayZtyMmIRqG6IAwi99DqBjkQAQ==
dependencies:
ansi-colors "^4.1.1"
extend-object "^1.0.0"
@ -41,145 +41,145 @@
merge-stream "^2.0.0"
micromatch "^4.0.2"
"@abp/bootstrap-datepicker@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.4.0-rc.1.tgz#9885772427e4dbcc98d76a404a6a85e84e32671f"
integrity sha512-Rb27WGmTTk4duDkQP8wO6N1xjSgXvmgW7zbKsoyzBPrySDsT+MyCXKWyslyEBg0Fk4HUhiRARVRAecOBnFq+dg==
"@abp/bootstrap-datepicker@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.0.0-beta.1.tgz#727e0f7305a94c95ece152ffff011bcff621f46d"
integrity sha512-txhdlJqyO2D9MkGLYgrsiDaC58cb2eCpk2uxoqqQeVWvuRPo/L+9rCBk+bu6J37FGJtU8aabtHJyR5xnYbv0TQ==
dependencies:
bootstrap-datepicker "^1.9.0"
"@abp/bootstrap@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.4.0-rc.1.tgz#cf5caf4e33e3afcd763603622c22c1585f49d21b"
integrity sha512-TytaRAVAxH/zIA3xLv/Kt909dou4EO57lnqz/wNorzoBxXdwmSDcIGx7IZkmQwXih8Sj+opC4QORJ6w02FMprA==
"@abp/bootstrap@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.0.0-beta.1.tgz#075a15459ff8e3896b6553786e6c8f091c6ffcad"
integrity sha512-W8z6qSAsRoXmG0++xH6Bk1oRc90hFqVcjKI+5XgBQhUUCn2qBruBYOKFxPg2GeT2f1k9K5TrCEnnVrh0sOP9/A==
dependencies:
"@abp/core" "~4.4.0-rc.1"
"@abp/core" "~5.0.0-beta.1"
bootstrap "^4.6.0"
bootstrap-v4-rtl "4.6.0-1"
"@abp/core@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.4.0-rc.1.tgz#cf31b5a0136e388d6d300b5274ccaedd6f886b42"
integrity sha512-q8yh3nQhBV85hfn3D0K3yWoj7wxvTw7ZjYA3+YpIClyG3/W4+PB/eAC7+VjybMxX4BMpt/694kYHNd7s78DxRA==
"@abp/core@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.0.0-beta.1.tgz#6cff06b13529ab9d7a6ddc4e89dc40616e6b7739"
integrity sha512-TK1CnurJIK/SXfsNTk6HSpxdaJgVxwvqNd4F3fxCC0Uj8s5viD3TAGk39Hkp4909WGfNrRq8BEUNvTYM/rP6gg==
dependencies:
"@abp/utils" "^4.4.0-rc.1"
"@abp/utils" "^5.0.0-beta.1"
"@abp/datatables.net-bs4@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.4.0-rc.1.tgz#8b597f4205c5cf6eeab252968767f27bead51cbf"
integrity sha512-Tuoa5qOv4XPo7EJHU9lzFYFn0DFVG3jFTaCxruKLybPXnNCmyzgwLuQmD0U2hI/oRGb0JILcD6QCfOqfOs7Jsg==
"@abp/datatables.net-bs4@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-5.0.0-beta.1.tgz#110d7d8cf1c15db7432d8f0649f4317ba8de10dd"
integrity sha512-CPodZP9pqLdwnFZ77/mcSfuhyK1WMi/c+9VWpGXFQSGaABNKPP2UIdAChwUcBRdGkZRa/IhXx3CCr1ZMLpJsMQ==
dependencies:
"@abp/datatables.net" "~4.4.0-rc.1"
"@abp/datatables.net" "~5.0.0-beta.1"
datatables.net-bs4 "^1.10.21"
"@abp/datatables.net@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.4.0-rc.1.tgz#c8996770323bd4310c4d2b057d5ceb396aa159f2"
integrity sha512-67Gy/nNE3z8XfGUdQGpA491r6NOPpyBChrqnenhsMiNq65ZJVcJDgtc5KLc8hDXMvNFtuTXNRBgLpK8Xs5R/LQ==
"@abp/datatables.net@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.0.0-beta.1.tgz#8e784a011d33de154554f3239c448fcfd8adb713"
integrity sha512-mRMYqTCoYLmDLvL+CvmwUS4JqCqdkn6mxHd7zgkaR04xlGLEmNae5aGbs1wURJ86MOWrHbfkx66lQjkul3zbQw==
dependencies:
"@abp/jquery" "~4.4.0-rc.1"
"@abp/jquery" "~5.0.0-beta.1"
datatables.net "^1.10.21"
"@abp/font-awesome@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.4.0-rc.1.tgz#8305b6e26b22afd29a71407c033362bdf3cf6eec"
integrity sha512-vmPn7Kvy2F1WHFzypymnGKQtYCkYSZMH288wuhdvqEPosHsmK583eqFuoF1kXE4T2D84nhyXC/mGxv2053NvQQ==
"@abp/font-awesome@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.0.0-beta.1.tgz#3ae721c447a009601226c381a20dc4adabe154e1"
integrity sha512-fsMqwApogZ1rAogStQxBX/Nh8akXPW/Alm8UayfK6TXIkPPjBz5RQSHfdlosG7M/U3mwUNGcLlaDvQXsE/nqow==
dependencies:
"@abp/core" "~4.4.0-rc.1"
"@abp/core" "~5.0.0-beta.1"
"@fortawesome/fontawesome-free" "^5.13.0"
"@abp/jquery-form@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.4.0-rc.1.tgz#ba4c468014cd3f95641daf856e024ad5153268a4"
integrity sha512-hWEousKP7h4C8IQj9a/4aYSCi7HXiBQemRt9tCyERQMMD1lz22+PYVrFJvnVJT0nh/t9tbfKzpW6pRHorQu4fA==
"@abp/jquery-form@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.0.0-beta.1.tgz#d13f4cffce48125547b9da57cfc407f9a35a89e6"
integrity sha512-RYE90XIDxWkvxO5ukuZ2PHk6aA/o7NQKLcR9WsN1G2xTU/frrNPgtruGRTIj7Nx3BPUeMp7EAN2rYZwglcnO5g==
dependencies:
"@abp/jquery" "~4.4.0-rc.1"
"@abp/jquery" "~5.0.0-beta.1"
jquery-form "^4.3.0"
"@abp/jquery-validation-unobtrusive@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.4.0-rc.1.tgz#399c82f2d5818f484998a90776a19fd89fb09ff4"
integrity sha512-GSQaOp3xjhQp91C6rbPFpTC78yv6wqy8N21ZV0Ncl1f5jTMi34XBD2ysT5ruhzjDhEEmihULwzGZdkNTBCmmkw==
"@abp/jquery-validation-unobtrusive@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.0.0-beta.1.tgz#93ff6ee92bccdde77816bfb434e967fd142f6b83"
integrity sha512-LZE1KIALGBCINdWrHzoGczekUFtKwbXbLIgb4ZgiipO5Xja7py/iVvts10QWqUzhnBk+kmbHbj+KnjdqP4Z8pQ==
dependencies:
"@abp/jquery-validation" "~4.4.0-rc.1"
"@abp/jquery-validation" "~5.0.0-beta.1"
jquery-validation-unobtrusive "^3.2.11"
"@abp/jquery-validation@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.4.0-rc.1.tgz#f27e0ecf9787a7b4a733067f28dd757bbd2a1b86"
integrity sha512-nATvgXwLoZVJrOV8NGo2QyOrLbblethTBiJ8TgonOXJAiWOQlIKNgsVKeyy8/nF3W48NqDgsZagt1JNXNEbcYg==
"@abp/jquery-validation@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.0.0-beta.1.tgz#2964ca1266b087e4c4c0e768bfc4bfe0284e4ff5"
integrity sha512-ZDNdkPy2ZNu0EYDNH20Oh9R3bICCYv9CbEj4zZ8Qavixo9VTkybY3BW0nYjcu1yb1P92gZPp80W8vyfxSo//kw==
dependencies:
"@abp/jquery" "~4.4.0-rc.1"
"@abp/jquery" "~5.0.0-beta.1"
jquery-validation "^1.19.2"
"@abp/jquery@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.4.0-rc.1.tgz#de1d8824b422ac96e4a07ee167058c00411786d9"
integrity sha512-StOe74MNhXqTNAdnCkrG/UM77keR9TYEiZ2vLOW23cteOgV8ohhJXH7xhNKfFkiQBla88utt7Txyx8VNA12E/Q==
"@abp/jquery@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.0.0-beta.1.tgz#360e7a164b6b4ce615a5ad91a1c78ef6893648f3"
integrity sha512-v2t+76L45tlbpGeVR39GurZl60Rj1pR/TdUidpP6zwnpx1Y3I+CvlJNDwTESeE/ixTOT3PyFbXoMEi6hI+v39A==
dependencies:
"@abp/core" "~4.4.0-rc.1"
"@abp/core" "~5.0.0-beta.1"
jquery "~3.6.0"
"@abp/lodash@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.4.0-rc.1.tgz#1a07a87e9f360a4a1f2ed4fd19743145aa411e33"
integrity sha512-Gm10DDUTulWIw4XnPDXiy7A2xfGPD1UueRqLhrJ0JT0mgnys6Kaib49tsnzDhPJBv07Oufnw+p57Aq+YUOF4fg==
"@abp/lodash@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.0.0-beta.1.tgz#618797bde42b17f91d7f99fdd5f24cb5e8a361b3"
integrity sha512-WsUjzHRZ6RkSMd5PTw0oWijDbbq/Wgonv8++ufUZi1WK5spZi9ohjcYM4io3Ms3fG+g4pWznaicYraMpV5tcsQ==
dependencies:
"@abp/core" "~4.4.0-rc.1"
"@abp/core" "~5.0.0-beta.1"
lodash "^4.17.15"
"@abp/luxon@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.4.0-rc.1.tgz#5c3f4ac1fcdfb80d79a4dd50381eaff38637949f"
integrity sha512-bfLgQJE3WAEIC3HxfCFTdMNWNs/nCe9pDGN8qsiUmQ0P0ZEQzkXvNSRe9idQP2Cbn/0q0+y44oa9v2sLT1LGsQ==
"@abp/luxon@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.0.0-beta.1.tgz#fc81fcbfb592d3baf7b9856b3cecf5b86df4bfdf"
integrity sha512-t4lhJ/wr1rAVH1/bnzmc8niZYvolTuXUB0h6A6UYaw205QyNtimzusYkTwkc+Z3xHFUrkLCoG7J2SVoCJuioaA==
dependencies:
"@abp/core" "~4.4.0-rc.1"
"@abp/core" "~5.0.0-beta.1"
luxon "^1.24.1"
"@abp/malihu-custom-scrollbar-plugin@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.4.0-rc.1.tgz#370a459024f62abfb58c73cc63c42e3183374e82"
integrity sha512-bzlQDE9u99nPw0XOqORSUd57IwN2N7EmJgSrsZ1kY5YRqA1KXZFMoUBxuBHvYR38+IAN6h79wF2yMxT79dTU6w==
"@abp/malihu-custom-scrollbar-plugin@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.0.0-beta.1.tgz#7af43d30af9b1f741fd9d9559d100aa4a5c52ae9"
integrity sha512-B195PC4/75W0EXjGEQUd/ZARb/eGWj8DX7hq3K+J+lUWzWu46dZy8s5bBij78HqxS91/q6nbxU35Z+E9xl6ICg==
dependencies:
"@abp/core" "~4.4.0-rc.1"
"@abp/core" "~5.0.0-beta.1"
malihu-custom-scrollbar-plugin "^3.1.5"
"@abp/select2@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.4.0-rc.1.tgz#219e3999bae4bae26bfaf2290e9cc6b79f3632eb"
integrity sha512-qhJZOt6e9mTggS8Qn779OtUZADwbvtErZa4xgRgwS4lzBJEpQjZzfBVnKQZ7K74MOn7nHRFvC4dTEDbzhcfukg==
"@abp/select2@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.0.0-beta.1.tgz#15988165fcfed2ebc2b8d097965e2dc1984af35e"
integrity sha512-SF+NkWDJNz1EeEimW5luaCMPTNN1oPzEWs47usPJo8m7HfijEvF3rymJ8jL5zWIOo05Tx3HUurLSVz0qu4vZsw==
dependencies:
"@abp/core" "~4.4.0-rc.1"
"@abp/core" "~5.0.0-beta.1"
select2 "^4.0.13"
"@abp/sweetalert@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.4.0-rc.1.tgz#35f678daca1bb9839e8789c0a8da58c7423f5faa"
integrity sha512-lY7lYcR9fs+k468Cr9l5kZaH6+FAqc765teSsJrIAdr1fxnDPzZWxoSSqNc3a8mEg125c2NwOD8L+AYOGqMFiQ==
"@abp/sweetalert2@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.0.0-beta.1.tgz#c6a1185f39d3207f67753e7c486eddcefc7fd0da"
integrity sha512-ADotpiMkIzHLy/ufK0q49V9hgF8oKE0rLRzVZV2dHBpmFR7YRcPdbb5AN9CiXDk6ol8nsocEEAwRmgD3eJG63w==
dependencies:
"@abp/core" "~4.4.0-rc.1"
sweetalert "^2.1.2"
"@abp/core" "~5.0.0-beta.1"
sweetalert2 "^11.0.18"
"@abp/timeago@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.4.0-rc.1.tgz#ba6c9c01727016b06e70eacfbc218bbe033b3a93"
integrity sha512-fxRMdYrnZTC2FbBXJfX5nlKVILXFmxRdZ4PW+DhSolsDSG2FR3yesbqS2SWoLuGvr81oBIkXbECaf7S/oWA2Iw==
"@abp/timeago@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.0.0-beta.1.tgz#0f7bb8cd85b7e90d7d5c0a0940b9102e3f4f1e42"
integrity sha512-QwYZyeDRW+X8BGecBcK1SgsClVWNYfPgvct+WkQhTIRxzbP/c1c+1irj69sNdN3df2WLnmjfu3sBw2hzz5ykbg==
dependencies:
"@abp/jquery" "~4.4.0-rc.1"
"@abp/jquery" "~5.0.0-beta.1"
timeago "^1.6.7"
"@abp/toastr@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.4.0-rc.1.tgz#a559665b3516f0f1eaba1c2b6fdd91d47cf25b62"
integrity sha512-7BUywNmL/hXzR4hpcQejcA9YMsLGRisqdOTpZy7abkD4wicuchHy1tr9cBSLbDIgA8oMIqM9ubh3VvPoe6pl4A==
"@abp/toastr@~5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.0.0-beta.1.tgz#d420fc5db6b15f6d623d3928bb6913996511937f"
integrity sha512-82LfDrZQagtv4QLb643VTra4pxleOq5xYwhpOK1Ifop2K5CRgElxKfWvY2EtxdGkpCO2arvkOzjRNbxnecHB2w==
dependencies:
"@abp/jquery" "~4.4.0-rc.1"
"@abp/jquery" "~5.0.0-beta.1"
toastr "^2.1.4"
"@abp/utils@^4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.4.0-rc.1.tgz#704764e60aae7beec2fc3ac9fff6217c1c70ddf6"
integrity sha512-HOmxzOKueogv5mZ6b7SLzBlANYmtL3R8XFypPTky98qYYYWktSxgDkEnyvpe20+yuxKkzVW7sf/swKWEt2onIQ==
"@abp/utils@^5.0.0-beta.1":
version "5.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.0.0-beta.1.tgz#e1bf9240738276081c89a67073d9d85205fdf14c"
integrity sha512-suzKxHUautizxt5XdlJ8ONIaVMcAHrb2dp1kEnXnFRW1ip+7ZQ9/nxJj+GtY1MhHX2yPmlUQP2K8f2upJh9aoA==
dependencies:
just-compare "^1.3.0"
@ -785,11 +785,6 @@ es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
es5-ext "^0.10.35"
es6-symbol "^3.1.1"
es6-object-assign@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=
es6-symbol@^3.1.1, es6-symbol@~3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
@ -2067,11 +2062,6 @@ process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
promise-polyfill@^6.0.2:
version "6.1.0"
resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-6.1.0.tgz#dfa96943ea9c121fca4de9b5868cb39d3472e057"
integrity sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=
pump@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
@ -2487,13 +2477,10 @@ sver-compat@^1.5.0:
es6-iterator "^2.0.1"
es6-symbol "^3.1.1"
sweetalert@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/sweetalert/-/sweetalert-2.1.2.tgz#010baaa80d0dbdc86f96bfcaa96b490728594b79"
integrity sha512-iWx7X4anRBNDa/a+AdTmvAzQtkN1+s4j/JJRWlHpYE8Qimkohs8/XnFcWeYHH2lMA8LRCa5tj2d244If3S/hzA==
dependencies:
es6-object-assign "^1.1.0"
promise-polyfill "^6.0.2"
sweetalert2@^11.0.18:
version "11.1.7"
resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-11.1.7.tgz#0ff2851eae77a76a3fe0ab289d3c32493e811b6d"
integrity sha512-7MHQVtKCTORfA9e58g9ZOfT3X58DkSBtvoCQJnqSHobXXb5C7aB8Yg/tAccTFnefCUBU41PoStjXMkzG3bNeig==
tar@^4:
version "4.4.10"

2
test/EventHub.Application.Tests/EventHub.Application.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>EventHub</RootNamespace>
</PropertyGroup>

2
test/EventHub.Domain.Tests/EventHub.Domain.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>EventHub</RootNamespace>
</PropertyGroup>

4
test/EventHub.EntityFrameworkCore.Tests/EventHub.EntityFrameworkCore.Tests.csproj

@ -3,14 +3,14 @@
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>EventHub</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\EventHub.EntityFrameworkCore\EventHub.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EventHub.TestBase\EventHub.TestBase.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="5.0.0-beta.1" />
</ItemGroup>
<ItemGroup>

8
test/EventHub.TestBase/EventHub.TestBase.csproj

@ -3,14 +3,14 @@
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>EventHub</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.TestBase" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.TestBase" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-beta.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="5.0.0-beta.1" />
<ProjectReference Include="..\..\src\EventHub.Domain\EventHub.Domain.csproj" />
</ItemGroup>

Loading…
Cancel
Save